Updates for Rails 3.1, I18n 0.6

copycopter · Sep 9, 2011 · 70fd5ca · 70fd5ca
1 parent eb8b45c
commit 70fd5ca
Show file tree

Hide file tree

Showing 11 changed files with 257 additions and 62 deletions.
diff --git a/Appraisals b/Appraisals
@@ -6,3 +6,7 @@ appraise "3.0" do
   gem "rails", "~> 3.0.3"
 end
 
+appraise "3.1" do
+  gem "rails", "~> 3.1.0"
+end
+
diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,6 @@
 source "http://rubygems.org"
 
-gem "json"
-gem "rails", "~> 3.0.3"
+gem "rails", "~> 3.1.0"
 gem "sqlite3-ruby", :require => false
 gem "rspec", "~> 2.3"
 gem "bourne"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,45 +1,48 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.10)
-      actionpack (= 3.0.10)
-      mail (~> 2.2.19)
-    actionpack (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.10)
-      activesupport (= 3.0.10)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
-    activesupport (3.0.10)
+    actionmailer (3.1.0)
+      actionpack (= 3.1.0)
+      mail (~> 2.3.0)
+    actionpack (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.2)
+      rack-cache (~> 1.0.3)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.0)
+    activemodel (3.1.0)
+      activesupport (= 3.1.0)
+      bcrypt-ruby (~> 3.0.0)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+    activesupport (3.1.0)
+      multi_json (~> 1.0)
     addressable (2.2.6)
     appraisal (0.3.8)
       bundler
       rake
-    arel (2.0.10)
+    arel (2.2.1)
     aruba (0.3.7)
       childprocess (>= 0.1.9)
       cucumber (>= 0.10.5)
       rspec (>= 2.6.0)
+    bcrypt-ruby (3.0.0)
     bourne (1.0)
       mocha (= 0.9.8)
-    builder (2.1.2)
+    builder (3.0.0)
     childprocess (0.2.2)
       ffi (~> 1.0.6)
     columnize (0.3.4)
@@ -52,44 +55,49 @@ GEM
       term-ansicolor (>= 1.0.5)
     daemons (1.1.4)
     diff-lcs (1.1.3)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
+    erubis (2.7.0)
     eventmachine (0.12.10)
     ffi (1.0.9)
     gherkin (2.4.18)
       json (>= 1.4.6)
-    i18n (0.5.0)
+    hike (1.2.1)
+    i18n (0.6.0)
     json (1.5.4)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
+    mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
     mocha (0.9.8)
       rake
+    multi_json (1.0.3)
     polyglot (0.3.2)
-    rack (1.2.3)
-    rack-mount (0.6.14)
+    rack (1.3.2)
+    rack-cache (1.0.3)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rack-test (0.5.7)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.0.10)
-      actionmailer (= 3.0.10)
-      actionpack (= 3.0.10)
-      activerecord (= 3.0.10)
-      activeresource (= 3.0.10)
-      activesupport (= 3.0.10)
+    rails (3.1.0)
+      actionmailer (= 3.1.0)
+      actionpack (= 3.1.0)
+      activerecord (= 3.1.0)
+      activeresource (= 3.1.0)
+      activesupport (= 3.1.0)
       bundler (~> 1.0)
-      railties (= 3.0.10)
-    railties (3.0.10)
-      actionpack (= 3.0.10)
-      activesupport (= 3.0.10)
+      railties (= 3.1.0)
+    railties (3.1.0)
+      actionpack (= 3.1.0)
+      activesupport (= 3.1.0)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.4)
+      thor (~> 0.14.6)
     rake (0.9.2)
     rbx-require-relative (0.0.5)
     rdoc (3.9.4)
@@ -111,6 +119,10 @@ GEM
     sinatra (1.2.6)
       rack (~> 1.1)
       tilt (< 2.0, >= 1.2.2)
+    sprockets (2.0.0)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (!= 1.3.0, ~> 1.1)
     sqlite3 (1.3.4)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
