From ecb0d136f6b36a4044aaef68e41119471cf4e9e5 Mon Sep 17 00:00:00 2001 From: PikachuEXE Date: Thu, 26 Mar 2015 14:17:27 +0800 Subject: [PATCH 1/2] * Change RobotsController's superclass from ApplicationController to AC::Base --- lib/human_power/rails/controller.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/human_power/rails/controller.rb b/lib/human_power/rails/controller.rb index 791a24c..1b0d02b 100644 --- a/lib/human_power/rails/controller.rb +++ b/lib/human_power/rails/controller.rb @@ -1,6 +1,8 @@ +require "action_controller" + module HumanPower module Rails - class RobotsController < ::ApplicationController + class RobotsController < ActionController::Base def robots generator = HumanPower::Generator.new(self) do file = ::Rails.root.join("config", "robots.rb").to_s From affec206a5b5654b53b021c8291ed5de1e93fc2e Mon Sep 17 00:00:00 2001 From: PikachuEXE Date: Thu, 26 Mar 2015 14:17:52 +0800 Subject: [PATCH 2/2] * Test against multiple versions of rails locally --- .gitignore | 3 ++- Appraisals | 14 ++++++++++++++ Rakefile | 9 ++++++++- gemfiles/rails_4_0.gemfile | 7 +++++++ gemfiles/rails_4_1.gemfile | 7 +++++++ gemfiles/rails_4_2.gemfile | 7 +++++++ human_power.gemspec | 3 ++- 7 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 Appraisals create mode 100644 gemfiles/rails_4_0.gemfile create mode 100644 gemfiles/rails_4_1.gemfile create mode 100644 gemfiles/rails_4_2.gemfile diff --git a/.gitignore b/.gitignore index b9ac553..1a7f382 100644 --- a/.gitignore +++ b/.gitignore @@ -20,4 +20,5 @@ test/dummy/db/*.sqlite3 test/dummy/db/*.sqlite3-journal test/dummy/log/*.log test/dummy/tmp/ -test/dummy/.sass-cache \ No newline at end of file +test/dummy/.sass-cache +*.lock diff --git a/Appraisals b/Appraisals new file mode 100644 index 0000000..46f7b92 --- /dev/null +++ b/Appraisals @@ -0,0 +1,14 @@ +appraise "rails_4_0" do + version = "~> 4.0.13" + gem "rails", version +end + +appraise "rails_4_1" do + version = "~> 4.1.10" + gem "rails", version +end + +appraise "rails_4_2" do + version = "~> 4.2.1" + gem "rails", version +end diff --git a/Rakefile b/Rakefile index 776d822..93fe633 100644 --- a/Rakefile +++ b/Rakefile @@ -1,5 +1,6 @@ require "bundler/gem_tasks" require "rake/testtask" +require "appraisal" Rake::TestTask.new(:test) do |t| t.libs << 'lib' @@ -8,4 +9,10 @@ Rake::TestTask.new(:test) do |t| t.verbose = false end -task default: :test \ No newline at end of file +if !ENV["APPRAISAL_INITIALIZED"] && !ENV["TRAVIS"] + task :default do + sh "appraisal install && rake appraisal test" + end +else + task :default => :test +end diff --git a/gemfiles/rails_4_0.gemfile b/gemfiles/rails_4_0.gemfile new file mode 100644 index 0000000..75b7fa0 --- /dev/null +++ b/gemfiles/rails_4_0.gemfile @@ -0,0 +1,7 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "~> 4.0.13" + +gemspec :path => "../" diff --git a/gemfiles/rails_4_1.gemfile b/gemfiles/rails_4_1.gemfile new file mode 100644 index 0000000..ad96348 --- /dev/null +++ b/gemfiles/rails_4_1.gemfile @@ -0,0 +1,7 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "~> 4.1.10" + +gemspec :path => "../" diff --git a/gemfiles/rails_4_2.gemfile b/gemfiles/rails_4_2.gemfile new file mode 100644 index 0000000..10714a1 --- /dev/null +++ b/gemfiles/rails_4_2.gemfile @@ -0,0 +1,7 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "~> 4.2.1" + +gemspec :path => "../" diff --git a/human_power.gemspec b/human_power.gemspec index 90aba5c..ec8e6d3 100644 --- a/human_power.gemspec +++ b/human_power.gemspec @@ -19,6 +19,7 @@ Gem::Specification.new do |s| s.add_development_dependency "bundler", "~> 1.3" s.add_development_dependency "rake" - s.add_development_dependency "rails", "~> 4.0.1" + s.add_development_dependency "rails", "~> 4.0" s.add_development_dependency "sqlite3" + s.add_development_dependency "appraisal", "~> 1.0" end