diff --git a/.travis.yml b/.travis.yml index 369567a..daf97d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,10 @@ language: ruby +before_install: + - gem update --system cache: bundler rvm: - - 1.9.3 - - 2.0.0 - - 2.1.2 + - 2.1.5 + - 2.2.1 - jruby-19mode jdk: - openjdk6 @@ -12,9 +13,7 @@ branches: - master install: - "travis_retry bundle install" - - "bundle exec appraisal generate" - - "travis_retry bundle exec appraisal install" gemfile: - gemfiles/rails3.2.gemfile - - gemfiles/rails4.0.gemfile - gemfiles/rails4.1.gemfile + - gemfiles/rails4.2.gemfile diff --git a/Appraisals b/Appraisals index a955462..4a08017 100644 --- a/Appraisals +++ b/Appraisals @@ -1,16 +1,15 @@ # These are the versions of Rails we want to test against. appraise 'rails3.2' do - gem 'rails', '~> 3.2.18' - gem 'sass-rails' -end - -appraise 'rails4.0' do - gem 'rails', '~> 4.0.5' + gem 'rails', '~> 3.2.21' gem 'sass-rails' end appraise 'rails4.1' do - gem 'rails', '~> 4.1.1' - gem 'sass-rails', '~> 4.0.3' + gem 'rails', '~> 4.1.9' + gem 'sass-rails' gem 'spring' end + +appraise 'rails4.2' do + gem 'rails', '~> 4.2.0' +end diff --git a/Gemfile b/Gemfile index c5855a9..05de785 100644 --- a/Gemfile +++ b/Gemfile @@ -10,11 +10,11 @@ gem 'jquery-rails' gem 'rake' gem 'rspec-rails' gem 'uglifier' +gem 'test-unit' -if RUBY_PLATFORM == 'java' - gem 'activerecord-jdbcsqlite3-adapter' - gem 'jdbc-sqlite3' - gem 'therubyrhino' -else - gem 'sqlite3' -end +gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby +gem 'jdbc-sqlite3', platforms: :jruby +gem 'therubyrhino', platforms: :jruby +gem 'jruby-openssl', platforms: :jruby + +gem 'sqlite3', platforms: :ruby diff --git a/Gemfile.lock b/Gemfile.lock index c906291..ea91c2b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -20,16 +20,26 @@ GEM activemodel (4.1.1) activesupport (= 4.1.1) builder (~> 3.1) + activerecord (4.1.1) + activemodel (= 4.1.1) + activesupport (= 4.1.1) + arel (~> 5.0.0) + activerecord-jdbc-adapter (1.3.15) + activerecord (>= 2.2) + activerecord-jdbcsqlite3-adapter (1.3.15) + activerecord-jdbc-adapter (~> 1.3.15) + jdbc-sqlite3 (>= 3.7.2, < 3.9) activesupport (4.1.1) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) - appraisal (1.0.0) + appraisal (1.0.3) bundler rake thor (>= 0.14.0) + arel (5.0.1.20140414130214) aruba (0.5.4) childprocess (>= 0.3.6) cucumber (>= 1.1.1) @@ -56,16 +66,23 @@ GEM factory_girl (4.5.0) activesupport (>= 3.0.0) ffi (1.9.3) + ffi (1.9.3-java) gherkin (2.12.2) multi_json (~> 1.3) + gherkin (2.12.2-java) + multi_json (~> 1.3) i18n (0.6.9) + jdbc-sqlite3 (3.8.7) jquery-rails (3.1.0) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) + jruby-openssl (0.9.6-java) json (1.8.1) + json (1.8.1-java) minitest (5.3.4) multi_json (1.11.0) multi_test (0.1.2) + power_assert (0.2.3) rack (1.5.2) rack-test (0.6.2) rack (>= 1.0) @@ -74,7 +91,7 @@ GEM activesupport (= 4.1.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.3.2) + rake (10.4.2) rspec-core (2.14.8) rspec-expectations (2.14.5) diff-lcs (>= 1.1.3, < 2.0) @@ -88,8 +105,14 @@ GEM rspec-expectations (~> 2.14.0) rspec-mocks (~> 2.14.0) sqlite3 (1.3.9) + test-unit (3.0.9) + power_assert + therubyrhino (2.0.4) + therubyrhino_jar (>= 1.7.3) + therubyrhino_jar (1.7.4) thor (0.19.1) thread_safe (0.3.3) + thread_safe (0.3.3-java) tzinfo (1.2.0) thread_safe (~> 0.1) uglifier (2.5.0) @@ -97,16 +120,22 @@ GEM json (>= 1.8.0) PLATFORMS + java ruby DEPENDENCIES + activerecord-jdbcsqlite3-adapter appraisal aruba coffee-rails cucumber (= 1.3.19) factory_girl_rails! + jdbc-sqlite3 jquery-rails + jruby-openssl rake rspec-rails sqlite3 + test-unit + therubyrhino uglifier diff --git a/gemfiles/rails3.2.gemfile b/gemfiles/rails3.2.gemfile index 0d0b7d0..dc3e2fa 100644 --- a/gemfiles/rails3.2.gemfile +++ b/gemfiles/rails3.2.gemfile @@ -5,13 +5,18 @@ source "https://rubygems.org" gem "appraisal" gem "aruba" gem "coffee-rails" -gem "cucumber" +gem "cucumber", "1.3.19" gem "jquery-rails" gem "rake" gem "rspec-rails" gem "uglifier" -gem "sqlite3" -gem "rails", "~> 3.2.18" +gem "test-unit" +gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby +gem "jdbc-sqlite3", :platforms => :jruby +gem "therubyrhino", :platforms => :jruby +gem "jruby-openssl", :platforms => :jruby +gem "sqlite3", :platforms => :ruby +gem "rails", "~> 3.2.21" gem "sass-rails" gemspec :path => "../" diff --git a/gemfiles/rails4.0.gemfile b/gemfiles/rails4.0.gemfile deleted file mode 100644 index 2b79062..0000000 --- a/gemfiles/rails4.0.gemfile +++ /dev/null @@ -1,17 +0,0 @@ -# This file was generated by Appraisal - -source "https://rubygems.org" - -gem "appraisal" -gem "aruba" -gem "coffee-rails" -gem "cucumber" -gem "jquery-rails" -gem "rake" -gem "rspec-rails" -gem "uglifier" -gem "sqlite3" -gem "rails", "~> 4.0.5" -gem "sass-rails" - -gemspec :path => "../" diff --git a/gemfiles/rails4.1.gemfile b/gemfiles/rails4.1.gemfile index 87c44e3..e007b3a 100644 --- a/gemfiles/rails4.1.gemfile +++ b/gemfiles/rails4.1.gemfile @@ -5,14 +5,19 @@ source "https://rubygems.org" gem "appraisal" gem "aruba" gem "coffee-rails" -gem "cucumber" +gem "cucumber", "1.3.19" gem "jquery-rails" gem "rake" gem "rspec-rails" gem "uglifier" -gem "sqlite3" -gem "rails", "~> 4.1.1" -gem "sass-rails", "~> 4.0.3" +gem "test-unit" +gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby +gem "jdbc-sqlite3", :platforms => :jruby +gem "therubyrhino", :platforms => :jruby +gem "jruby-openssl", :platforms => :jruby +gem "sqlite3", :platforms => :ruby +gem "rails", "~> 4.1.9" +gem "sass-rails" gem "spring" gemspec :path => "../" diff --git a/gemfiles/rails4.2.gemfile b/gemfiles/rails4.2.gemfile new file mode 100644 index 0000000..a006cbb --- /dev/null +++ b/gemfiles/rails4.2.gemfile @@ -0,0 +1,21 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "appraisal" +gem "aruba" +gem "coffee-rails" +gem "cucumber", "1.3.19" +gem "jquery-rails" +gem "rake" +gem "rspec-rails" +gem "uglifier" +gem "test-unit" +gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby +gem "jdbc-sqlite3", :platforms => :jruby +gem "therubyrhino", :platforms => :jruby +gem "jruby-openssl", :platforms => :jruby +gem "sqlite3", :platforms => :ruby +gem "rails", "~> 4.2.0" + +gemspec :path => "../"