Skip to content

P
paperclip
Commit e0bbebcc by Prem Sichanugrist
Options

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

Update Gemfile to make sure we can run the test locally, and also upgrade Rails 3.1 beta to latest version
parent 24cc2781
Showing with 112 additions and 87 deletions
Appraisals
...@@ -7,5 +7,5 @@ appraise "rails3" do ...@@ -7,5 +7,5 @@ appraise "rails3" do
end end
appraise "rails3_1" do appraise "rails3_1" do
gem "rails", "~> 3.1.0.rc4" gem "rails", "~> 3.1.0.rc5"
end end
Gemfile
source :rubygems source "http://rubygems.org"
gem "activerecord", :require => "active_record" gem "activerecord", :require => "active_record"
gem "appraisal" gem "appraisal"
...@@ -14,5 +14,8 @@ gem "rdoc", :require => false ...@@ -14,5 +14,8 @@ gem "rdoc", :require => false
gem "shoulda" gem "shoulda"
gem "sqlite3", "~>1.3.4" 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-debug", :platform => :ruby_18
# gem "ruby-debug19", :platform => :ruby_19 # gem "ruby-debug19", :platform => :ruby_19
Gemfile.lock
...@@ -45,6 +45,7 @@ GEM ...@@ -45,6 +45,7 @@ GEM
json (>= 1.4.6) json (>= 1.4.6)
gherkin (2.4.5-java) gherkin (2.4.5-java)
json (>= 1.4.6) json (>= 1.4.6)
hike (1.2.0)
jruby-openssl (0.7.4) jruby-openssl (0.7.4)
bouncy-castle-java bouncy-castle-java
json (1.5.3) json (1.5.3)
...@@ -55,6 +56,7 @@ GEM ...@@ -55,6 +56,7 @@ GEM
nokogiri (1.4.4) nokogiri (1.4.4)
nokogiri (1.4.4-java) nokogiri (1.4.4-java)
weakling (>= 0.0.3) weakling (>= 0.0.3)
rack (1.3.2)
rake (0.9.2) rake (0.9.2)
rdoc (3.8) rdoc (3.8)
rspec (2.6.0) rspec (2.6.0)
...@@ -67,8 +69,13 @@ GEM ...@@ -67,8 +69,13 @@ GEM
rspec-mocks (2.6.0) rspec-mocks (2.6.0)
ruby-hmac (0.4.0) ruby-hmac (0.4.0)
shoulda (2.11.3) 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) sqlite3 (1.3.4)
term-ansicolor (1.0.5) term-ansicolor (1.0.5)
tilt (1.3.2)
weakling (0.0.4-java) weakling (0.0.4-java)
xml-simple (1.0.16) xml-simple (1.0.16)
...@@ -89,4 +96,5 @@ DEPENDENCIES ...@@ -89,4 +96,5 @@ DEPENDENCIES
rake rake
rdoc rdoc
shoulda shoulda
sprockets (~> 2.0.0.beta.13)
sqlite3 (~> 1.3.4) sqlite3 (~> 1.3.4)
gemfiles/rails2.gemfile
...@@ -2,17 +2,19 @@ ...@@ -2,17 +2,19 @@
source "http://rubygems.org" source "http://rubygems.org"
gem "sqlite3", "~>1.3.4" gem "activerecord", :require=>"active_record"
gem "rails", "~> 2.3.12" gem "appraisal"
gem "rake" gem "aws-s3", :require=>"aws/s3"
gem "bundler"
gem "cocaine" gem "cocaine"
gem "shoulda" gem "fog"
gem "mime-types"
gem "jruby-openssl", :platform=>:jruby gem "jruby-openssl", :platform=>:jruby
gem "mime-types"
gem "mocha" gem "mocha"
gem "bundler" gem "rake"
gem "fog"
gem "aws-s3", :require=>"aws/s3"
gem "appraisal"
gem "rdoc", :require=>false 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 ...@@ -57,6 +57,7 @@ GEM
json (>= 1.4.6) json (>= 1.4.6)
gherkin (2.4.5-java) gherkin (2.4.5-java)
json (>= 1.4.6) json (>= 1.4.6)
hike (1.2.0)
jruby-openssl (0.7.4) jruby-openssl (0.7.4)
bouncy-castle-java bouncy-castle-java
json (1.5.3) json (1.5.3)
...@@ -89,8 +90,13 @@ GEM ...@@ -89,8 +90,13 @@ GEM
rspec-mocks (2.6.0) rspec-mocks (2.6.0)
ruby-hmac (0.4.0) ruby-hmac (0.4.0)
shoulda (2.11.3) 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) sqlite3 (1.3.4)
term-ansicolor (1.0.6) term-ansicolor (1.0.6)
tilt (1.3.2)
xml-simple (1.1.0) xml-simple (1.1.0)
PLATFORMS PLATFORMS
...@@ -98,6 +104,7 @@ PLATFORMS ...@@ -98,6 +104,7 @@ PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
activerecord
appraisal appraisal
aws-s3 aws-s3
bundler bundler
...@@ -110,4 +117,5 @@ DEPENDENCIES ...@@ -110,4 +117,5 @@ DEPENDENCIES
rake rake
rdoc rdoc
shoulda shoulda
sprockets (~> 2.0.0.beta.13)
sqlite3 (~> 1.3.4) sqlite3 (~> 1.3.4)
gemfiles/rails3.gemfile
...@@ -2,17 +2,19 @@ ...@@ -2,17 +2,19 @@
source "http://rubygems.org" source "http://rubygems.org"
gem "sqlite3", "~>1.3.4" gem "activerecord", :require=>"active_record"
gem "rails", "~> 3.0.9" gem "appraisal"
gem "rake" gem "aws-s3", :require=>"aws/s3"
gem "bundler"
gem "cocaine" gem "cocaine"
gem "shoulda" gem "fog"
gem "mime-types"
gem "jruby-openssl", :platform=>:jruby gem "jruby-openssl", :platform=>:jruby
gem "mime-types"
gem "mocha" gem "mocha"
gem "bundler" gem "rake"
gem "fog"
gem "aws-s3", :require=>"aws/s3"
gem "appraisal"
gem "rdoc", :require=>false 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 ...@@ -77,6 +77,7 @@ GEM
json (>= 1.4.6) json (>= 1.4.6)
gherkin (2.4.5-java) gherkin (2.4.5-java)
json (>= 1.4.6) json (>= 1.4.6)
hike (1.2.0)
i18n (0.5.0) i18n (0.5.0)
jruby-openssl (0.7.4) jruby-openssl (0.7.4)
bouncy-castle-java bouncy-castle-java
...@@ -127,9 +128,14 @@ GEM ...@@ -127,9 +128,14 @@ GEM
rspec-mocks (2.6.0) rspec-mocks (2.6.0)
ruby-hmac (0.4.0) ruby-hmac (0.4.0)
shoulda (2.11.3) 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) sqlite3 (1.3.4)
term-ansicolor (1.0.6) term-ansicolor (1.0.6)
thor (0.14.6) thor (0.14.6)
tilt (1.3.2)
treetop (1.4.9) treetop (1.4.9)
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
tzinfo (0.3.29) tzinfo (0.3.29)
...@@ -140,6 +146,7 @@ PLATFORMS ...@@ -140,6 +146,7 @@ PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
activerecord
appraisal appraisal
aws-s3 aws-s3
bundler bundler
...@@ -152,4 +159,5 @@ DEPENDENCIES ...@@ -152,4 +159,5 @@ DEPENDENCIES
rake rake
rdoc rdoc
shoulda shoulda
sprockets (~> 2.0.0.beta.13)
sqlite3 (~> 1.3.4) sqlite3 (~> 1.3.4)
gemfiles/rails3_1.gemfile
...@@ -2,17 +2,19 @@ ...@@ -2,17 +2,19 @@
source "http://rubygems.org" source "http://rubygems.org"
gem "sqlite3", "~>1.3.4" gem "activerecord", :require=>"active_record"
gem "rails", "~> 3.1.0.rc4" gem "appraisal"
gem "rake" gem "aws-s3", :require=>"aws/s3"
gem "bundler"
gem "cocaine" gem "cocaine"
gem "shoulda" gem "fog"
gem "mime-types"
gem "jruby-openssl", :platform=>:jruby gem "jruby-openssl", :platform=>:jruby
gem "mime-types"
gem "mocha" gem "mocha"
gem "bundler" gem "rake"
gem "fog"
gem "aws-s3", :require=>"aws/s3"
gem "appraisal"
gem "rdoc", :require=>false 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"
gemfiles/rails3_1.gemfile.lock
GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
actionmailer (3.1.0.rc4) actionmailer (3.1.0.rc5)
actionpack (= 3.1.0.rc4) actionpack (= 3.1.0.rc5)
mail (~> 2.3.0) mail (~> 2.3.0)
actionpack (3.1.0.rc4) actionpack (3.1.0.rc5)
activemodel (= 3.1.0.rc4) activemodel (= 3.1.0.rc5)
activesupport (= 3.1.0.rc4) activesupport (= 3.1.0.rc5)
builder (~> 3.0.0) builder (~> 3.0.0)
erubis (~> 2.7.0) erubis (~> 2.7.0)
i18n (~> 0.6) i18n (~> 0.6)
rack (~> 1.3.0) rack (~> 1.3.1)
rack-cache (~> 1.0.1) rack-cache (~> 1.0.2)
rack-mount (~> 0.8.1) rack-mount (~> 0.8.1)
rack-test (~> 0.6.0) rack-test (~> 0.6.0)
sprockets (~> 2.0.0.beta.10) sprockets (~> 2.0.0.beta.12)
tzinfo (~> 0.3.27) activemodel (3.1.0.rc5)
activemodel (3.1.0.rc4) activesupport (= 3.1.0.rc5)
activesupport (= 3.1.0.rc4)
bcrypt-ruby (~> 2.1.4) bcrypt-ruby (~> 2.1.4)
builder (~> 3.0.0) builder (~> 3.0.0)
i18n (~> 0.6) i18n (~> 0.6)
activerecord (3.1.0.rc4) activerecord (3.1.0.rc5)
activemodel (= 3.1.0.rc4) activemodel (= 3.1.0.rc5)
activesupport (= 3.1.0.rc4) activesupport (= 3.1.0.rc5)
arel (~> 2.1.1) arel (~> 2.1.4)
tzinfo (~> 0.3.27) tzinfo (~> 0.3.29)
activeresource (3.1.0.rc4) activeresource (3.1.0.rc5)
activemodel (= 3.1.0.rc4) activemodel (= 3.1.0.rc5)
activesupport (= 3.1.0.rc4) activesupport (= 3.1.0.rc5)
activesupport (3.1.0.rc4) activesupport (3.1.0.rc5)
multi_json (~> 1.0) multi_json (~> 1.0)
appraisal (0.3.7) appraisal (0.3.7)
aruba (~> 0.4.2) aruba (~> 0.4.2)
bundler bundler
rake rake
arel (2.1.3) arel (2.1.4)
aruba (0.4.3) aruba (0.4.5)
bcat (>= 0.6.1) bcat (>= 0.6.1)
childprocess (>= 0.1.9) childprocess (>= 0.1.9)
cucumber (>= 0.10.7) cucumber (>= 0.10.7)
...@@ -49,8 +48,6 @@ GEM ...@@ -49,8 +48,6 @@ GEM
bcat (0.6.1) bcat (0.6.1)
rack (~> 1.0) rack (~> 1.0)
bcrypt-ruby (2.1.4) bcrypt-ruby (2.1.4)
bcrypt-ruby (2.1.4-java)
bouncy-castle-java (1.5.0146.1)
builder (3.0.0) builder (3.0.0)
childprocess (0.2.0) childprocess (0.2.0)
ffi (~> 1.0.6) ffi (~> 1.0.6)
...@@ -65,28 +62,22 @@ GEM ...@@ -65,28 +62,22 @@ GEM
erubis (2.7.0) erubis (2.7.0)
excon (0.6.5) excon (0.6.5)
ffi (1.0.9) ffi (1.0.9)
ffi (1.0.9-java) fog (0.10.0)
fog (0.9.0)
builder builder
excon (~> 0.6.1) excon (~> 0.6.5)
formatador (>= 0.1.3) formatador (~> 0.2.0)
json
mime-types mime-types
net-scp (>= 1.0.4) multi_json (~> 1.0.3)
net-ssh (>= 2.1.4) net-scp (~> 1.0.4)
nokogiri (>= 1.4.4) net-ssh (~> 2.1.4)
nokogiri (~> 1.5.0)
ruby-hmac ruby-hmac
formatador (0.2.0) formatador (0.2.0)
gherkin (2.4.5) gherkin (2.4.5)
json (>= 1.4.6) json (>= 1.4.6)
gherkin (2.4.5-java)
json (>= 1.4.6)
hike (1.2.0) hike (1.2.0)
i18n (0.6.0) i18n (0.6.0)
jruby-openssl (0.7.4)
bouncy-castle-java
json (1.5.3) json (1.5.3)
json (1.5.3-java)
mail (2.3.0) mail (2.3.0)
i18n (>= 0.4.0) i18n (>= 0.4.0)
mime-types (~> 1.16) mime-types (~> 1.16)
...@@ -98,35 +89,34 @@ GEM ...@@ -98,35 +89,34 @@ GEM
net-ssh (>= 1.99.1) net-ssh (>= 1.99.1)
net-ssh (2.1.4) net-ssh (2.1.4)
nokogiri (1.5.0) nokogiri (1.5.0)
nokogiri (1.5.0-java) polyglot (0.3.2)
polyglot (0.3.1) rack (1.3.2)
rack (1.3.1)
rack-cache (1.0.2) rack-cache (1.0.2)
rack (>= 0.4) rack (>= 0.4)
rack-mount (0.8.1) rack-mount (0.8.1)
rack (>= 1.0.0) rack (>= 1.0.0)
rack-ssl (1.3.2) rack-ssl (1.3.2)
rack rack
rack-test (0.6.0) rack-test (0.6.1)
rack (>= 1.0) rack (>= 1.0)
rails (3.1.0.rc4) rails (3.1.0.rc5)
actionmailer (= 3.1.0.rc4) actionmailer (= 3.1.0.rc5)
actionpack (= 3.1.0.rc4) actionpack (= 3.1.0.rc5)
activerecord (= 3.1.0.rc4) activerecord (= 3.1.0.rc5)
activeresource (= 3.1.0.rc4) activeresource (= 3.1.0.rc5)
activesupport (= 3.1.0.rc4) activesupport (= 3.1.0.rc5)
bundler (~> 1.0) bundler (~> 1.0)
railties (= 3.1.0.rc4) railties (= 3.1.0.rc5)
railties (3.1.0.rc4) railties (3.1.0.rc5)
actionpack (= 3.1.0.rc4) actionpack (= 3.1.0.rc5)
activesupport (= 3.1.0.rc4) activesupport (= 3.1.0.rc5)
rack-ssl (~> 1.3.2) rack-ssl (~> 1.3.2)
rake (>= 0.8.7) rake (>= 0.8.7)
rdoc (~> 3.4) rdoc (~> 3.4)
thor (~> 0.14.6) thor (~> 0.14.6)
rake (0.9.2) rake (0.9.2)
rdiscount (1.6.8) rdiscount (1.6.8)
rdoc (3.8) rdoc (3.9.1)
rspec (2.6.0) rspec (2.6.0)
rspec-core (~> 2.6.0) rspec-core (~> 2.6.0)
rspec-expectations (~> 2.6.0) rspec-expectations (~> 2.6.0)
...@@ -137,24 +127,25 @@ GEM ...@@ -137,24 +127,25 @@ GEM
rspec-mocks (2.6.0) rspec-mocks (2.6.0)
ruby-hmac (0.4.0) ruby-hmac (0.4.0)
shoulda (2.11.3) shoulda (2.11.3)
sprockets (2.0.0.beta.10) sprockets (2.0.0.beta.13)
hike (~> 1.0) hike (~> 1.2)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (!= 1.3.0, ~> 1.1)
sqlite3 (1.3.4) sqlite3 (1.3.4)
term-ansicolor (1.0.6) term-ansicolor (1.0.6)
thor (0.14.6) thor (0.14.6)
tilt (1.3.2) tilt (1.3.2)
treetop (1.4.9) treetop (1.4.10)
polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
tzinfo (0.3.29) tzinfo (0.3.29)
xml-simple (1.1.0) xml-simple (1.1.0)
PLATFORMS PLATFORMS
java
ruby ruby
DEPENDENCIES DEPENDENCIES
activerecord
appraisal appraisal
aws-s3 aws-s3
bundler bundler
...@@ -163,8 +154,9 @@ DEPENDENCIES ...@@ -163,8 +154,9 @@ DEPENDENCIES
jruby-openssl jruby-openssl
mime-types mime-types
mocha mocha
rails (~> 3.1.0.rc4) rails (~> 3.1.0.rc5)
rake rake
rdoc rdoc
shoulda shoulda
sprockets (~> 2.0.0.beta.13)
sqlite3 (~> 1.3.4) sqlite3 (~> 1.3.4)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment