diff --git a/Appraisals b/Appraisals index 833ed10..60c782a 100644 --- a/Appraisals +++ b/Appraisals @@ -1,11 +1,11 @@ appraise "rails3.0" do - gem "rails", "~> 3.0.17" + gem "rails", "~> 3.0.18" gem "sqlite3", ">= 1.3.4", platforms: :mri gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby end appraise "rails3.1" do - gem "rails", "~> 3.1.8" + gem "rails", "~> 3.1.9" gem "sass-rails", "~> 3.1.5" gem "coffee-rails", "~> 3.1.1" gem "uglifier", ">= 1.0.3" @@ -15,7 +15,7 @@ appraise "rails3.1" do end appraise "rails3.2" do - gem "rails", "~> 3.2.9" + gem "rails", "~> 3.2.10" gem "sass-rails", "~> 3.2.3" gem "coffee-rails", "~> 3.2.1" gem "uglifier", ">= 1.0.3" diff --git a/gemfiles/rails3.0.gemfile b/gemfiles/rails3.0.gemfile index 064ea07..b789f33 100644 --- a/gemfiles/rails3.0.gemfile +++ b/gemfiles/rails3.0.gemfile @@ -2,7 +2,7 @@ source "http://rubygems.org" -gem "rails", "~> 3.0.17" +gem "rails", "~> 3.0.18" gem "sqlite3", ">= 1.3.4", :platforms=>:mri gem "activerecord-jdbcsqlite3-adapter", :platforms=>:jruby diff --git a/gemfiles/rails3.0.gemfile.lock b/gemfiles/rails3.0.gemfile.lock index d9ea6da..42f5ebb 100644 --- a/gemfiles/rails3.0.gemfile.lock +++ b/gemfiles/rails3.0.gemfile.lock @@ -9,12 +9,12 @@ GEM remote: http://rubygems.org/ specs: abstract (1.0.0) - actionmailer (3.0.17) - actionpack (= 3.0.17) + actionmailer (3.0.18) + actionpack (= 3.0.18) mail (~> 2.2.19) - actionpack (3.0.17) - activemodel (= 3.0.17) - activesupport (= 3.0.17) + actionpack (3.0.18) + activemodel (= 3.0.18) + activesupport (= 3.0.18) builder (~> 2.1.2) erubis (~> 2.6.6) i18n (~> 0.5.0) @@ -22,19 +22,19 @@ GEM rack-mount (~> 0.6.14) rack-test (~> 0.5.7) tzinfo (~> 0.3.23) - activemodel (3.0.17) - activesupport (= 3.0.17) + activemodel (3.0.18) + activesupport (= 3.0.18) builder (~> 2.1.2) i18n (~> 0.5.0) - activerecord (3.0.17) - activemodel (= 3.0.17) - activesupport (= 3.0.17) + activerecord (3.0.18) + activemodel (= 3.0.18) + activesupport (= 3.0.18) arel (~> 2.0.10) tzinfo (~> 0.3.23) - activeresource (3.0.17) - activemodel (= 3.0.17) - activesupport (= 3.0.17) - activesupport (3.0.17) + activeresource (3.0.18) + activemodel (= 3.0.18) + activesupport (= 3.0.18) + activesupport (3.0.18) appraisal (0.5.1) bundler rake @@ -60,7 +60,7 @@ GEM gherkin (2.11.5) json (>= 1.4.6) i18n (0.5.0) - json (1.7.5) + json (1.7.6) mail (2.2.19) activesupport (>= 2.3.6) i18n (>= 0.4.0) @@ -73,17 +73,17 @@ GEM rack (>= 1.0.0) rack-test (0.5.7) rack (>= 1.0) - rails (3.0.17) - actionmailer (= 3.0.17) - actionpack (= 3.0.17) - activerecord (= 3.0.17) - activeresource (= 3.0.17) - activesupport (= 3.0.17) + rails (3.0.18) + actionmailer (= 3.0.18) + actionpack (= 3.0.18) + activerecord (= 3.0.18) + activeresource (= 3.0.18) + activesupport (= 3.0.18) bundler (~> 1.0) - railties (= 3.0.17) - railties (3.0.17) - actionpack (= 3.0.17) - activesupport (= 3.0.17) + railties (= 3.0.18) + railties (3.0.18) + actionpack (= 3.0.18) + activesupport (= 3.0.18) rake (>= 0.8.7) rdoc (~> 3.4) thor (~> 0.14.4) @@ -114,7 +114,7 @@ DEPENDENCIES aruba (~> 0.5.1) cucumber (~> 1.2.1) factory_girl_rails! - rails (~> 3.0.17) + rails (~> 3.0.18) rake rspec (~> 2.11.0) sqlite3 (>= 1.3.4) diff --git a/gemfiles/rails3.1.gemfile b/gemfiles/rails3.1.gemfile index a1070bc..1baa2a9 100644 --- a/gemfiles/rails3.1.gemfile +++ b/gemfiles/rails3.1.gemfile @@ -2,7 +2,11 @@ source "http://rubygems.org" -gem "rails", "~> 3.1.8" +gem "rails", "~> 3.1.9" +gem "sass-rails", "~> 3.1.5" +gem "coffee-rails", "~> 3.1.1" +gem "uglifier", ">= 1.0.3" +gem "turn", "~> 0.8.3" gem "sqlite3", ">= 1.3.4", :platforms=>:mri gem "activerecord-jdbcsqlite3-adapter", :platforms=>:jruby diff --git a/gemfiles/rails3.1.gemfile.lock b/gemfiles/rails3.1.gemfile.lock index 7c7cc0d..206f499 100644 --- a/gemfiles/rails3.1.gemfile.lock +++ b/gemfiles/rails3.1.gemfile.lock @@ -8,12 +8,12 @@ PATH GEM remote: http://rubygems.org/ specs: - actionmailer (3.1.8) - actionpack (= 3.1.8) + actionmailer (3.1.9) + actionpack (= 3.1.9) mail (~> 2.3.3) - actionpack (3.1.8) - activemodel (= 3.1.8) - activesupport (= 3.1.8) + actionpack (3.1.9) + activemodel (= 3.1.9) + activesupport (= 3.1.9) builder (~> 3.0.0) erubis (~> 2.7.0) i18n (~> 0.6) @@ -22,20 +22,21 @@ GEM rack-mount (~> 0.8.2) rack-test (~> 0.6.1) sprockets (~> 2.0.4) - activemodel (3.1.8) - activesupport (= 3.1.8) + activemodel (3.1.9) + activesupport (= 3.1.9) builder (~> 3.0.0) i18n (~> 0.6) - activerecord (3.1.8) - activemodel (= 3.1.8) - activesupport (= 3.1.8) + activerecord (3.1.9) + activemodel (= 3.1.9) + activesupport (= 3.1.9) arel (~> 2.2.3) tzinfo (~> 0.3.29) - activeresource (3.1.8) - activemodel (= 3.1.8) - activesupport (= 3.1.8) - activesupport (3.1.8) + activeresource (3.1.9) + activemodel (= 3.1.9) + activesupport (= 3.1.9) + activesupport (3.1.9) multi_json (>= 1.0, < 1.3) + ansi (1.4.3) appraisal (0.5.1) bundler rake @@ -47,6 +48,13 @@ GEM builder (3.0.4) childprocess (0.3.6) ffi (~> 1.0, >= 1.0.6) + coffee-rails (3.1.1) + coffee-script (>= 2.2.0) + railties (~> 3.1.0) + coffee-script (2.2.0) + coffee-script-source + execjs + coffee-script-source (1.4.0) cucumber (1.2.1) builder (>= 2.1.2) diff-lcs (>= 1.1.3) @@ -54,6 +62,8 @@ GEM json (>= 1.4.6) diff-lcs (1.1.3) erubis (2.7.0) + execjs (1.4.0) + multi_json (~> 1.0) factory_girl (4.1.0) activesupport (>= 3.0.0) ffi (1.2.0) @@ -61,7 +71,7 @@ GEM json (>= 1.4.6) hike (1.2.1) i18n (0.6.1) - json (1.7.5) + json (1.7.6) mail (2.3.3) i18n (>= 0.4.0) mime-types (~> 1.16) @@ -78,17 +88,17 @@ GEM rack rack-test (0.6.2) rack (>= 1.0) - rails (3.1.8) - actionmailer (= 3.1.8) - actionpack (= 3.1.8) - activerecord (= 3.1.8) - activeresource (= 3.1.8) - activesupport (= 3.1.8) + rails (3.1.9) + actionmailer (= 3.1.9) + actionpack (= 3.1.9) + activerecord (= 3.1.9) + activeresource (= 3.1.9) + activesupport (= 3.1.9) bundler (~> 1.0) - railties (= 3.1.8) - railties (3.1.8) - actionpack (= 3.1.8) - activesupport (= 3.1.8) + railties (= 3.1.9) + railties (3.1.9) + actionpack (= 3.1.9) + activesupport (= 3.1.9) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -104,6 +114,12 @@ GEM rspec-expectations (2.11.3) diff-lcs (~> 1.1.3) rspec-mocks (2.11.3) + sass (3.2.4) + sass-rails (3.1.6) + actionpack (~> 3.1.0) + railties (~> 3.1.0) + sass (>= 3.1.10) + tilt (~> 1.3.2) sprockets (2.0.4) hike (~> 1.2) rack (~> 1.0) @@ -114,7 +130,12 @@ GEM treetop (1.4.12) polyglot polyglot (>= 0.3.1) + turn (0.8.3) + ansi tzinfo (0.3.35) + uglifier (1.3.0) + execjs (>= 0.3.0) + multi_json (~> 1.0, >= 1.0.2) PLATFORMS ruby @@ -123,9 +144,13 @@ DEPENDENCIES activerecord-jdbcsqlite3-adapter appraisal (~> 0.5.0) aruba (~> 0.5.1) + coffee-rails (~> 3.1.1) cucumber (~> 1.2.1) factory_girl_rails! - rails (~> 3.1.8) + rails (~> 3.1.9) rake rspec (~> 2.11.0) + sass-rails (~> 3.1.5) sqlite3 (>= 1.3.4) + turn (~> 0.8.3) + uglifier (>= 1.0.3) diff --git a/gemfiles/rails3.2.gemfile b/gemfiles/rails3.2.gemfile index 5fba800..54ad8ce 100644 --- a/gemfiles/rails3.2.gemfile +++ b/gemfiles/rails3.2.gemfile @@ -2,7 +2,10 @@ source "http://rubygems.org" -gem "rails", "~> 3.2.9" +gem "rails", "~> 3.2.10" +gem "sass-rails", "~> 3.2.3" +gem "coffee-rails", "~> 3.2.1" +gem "uglifier", ">= 1.0.3" gem "sqlite3", ">= 1.3.4", :platforms=>:mri gem "activerecord-jdbcsqlite3-adapter", :platforms=>:jruby diff --git a/gemfiles/rails3.2.gemfile.lock b/gemfiles/rails3.2.gemfile.lock index 885a0b4..58adc6b 100644 --- a/gemfiles/rails3.2.gemfile.lock +++ b/gemfiles/rails3.2.gemfile.lock @@ -8,12 +8,12 @@ PATH GEM remote: http://rubygems.org/ specs: - actionmailer (3.2.9) - actionpack (= 3.2.9) + actionmailer (3.2.10) + actionpack (= 3.2.10) mail (~> 2.4.4) - actionpack (3.2.9) - activemodel (= 3.2.9) - activesupport (= 3.2.9) + actionpack (3.2.10) + activemodel (= 3.2.10) + activesupport (= 3.2.10) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -21,18 +21,18 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.9) - activesupport (= 3.2.9) + activemodel (3.2.10) + activesupport (= 3.2.10) builder (~> 3.0.0) - activerecord (3.2.9) - activemodel (= 3.2.9) - activesupport (= 3.2.9) + activerecord (3.2.10) + activemodel (= 3.2.10) + activesupport (= 3.2.10) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.9) - activemodel (= 3.2.9) - activesupport (= 3.2.9) - activesupport (3.2.9) + activeresource (3.2.10) + activemodel (= 3.2.10) + activesupport (= 3.2.10) + activesupport (3.2.10) i18n (~> 0.6) multi_json (~> 1.0) appraisal (0.5.1) @@ -46,6 +46,13 @@ GEM builder (3.0.4) childprocess (0.3.6) ffi (~> 1.0, >= 1.0.6) + coffee-rails (3.2.2) + coffee-script (>= 2.2.0) + railties (~> 3.2.0) + coffee-script (2.2.0) + coffee-script-source + execjs + coffee-script-source (1.4.0) cucumber (1.2.1) builder (>= 2.1.2) diff-lcs (>= 1.1.3) @@ -53,6 +60,8 @@ GEM json (>= 1.4.6) diff-lcs (1.1.3) erubis (2.7.0) + execjs (1.4.0) + multi_json (~> 1.0) factory_girl (4.1.0) activesupport (>= 3.0.0) ffi (1.2.0) @@ -61,7 +70,7 @@ GEM hike (1.2.1) i18n (0.6.1) journey (1.0.4) - json (1.7.5) + json (1.7.6) mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) @@ -76,17 +85,17 @@ GEM rack rack-test (0.6.2) rack (>= 1.0) - rails (3.2.9) - actionmailer (= 3.2.9) - actionpack (= 3.2.9) - activerecord (= 3.2.9) - activeresource (= 3.2.9) - activesupport (= 3.2.9) + rails (3.2.10) + actionmailer (= 3.2.10) + actionpack (= 3.2.10) + activerecord (= 3.2.10) + activeresource (= 3.2.10) + activesupport (= 3.2.10) bundler (~> 1.0) - railties (= 3.2.9) - railties (3.2.9) - actionpack (= 3.2.9) - activesupport (= 3.2.9) + railties (= 3.2.10) + railties (3.2.10) + actionpack (= 3.2.10) + activesupport (= 3.2.10) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -102,6 +111,11 @@ GEM rspec-expectations (2.11.3) diff-lcs (~> 1.1.3) rspec-mocks (2.11.3) + sass (3.2.4) + sass-rails (3.2.5) + railties (~> 3.2.0) + sass (>= 3.1.10) + tilt (~> 1.3) sprockets (2.2.2) hike (~> 1.2) multi_json (~> 1.0) @@ -114,6 +128,9 @@ GEM polyglot polyglot (>= 0.3.1) tzinfo (0.3.35) + uglifier (1.3.0) + execjs (>= 0.3.0) + multi_json (~> 1.0, >= 1.0.2) PLATFORMS ruby @@ -122,9 +139,12 @@ DEPENDENCIES activerecord-jdbcsqlite3-adapter appraisal (~> 0.5.0) aruba (~> 0.5.1) + coffee-rails (~> 3.2.1) cucumber (~> 1.2.1) factory_girl_rails! - rails (~> 3.2.9) + rails (~> 3.2.10) rake rspec (~> 2.11.0) + sass-rails (~> 3.2.3) sqlite3 (>= 1.3.4) + uglifier (>= 1.0.3)