diff --git a/.travis.yml b/.travis.yml index 5d50e08..d91e487 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ rvm: - jruby-19mode before_install: - gem update --system - - gem install minitest-rails therubyrhino jquery-rails rspec-rails jdk: - openjdk6 gemfile: diff --git a/Appraisals b/Appraisals index 60c782a..d6e7028 100644 --- a/Appraisals +++ b/Appraisals @@ -1,24 +1,36 @@ appraise "rails3.0" do - gem "rails", "~> 3.0.18" + gem "rails", "3.0.18" gem "sqlite3", ">= 1.3.4", platforms: :mri gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby + gem "minitest-rails" + gem "therubyrhino" + gem "jquery-rails" + gem "rspec-rails" end appraise "rails3.1" do - 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 "rails", "3.1.9" + gem "sass-rails" + gem "coffee-rails" + gem "uglifier" + gem "turn" gem "sqlite3", ">= 1.3.4", platforms: :mri gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby + gem "minitest-rails" + gem "therubyrhino" + gem "jquery-rails" + gem "rspec-rails" end appraise "rails3.2" do - gem "rails", "~> 3.2.10" - gem "sass-rails", "~> 3.2.3" - gem "coffee-rails", "~> 3.2.1" - gem "uglifier", ">= 1.0.3" + gem "rails", "3.2.10" + gem "sass-rails" + gem "coffee-rails" + gem "uglifier" gem "sqlite3", ">= 1.3.4", platforms: :mri gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby + gem "minitest-rails" + gem "therubyrhino" + gem "jquery-rails" + gem "rspec-rails" end diff --git a/gemfiles/rails3.0.gemfile b/gemfiles/rails3.0.gemfile index b789f33..5bba1c3 100644 --- a/gemfiles/rails3.0.gemfile +++ b/gemfiles/rails3.0.gemfile @@ -2,8 +2,12 @@ source "http://rubygems.org" -gem "rails", "~> 3.0.18" +gem "rails", "3.0.18" gem "sqlite3", ">= 1.3.4", :platforms=>:mri gem "activerecord-jdbcsqlite3-adapter", :platforms=>:jruby +gem "minitest-rails" +gem "therubyrhino" +gem "jquery-rails" +gem "rspec-rails" gemspec :path=>"../" \ No newline at end of file diff --git a/gemfiles/rails3.0.gemfile.lock b/gemfiles/rails3.0.gemfile.lock index 42f5ebb..8a70039 100644 --- a/gemfiles/rails3.0.gemfile.lock +++ b/gemfiles/rails3.0.gemfile.lock @@ -60,6 +60,9 @@ GEM gherkin (2.11.5) json (>= 1.4.6) i18n (0.5.0) + jquery-rails (2.1.4) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) json (1.7.6) mail (2.2.19) activesupport (>= 2.3.6) @@ -67,6 +70,10 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.19) + minitest (4.3.3) + minitest-rails (0.3) + minitest (~> 4.0) + rails (~> 3.0) polyglot (0.3.3) rack (1.2.5) rack-mount (0.6.14) @@ -98,7 +105,15 @@ GEM rspec-expectations (2.11.3) diff-lcs (~> 1.1.3) rspec-mocks (2.11.3) + rspec-rails (2.11.0) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec (~> 2.11.0) sqlite3 (1.3.6) + therubyrhino (2.0.2) + therubyrhino_jar (>= 1.7.3) + therubyrhino_jar (1.7.4) thor (0.14.6) treetop (1.4.12) polyglot @@ -114,7 +129,11 @@ DEPENDENCIES aruba (~> 0.5.1) cucumber (~> 1.2.1) factory_girl_rails! - rails (~> 3.0.18) + jquery-rails + minitest-rails + rails (= 3.0.18) rake rspec (~> 2.11.0) + rspec-rails sqlite3 (>= 1.3.4) + therubyrhino diff --git a/gemfiles/rails3.1.gemfile b/gemfiles/rails3.1.gemfile index 1baa2a9..c346ed9 100644 --- a/gemfiles/rails3.1.gemfile +++ b/gemfiles/rails3.1.gemfile @@ -2,12 +2,16 @@ source "http://rubygems.org" -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 "rails", "3.1.9" +gem "sass-rails" +gem "coffee-rails" +gem "uglifier" +gem "turn" gem "sqlite3", ">= 1.3.4", :platforms=>:mri gem "activerecord-jdbcsqlite3-adapter", :platforms=>:jruby +gem "minitest-rails" +gem "therubyrhino" +gem "jquery-rails" +gem "rspec-rails" gemspec :path=>"../" \ No newline at end of file diff --git a/gemfiles/rails3.1.gemfile.lock b/gemfiles/rails3.1.gemfile.lock index 206f499..c3b0fb0 100644 --- a/gemfiles/rails3.1.gemfile.lock +++ b/gemfiles/rails3.1.gemfile.lock @@ -71,12 +71,19 @@ GEM json (>= 1.4.6) hike (1.2.1) i18n (0.6.1) + jquery-rails (2.1.4) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) json (1.7.6) mail (2.3.3) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.19) + minitest (4.3.3) + minitest-rails (0.3) + minitest (~> 4.0) + rails (~> 3.0) multi_json (1.2.0) polyglot (0.3.3) rack (1.3.6) @@ -114,7 +121,12 @@ GEM rspec-expectations (2.11.3) diff-lcs (~> 1.1.3) rspec-mocks (2.11.3) - sass (3.2.4) + rspec-rails (2.11.0) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec (~> 2.11.0) + sass (3.2.5) sass-rails (3.1.6) actionpack (~> 3.1.0) railties (~> 3.1.0) @@ -125,12 +137,15 @@ GEM rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.6) + therubyrhino (2.0.2) + therubyrhino_jar (>= 1.7.3) + therubyrhino_jar (1.7.4) thor (0.14.6) tilt (1.3.3) treetop (1.4.12) polyglot polyglot (>= 0.3.1) - turn (0.8.3) + turn (0.9.6) ansi tzinfo (0.3.35) uglifier (1.3.0) @@ -144,13 +159,17 @@ DEPENDENCIES activerecord-jdbcsqlite3-adapter appraisal (~> 0.5.0) aruba (~> 0.5.1) - coffee-rails (~> 3.1.1) + coffee-rails cucumber (~> 1.2.1) factory_girl_rails! - rails (~> 3.1.9) + jquery-rails + minitest-rails + rails (= 3.1.9) rake rspec (~> 2.11.0) - sass-rails (~> 3.1.5) + rspec-rails + sass-rails sqlite3 (>= 1.3.4) - turn (~> 0.8.3) - uglifier (>= 1.0.3) + therubyrhino + turn + uglifier diff --git a/gemfiles/rails3.2.gemfile b/gemfiles/rails3.2.gemfile index 54ad8ce..eb7e86b 100644 --- a/gemfiles/rails3.2.gemfile +++ b/gemfiles/rails3.2.gemfile @@ -2,11 +2,15 @@ source "http://rubygems.org" -gem "rails", "~> 3.2.10" -gem "sass-rails", "~> 3.2.3" -gem "coffee-rails", "~> 3.2.1" -gem "uglifier", ">= 1.0.3" +gem "rails", "3.2.10" +gem "sass-rails" +gem "coffee-rails" +gem "uglifier" gem "sqlite3", ">= 1.3.4", :platforms=>:mri gem "activerecord-jdbcsqlite3-adapter", :platforms=>:jruby +gem "minitest-rails" +gem "therubyrhino" +gem "jquery-rails" +gem "rspec-rails" gemspec :path=>"../" \ No newline at end of file diff --git a/gemfiles/rails3.2.gemfile.lock b/gemfiles/rails3.2.gemfile.lock index 58adc6b..c82bbd4 100644 --- a/gemfiles/rails3.2.gemfile.lock +++ b/gemfiles/rails3.2.gemfile.lock @@ -70,15 +70,22 @@ GEM hike (1.2.1) i18n (0.6.1) journey (1.0.4) + jquery-rails (2.1.4) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) json (1.7.6) mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.19) + minitest (4.3.3) + minitest-rails (0.3) + minitest (~> 4.0) + rails (~> 3.0) multi_json (1.5.0) polyglot (0.3.3) - rack (1.4.1) + rack (1.4.2) rack-cache (1.2) rack (>= 0.4) rack-ssl (1.3.2) @@ -111,7 +118,12 @@ GEM rspec-expectations (2.11.3) diff-lcs (~> 1.1.3) rspec-mocks (2.11.3) - sass (3.2.4) + rspec-rails (2.11.0) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec (~> 2.11.0) + sass (3.2.5) sass-rails (3.2.5) railties (~> 3.2.0) sass (>= 3.1.10) @@ -122,6 +134,9 @@ GEM rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.6) + therubyrhino (2.0.2) + therubyrhino_jar (>= 1.7.3) + therubyrhino_jar (1.7.4) thor (0.16.0) tilt (1.3.3) treetop (1.4.12) @@ -139,12 +154,16 @@ DEPENDENCIES activerecord-jdbcsqlite3-adapter appraisal (~> 0.5.0) aruba (~> 0.5.1) - coffee-rails (~> 3.2.1) + coffee-rails cucumber (~> 1.2.1) factory_girl_rails! - rails (~> 3.2.10) + jquery-rails + minitest-rails + rails (= 3.2.10) rake rspec (~> 2.11.0) - sass-rails (~> 3.2.3) + rspec-rails + sass-rails sqlite3 (>= 1.3.4) - uglifier (>= 1.0.3) + therubyrhino + uglifier