Add Rails 4 as a permitted dependency. Add Rails 4 to the test matrix. Remove Ruby 1.8.x from test matrix because specs were failing anyway because of capybara dependency. Add JRuby to the test matrix and neaten up the JRuby dependencies.

This commit is contained in:
Peter M. Goldstein 2013-09-22 12:22:56 -07:00
parent 6ff77290f2
commit 28298d578f
5 changed files with 40 additions and 18 deletions

1
.gitignore vendored
View File

@ -8,5 +8,6 @@
/test_app/test /test_app/test
/test_app/vendor /test_app/vendor
Gemfile.lock Gemfile.lock
gemfiles/*.lock
*.swo *.swo
*.swp *.swp

View File

@ -1,21 +1,21 @@
language: ruby language: ruby
before_script:
bundler_args: '--binstubs --without documentation' - cd tests/test_app
before_install: gem install bundler - bundle exec rails g impressionist -f
- bundle exec rake db:migrate
before_script: "cd tests/test_app && bundle install && ./script/rails generate impressionist -f && rake db:migrate && cd .." - cd ..
rvm: rvm:
- rbx-18mode
- rbx-19mode
- 1.8.7
- 1.9.2 - 1.9.2
- 1.9.3 - 1.9.3
- ruby-head - 2.0.0
- jruby-19mode
- rbx-19mode
gemfile:
- gemfiles/rails32.gemfile
- gemfiles/rails40.gemfile
matrix: matrix:
exclude:
- rvm: 1.9.2
gemfile: gemfiles/rails40.gemfile
allow_failures: allow_failures:
- rvm: rbx-18mode
- rvm: 1.8.7
- rvm: 1.9.2 - rvm: 1.9.2
- rvm: ruby-head

12
gemfiles/rails32.gemfile Normal file
View File

@ -0,0 +1,12 @@
source 'https://rubygems.org'
gem 'rails', '~> 3.2.12'
gem 'jquery-rails'
gem 'json'
gem 'activerecord-jdbcsqlite3-adapter', :platforms => [:jruby]
gem 'jdbc-sqlite3', :platforms => [:jruby]
gem 'sqlite3', :platforms => [:ruby, :mswin, :mingw]
gemspec :path => '../'

11
gemfiles/rails40.gemfile Normal file
View File

@ -0,0 +1,11 @@
source 'https://rubygems.org'
gem 'rails', '~> 4.0.0'
gem 'jquery-rails'
gem 'json'
gem 'activerecord-jdbcsqlite3-adapter', '1.3.0.rc1', :platforms => [:jruby]
gem 'sqlite3', :platforms => [:ruby, :mswin, :mingw]
gemspec :path => '../'

View File

@ -20,13 +20,11 @@ Gem::Specification.new do |s|
s.add_dependency 'httpclient', '~> 2.2' s.add_dependency 'httpclient', '~> 2.2'
# Nokogiri has dropped support for Ruby 1.8.7 onwards version 1.5.10 s.add_dependency 'nokogiri', '~> 1.6.0'
s.add_dependency 'nokogiri', (RUBY_VERSION.match("1.8.7") ? '1.5.10' : '~> 1.6.0')
# Capybara has dropped support for Ruby 1.8.7 onwards version 2.0.3
s.add_development_dependency 'capybara', '>= 2.0.3' s.add_development_dependency 'capybara', '>= 2.0.3'
s.add_development_dependency 'rake', '>= 0.9' s.add_development_dependency 'rake', '>= 0.9'
s.add_development_dependency 'rails', '3.2.12' s.add_development_dependency 'rails', '>= 3.2.12', '< 4.1'
s.add_development_dependency 'rdoc', '>= 2.4.2' s.add_development_dependency 'rdoc', '>= 2.4.2'
s.add_development_dependency 'rspec-rails' s.add_development_dependency 'rspec-rails'
s.add_development_dependency 'simplecov' s.add_development_dependency 'simplecov'