@@ -139,8 +151,7 @@ DEPENDENCIES
   bourne
   cucumber (~> 0.10.0)
   i18n
-  json
-  rails (~> 3.0.3)
+  rails (~> 3.1.0)
   rake (= 0.9.2)
   rspec (~> 2.3)
   ruby-debug

diff --git a/features/step_definitions/rails_steps.rb b/features/step_definitions/rails_steps.rb
@@ -1,11 +1,17 @@
 When "I generate a rails application" do
   if Rails::VERSION::MAJOR == 3
     subcommand = 'new'
+    if Rails::VERSION::MINOR == 0
+      options = ''
+    else
+      options = '--skip-bundle'
+    end
   else
     subcommand = ''
+    options = ''
   end
 
-  run_simple("rails _#{Rails::VERSION::STRING}_ #{subcommand} testapp")
+  run_simple("rails _#{Rails::VERSION::STRING}_ #{subcommand} testapp #{options}")
   cd("testapp")
 
   if Rails::VERSION::MAJOR == 3

diff --git a/gemfiles/2.3.gemfile b/gemfiles/2.3.gemfile
@@ -12,7 +12,6 @@ gem "rspec", "~> 2.3"
 gem "yard", :require=>false
 gem "aruba", "~> 0.3.2"
 gem "thin"
-gem "json"
 gem "sinatra", :require=>false
 gem "cucumber", "~> 0.10.0"
 gem "i18n"

diff --git a/gemfiles/2.3.gemfile.lock b/gemfiles/2.3.gemfile.lock
@@ -11,7 +11,6 @@ GEM
     activeresource (2.3.14)
       activesupport (= 2.3.14)
     activesupport (2.3.14)
-    addressable (2.2.6)
     appraisal (0.3.8)
       bundler
       rake
@@ -25,7 +24,6 @@ GEM
     childprocess (0.2.2)
       ffi (~> 1.0.6)
     columnize (0.3.4)
-    crack (0.1.8)
     cucumber (0.10.7)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
@@ -82,8 +80,6 @@ GEM
       rack (>= 1.0.0)
     tilt (1.3.3)
     webmock (1.7.6)
-      addressable (> 2.2.5, ~> 2.2)
-      crack (>= 0.1.7)
     yard (0.7.2)
 
 PLATFORMS
@@ -95,7 +91,6 @@ DEPENDENCIES
   bourne
   cucumber (~> 0.10.0)
   i18n
-  json
   rails (~> 2.3)
   rake (= 0.9.2)
   rspec (~> 2.3)

diff --git a/gemfiles/3.0.gemfile b/gemfiles/3.0.gemfile
@@ -12,7 +12,6 @@ gem "rspec", "~> 2.3"
 gem "yard", :require=>false
 gem "aruba", "~> 0.3.2"
 gem "thin"
-gem "json"
 gem "sinatra", :require=>false
 gem "cucumber", "~> 0.10.0"
 gem "i18n"

diff --git a/gemfiles/3.0.gemfile.lock b/gemfiles/3.0.gemfile.lock
@@ -139,7 +139,6 @@ DEPENDENCIES
   bourne
   cucumber (~> 0.10.0)
   i18n
-  json
   rails (~> 3.0.3)
   rake (= 0.9.2)
   rspec (~> 2.3)

diff --git a/gemfiles/3.1.gemfile b/gemfiles/3.1.gemfile
@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "ruby-debug"
+gem "rails", "~> 3.1.0"
+gem "sqlite3-ruby", :require=>false
+gem "rake", "0.9.2"
+gem "bourne"
+gem "sham_rack"
+gem "rspec", "~> 2.3"
+gem "yard", :require=>false
+gem "aruba", "~> 0.3.2"
+gem "thin"
+gem "sinatra", :require=>false
+gem "cucumber", "~> 0.10.0"
+gem "i18n"
+gem "appraisal", :require=>false
+gem "webmock"
+