update rails versions and rake + setup testing against rails master

kares · kares · commit cd44e573c529 · 2014-05-14T22:04:22.000+02:00
diff --git a/Appraisals b/Appraisals
@@ -11,27 +11,18 @@ appraise "rails31" do
 end
 
 appraise "rails32" do
-  gem "rails", "~> 3.2.17"
+  gem "rails", "~> 3.2.18"
 end
 
 appraise "rails40" do
-  gem "rails", "~> 4.0.3"
+  gem "rails", "~> 4.0.4"
 end
 
 appraise "rails41" do
-  gem 'rails', :github => 'rails/rails', :branch => '4-1-stable'
+  gem "rails", "~> 4.1.1"
 end
 
-=begin
 appraise "railsNG" do
   gem 'rails', :github => 'rails/rails', :branch => 'master'
-  #gem 'journey', :github => 'rails/journey'
-  #gem 'activerecord-deprecated_finders', :require => nil,
-      #:github => 'rails/activerecord-deprecated_finders'
-  # TODO Rails 4.0 (once again) forces us to use ActiveRecord :
-  # Java::OrgJrubyRack::RackInitializationException:
-  # No such file or directory - [...]/jruby-rack/src/spec/stub/rails40/WEB-INF/config/database.yml
-#  gem 'activerecord-jdbc-adapter', :github => 'jruby/activerecord-jdbc-adapter'
-#  gem 'activerecord-jdbcsqlite3-adapter', :github => 'jruby/activerecord-jdbc-adapter'
+  gem 'arel', :github => 'rails/arel', :branch => 'master'
 end
-=end
diff --git a/Gemfile b/Gemfile
@@ -12,6 +12,6 @@ group :development do
   gem 'appraisal', :require => nil
 end
 
-gem 'rake', '< 10.2.0', :group => :test, :require => nil
+gem 'rake', '~> 10.3.1', :group => :test, :require => nil
 gem 'rspec', '~> 2.14.1', :group => :test
 gem 'jruby-openssl', :group => :test if JRUBY_VERSION < '1.7.0'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -4,12 +4,9 @@ GEM
     appraisal (0.5.2)
       bundler
       rake
-    bouncy-castle-java (1.5.0147)
     diff-lcs (1.2.5)
-    jruby-openssl (0.9.4)
-      bouncy-castle-java (>= 1.5.0147)
     rack (1.4.5)
-    rake (10.1.1)
+    rake (10.3.1)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -24,7 +21,6 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal
-  jruby-openssl
   rack (~> 1.4.5)
-  rake
+  rake (~> 10.3.1)
   rspec (~> 2.14.1)
diff --git a/gemfiles/rails23.gemfile b/gemfiles/rails23.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rake", :group=>:test, :require=>nil
+gem "rake", "~> 10.3.1", :group=>:test, :require=>nil
 gem "rspec", "~> 2.14.1", :group=>:test
 gem "rails", "~> 2.3.18"
 
diff --git a/gemfiles/rails23.gemfile.lock b/gemfiles/rails23.gemfile.lock
@@ -20,7 +20,7 @@ GEM
       activeresource (= 2.3.18)
       activesupport (= 2.3.18)
       rake (>= 0.8.3)
-    rake (10.1.1)
+    rake (10.3.1)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -35,5 +35,5 @@ PLATFORMS
 
 DEPENDENCIES
   rails (~> 2.3.18)
-  rake
+  rake (~> 10.3.1)
   rspec (~> 2.14.1)
diff --git a/gemfiles/rails30.gemfile b/gemfiles/rails30.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rake", :group=>:test, :require=>nil
+gem "rake", "~> 10.3.1", :group=>:test, :require=>nil
 gem "rspec", "~> 2.14.1", :group=>:test
 gem "rails", "~> 3.0.20"
 
diff --git a/gemfiles/rails30.gemfile.lock b/gemfiles/rails30.gemfile.lock
@@ -61,7 +61,7 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.4)
-    rake (10.1.1)
+    rake (10.3.1)
     rdoc (3.12.2)
       json (~> 1.4)
     rspec (2.14.1)
