Update Gemfile to make sure we can run the test locally, and also upg…

…rade Rails 3.1 beta to latest version

Appraisals

@@ -7,5 +7,5 @@ appraise "rails3" do
 end
 
 appraise "rails3_1" do
-  gem "rails", "~> 3.1.0.rc4"
+  gem "rails", "~> 3.1.0.rc5"
 end

Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source "http://rubygems.org"
 
 gem "activerecord", :require => "active_record"
 gem "appraisal"
@@ -14,5 +14,8 @@ gem "rdoc", :require => false
 gem "shoulda"
 gem "sqlite3", "~>1.3.4"
 
+# This is for Rails 3.1
+gem "sprockets", "~> 2.0.0.beta.13", :require => false
+
 # gem "ruby-debug", :platform => :ruby_18
 # gem "ruby-debug19", :platform => :ruby_19

Gemfile.lock

@@ -45,6 +45,7 @@ GEM
       json (>= 1.4.6)
     gherkin (2.4.5-java)
       json (>= 1.4.6)
+    hike (1.2.0)
     jruby-openssl (0.7.4)
       bouncy-castle-java
     json (1.5.3)
@@ -55,6 +56,7 @@ GEM
     nokogiri (1.4.4)
     nokogiri (1.4.4-java)
       weakling (>= 0.0.3)
+    rack (1.3.2)
     rake (0.9.2)
     rdoc (3.8)
     rspec (2.6.0)
@@ -67,8 +69,13 @@ GEM
     rspec-mocks (2.6.0)
     ruby-hmac (0.4.0)
     shoulda (2.11.3)
+    sprockets (2.0.0.beta.13)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.4)
     term-ansicolor (1.0.5)
+    tilt (1.3.2)
     weakling (0.0.4-java)
     xml-simple (1.0.16)
 
@@ -89,4 +96,5 @@ DEPENDENCIES
   rake
   rdoc
   shoulda
+  sprockets (~> 2.0.0.beta.13)
   sqlite3 (~> 1.3.4)

gemfiles/rails2.gemfile

@@ -2,17 +2,19 @@
 
 source "http://rubygems.org"
 
-gem "sqlite3", "~>1.3.4"
-gem "rails", "~> 2.3.12"
-gem "rake"
+gem "activerecord", :require=>"active_record"
+gem "appraisal"
+gem "aws-s3", :require=>"aws/s3"
+gem "bundler"
 gem "cocaine"
-gem "shoulda"
-gem "mime-types"
+gem "fog"
 gem "jruby-openssl", :platform=>:jruby
+gem "mime-types"
 gem "mocha"
-gem "bundler"
-gem "fog"
-gem "aws-s3", :require=>"aws/s3"
-gem "appraisal"
+gem "rake"
 gem "rdoc", :require=>false
+gem "shoulda"
+gem "sqlite3", "~>1.3.4"
+gem "sprockets", "~> 2.0.0.beta.13", :require=>false
+gem "rails", "~> 2.3.12"
 

gemfiles/rails2.gemfile.lock

@@ -57,6 +57,7 @@ GEM
       json (>= 1.4.6)
     gherkin (2.4.5-java)
       json (>= 1.4.6)
+    hike (1.2.0)
     jruby-openssl (0.7.4)
       bouncy-castle-java
     json (1.5.3)
@@ -89,15 +90,21 @@ GEM
     rspec-mocks (2.6.0)
     ruby-hmac (0.4.0)
     shoulda (2.11.3)
+    sprockets (2.0.0.beta.13)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (!= 1.3.0, ~> 1.1)
     sqlite3 (1.3.4)
     term-ansicolor (1.0.6)
+    tilt (1.3.2)
     xml-simple (1.1.0)
 
 PLATFORMS
   java
   ruby
 
 DEPENDENCIES
+  activerecord
   appraisal
   aws-s3
   bundler
@@ -110,4 +117,5 @@ DEPENDENCIES
   rake
   rdoc
   shoulda
+  sprockets (~> 2.0.0.beta.13)
   sqlite3 (~> 1.3.4)

gemfiles/rails3.gemfile

@@ -2,17 +2,19 @@
 
 source "http://rubygems.org"
 
-gem "sqlite3", "~>1.3.4"
-gem "rails", "~> 3.0.9"
-gem "rake"
+gem "activerecord", :require=>"active_record"
+gem "appraisal"
+gem "aws-s3", :require=>"aws/s3"
+gem "bundler"
 gem "cocaine"
-gem "shoulda"
-gem "mime-types"
+gem "fog"
 gem "jruby-openssl", :platform=>:jruby
+gem "mime-types"
 gem "mocha"
-gem "bundler"
-gem "fog"
-gem "aws-s3", :require=>"aws/s3"
-gem "appraisal"
+gem "rake"
 gem "rdoc", :require=>false
+gem "shoulda"
+gem "sqlite3", "~>1.3.4"
+gem "sprockets", "~> 2.0.0.beta.13", :require=>false
+gem "rails", "~> 3.0.9"
 

gemfiles/rails3.gemfile.lock

@@ -77,6 +77,7 @@ GEM
       json (>= 1.4.6)
     gherkin (2.4.5-java)
       json (>= 1.4.6)
+    hike (1.2.0)
     i18n (0.5.0)
     jruby-openssl (0.7.4)
       bouncy-castle-java
@@ -127,9 +128,14 @@ GEM
     rspec-mocks (2.6.0)
     ruby-hmac (0.4.0)
     shoulda (2.11.3)
+    sprockets (2.0.0.beta.13)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (!= 1.3.0, ~> 1.1)
     sqlite3 (1.3.4)
     term-ansicolor (1.0.6)
     thor (0.14.6)
+    tilt (1.3.2)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
     tzinfo (0.3.29)
@@ -140,6 +146,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord
   appraisal
   aws-s3
   bundler
@@ -152,4 +159,5 @@ DEPENDENCIES
   rake
   rdoc
   shoulda
+  sprockets (~> 2.0.0.beta.13)
   sqlite3 (~> 1.3.4)

gemfiles/rails3_1.gemfile

@@ -2,17 +2,19 @@
 
 source "http://rubygems.org"
 
-gem "sqlite3", "~>1.3.4"
-gem "rails", "~> 3.1.0.rc4"
-gem "rake"
+gem "activerecord", :require=>"active_record"
+gem "appraisal"
+gem "aws-s3", :require=>"aws/s3"
+gem "bundler"
 gem "cocaine"
-gem "shoulda"
-gem "mime-types"
+gem "fog"
 gem "jruby-openssl", :platform=>:jruby
+gem "mime-types"
 gem "mocha"
-gem "bundler"
-gem "fog"
-gem "aws-s3", :require=>"aws/s3"
-gem "appraisal"
+gem "rake"
 gem "rdoc", :require=>false
+gem "shoulda"
+gem "sqlite3", "~>1.3.4"
+gem "sprockets", "~> 2.0.0.beta.13", :require=>false
+gem "rails", "~> 3.1.0.rc5"