@@ -83,5 +83,5 @@ PLATFORMS
 
 DEPENDENCIES
   rails (~> 3.0.20)
-  rake
+  rake (~> 10.3.1)
   rspec (~> 2.14.1)
diff --git a/gemfiles/rails31.gemfile b/gemfiles/rails31.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rake", :group=>:test, :require=>nil
+gem "rake", "~> 10.3.1", :group=>:test, :require=>nil
 gem "rspec", "~> 2.14.1", :group=>:test
 gem "rails", "~> 3.1.12"
 
diff --git a/gemfiles/rails31.gemfile.lock b/gemfiles/rails31.gemfile.lock
@@ -41,7 +41,7 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.25.1)
-    multi_json (1.9.2)
+    multi_json (1.10.0)
     polyglot (0.3.4)
     rack (1.3.10)
     rack-cache (1.2)
@@ -67,7 +67,7 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
-    rake (10.1.1)
+    rake (10.3.1)
     rdoc (3.12.2)
       json (~> 1.4)
     rspec (2.14.1)
@@ -94,5 +94,5 @@ PLATFORMS
 
 DEPENDENCIES
   rails (~> 3.1.12)
-  rake
+  rake (~> 10.3.1)
   rspec (~> 2.14.1)
diff --git a/gemfiles/rails32.gemfile b/gemfiles/rails32.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rake", :group=>:test, :require=>nil
+gem "rake", "~> 10.3.1", :group=>:test, :require=>nil
 gem "rspec", "~> 2.14.1", :group=>:test
-gem "rails", "~> 3.2.17"
+gem "rails", "~> 3.2.18"
 
diff --git a/gemfiles/rails32.gemfile.lock b/gemfiles/rails32.gemfile.lock
@@ -1,31 +1,31 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.17)
-      actionpack (= 3.2.17)
+    actionmailer (3.2.18)
+      actionpack (= 3.2.18)
       mail (~> 2.5.4)
-    actionpack (3.2.17)
-      activemodel (= 3.2.17)
-      activesupport (= 3.2.17)
+    actionpack (3.2.18)
+      activemodel (= 3.2.18)
+      activesupport (= 3.2.18)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
       rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.17)
-      activesupport (= 3.2.17)
+    activemodel (3.2.18)
+      activesupport (= 3.2.18)
       builder (~> 3.0.0)
-    activerecord (3.2.17)
-      activemodel (= 3.2.17)
-      activesupport (= 3.2.17)
+    activerecord (3.2.18)
+      activemodel (= 3.2.18)
+      activesupport (= 3.2.18)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.17)
-      activemodel (= 3.2.17)
-      activesupport (= 3.2.17)
-    activesupport (3.2.17)
+    activeresource (3.2.18)
+      activemodel (= 3.2.18)
+      activesupport (= 3.2.18)
+    activesupport (3.2.18)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     arel (3.0.3)
@@ -40,7 +40,7 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.25.1)
-    multi_json (1.9.2)
+    multi_json (1.10.0)
     polyglot (0.3.4)
     rack (1.4.5)
     rack-cache (1.2)
@@ -49,22 +49,22 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.17)
-      actionmailer (= 3.2.17)
-      actionpack (= 3.2.17)
-      activerecord (= 3.2.17)
-      activeresource (= 3.2.17)
-      activesupport (= 3.2.17)
+    rails (3.2.18)
+      actionmailer (= 3.2.18)
+      actionpack (= 3.2.18)
+      activerecord (= 3.2.18)
+      activeresource (= 3.2.18)
+      activesupport (= 3.2.18)
       bundler (~> 1.0)
-      railties (= 3.2.17)
-    railties (3.2.17)
-      actionpack (= 3.2.17)
-      activesupport (= 3.2.17)
+      railties (= 3.2.18)
+    railties (3.2.18)
+      actionpack (= 3.2.18)
+      activesupport (= 3.2.18)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.1.1)
+    rake (10.3.1)
     rdoc (3.12.2)
       json (~> 1.4)
     rspec (2.14.1)
@@ -91,6 +91,6 @@ PLATFORMS
   java
 
 DEPENDENCIES
-  rails (~> 3.2.17)
-  rake
+  rails (~> 3.2.18)
+  rake (~> 10.3.1)
   rspec (~> 2.14.1)
diff --git a/gemfiles/rails40.gemfile b/gemfiles/rails40.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rake", :group=>:test, :require=>nil
+gem "rake", "~> 10.3.1", :group=>:test, :require=>nil
 gem "rspec", "~> 2.14.1", :group=>:test
-gem "rails", "~> 4.0.3"
+gem "rails", "~> 4.0.4"
 
diff --git a/gemfiles/rails40.gemfile.lock b/gemfiles/rails40.gemfile.lock
@@ -1,26 +1,26 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.0.3)
-      actionpack (= 4.0.3)
+    actionmailer (4.0.4)
+      actionpack (= 4.0.4)
       mail (~> 2.5.4)
-    actionpack (4.0.3)
-      activesupport (= 4.0.3)
+    actionpack (4.0.4)
+      activesupport (= 4.0.4)
       builder (~> 3.1.0)
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.3)
-      activesupport (= 4.0.3)
+    activemodel (4.0.4)
+      activesupport (= 4.0.4)
       builder (~> 3.1.0)
-    activerecord (4.0.3)
-      activemodel (= 4.0.3)
+    activerecord (4.0.4)
+      activemodel (= 4.0.4)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.3)
+      activesupport (= 4.0.4)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.3)
-      i18n (~> 0.6, >= 0.6.4)
+    activesupport (4.0.4)
+      i18n (~> 0.6, >= 0.6.9)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
@@ -37,25 +37,25 @@ GEM
       treetop (~> 1.4.8)
     mime-types (1.25.1)
     minitest (4.7.5)
-    multi_json (1.9.2)
+    multi_json (1.10.0)
     polyglot (0.3.4)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.0.3)
-      actionmailer (= 4.0.3)
-      actionpack (= 4.0.3)
-      activerecord (= 4.0.3)
-      activesupport (= 4.0.3)
+    rails (4.0.4)
+      actionmailer (= 4.0.4)
+      actionpack (= 4.0.4)
+      activerecord (= 4.0.4)
+      activesupport (= 4.0.4)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.3)
+      railties (= 4.0.4)
       sprockets-rails (~> 2.0.0)
-    railties (4.0.3)
-      actionpack (= 4.0.3)
-      activesupport (= 4.0.3)
+    railties (4.0.4)
+      actionpack (= 4.0.4)
+      activesupport (= 4.0.4)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.1)
+    rake (10.3.1)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -74,7 +74,7 @@ GEM
       activesupport (>= 3.0)
       sprockets (~> 2.8)
     thor (0.19.1)
-    thread_safe (0.3.0-java)
+    thread_safe (0.3.1-java)
       atomic (>= 1.1.7, < 2)
     tilt (1.4.1)
     treetop (1.4.15)
@@ -86,6 +86,6 @@ PLATFORMS
   java
 
 DEPENDENCIES
-  rails (~> 4.0.3)
-  rake
+  rails (~> 4.0.4)
+  rake (~> 10.3.1)
   rspec (~> 2.14.1)
diff --git a/gemfiles/rails41.gemfile b/gemfiles/rails41.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rake", :group=>:test, :require=>nil
+gem "rake", "~> 10.3.1", :group=>:test, :require=>nil
 gem "rspec", "~> 2.14.1", :group=>:test
-gem "rails", :github=>"rails/rails", :branch=>"4-1-stable"
+gem "rails", "~> 4.1.1"
 
diff --git a/gemfiles/rails41.gemfile.lock b/gemfiles/rails41.gemfile.lock
diff --git a/gemfiles/railsNG.gemfile b/gemfiles/railsNG.gemfile
diff --git a/gemfiles/railsNG.gemfile.lock b/gemfiles/railsNG.gemfile.lock
