Skip to content

Commit

Permalink
Add Ruby 2.0 to tests/travis
Browse files Browse the repository at this point in the history
Ruby 2.0 requires Rails 3.2.13, currently in rc. Update appraisals to
run only that version of rails under 2.0. Update travis build matrix to
do the same.
  • Loading branch information
derekprior committed Mar 15, 2013
1 parent 91a984c commit 357118c
Show file tree
Hide file tree
Showing 7 changed files with 209 additions and 4 deletions.
10 changes: 10 additions & 0 deletions .travis.yml
Expand Up @@ -2,6 +2,7 @@ language: ruby
rvm: rvm:
- 1.9.2 - 1.9.2
- 1.9.3 - 1.9.3
- 2.0.0
before_install: before_install:
- gem update --system - gem update --system
- gem update bundler - gem update bundler
Expand All @@ -11,6 +12,15 @@ gemfile:
- gemfiles/3.0.20.gemfile - gemfiles/3.0.20.gemfile
- gemfiles/3.1.11.gemfile - gemfiles/3.1.11.gemfile
- gemfiles/3.2.12.gemfile - gemfiles/3.2.12.gemfile
- gemfiles/3.2.13.rc2.gemfile
matrix:
exclude:
- rvm: 2.0.0
gemfile: gemfiles/3.0.20.gemfile
- rvm: 2.0.0
gemfile: gemfiles/3.1.11.gemfile
- rvm: 2.0.0
gemfile: gemfiles/3.2.12.gemfile
branches: branches:
only: only:
- master - master
8 changes: 7 additions & 1 deletion Appraisals
@@ -1,4 +1,10 @@
['3.0.20', '3.1.11', '3.2.12'].each do |rails_version| if RUBY_VERSION >= '2.0'
rails_versions = ['3.2.13.rc2']
else
rails_versions = ['3.0.20', '3.1.11', '3.2.12']
end

rails_versions.each do |rails_version|
appraise "#{rails_version}" do appraise "#{rails_version}" do
gem 'rails', rails_version gem 'rails', rails_version
end end
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/3.0.20.gemfile.lock
@@ -1,5 +1,5 @@
PATH PATH
remote: /Users/croaky/dev/clearance remote: ../
specs: specs:
clearance (1.0.0.rc5) clearance (1.0.0.rc5)
bcrypt-ruby bcrypt-ruby
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/3.1.11.gemfile.lock
@@ -1,5 +1,5 @@
PATH PATH
remote: /Users/croaky/dev/clearance remote: ../
specs: specs:
clearance (1.0.0.rc5) clearance (1.0.0.rc5)
bcrypt-ruby bcrypt-ruby
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/3.2.12.gemfile.lock
@@ -1,5 +1,5 @@
PATH PATH
remote: /Users/croaky/dev/clearance remote: ../
specs: specs:
clearance (1.0.0.rc5) clearance (1.0.0.rc5)
bcrypt-ruby bcrypt-ruby
Expand Down
7 changes: 7 additions & 0 deletions gemfiles/3.2.13.rc2.gemfile
@@ -0,0 +1,7 @@
# This file was generated by Appraisal

source "http://rubygems.org"

gem "rails", "3.2.13.rc2"

gemspec :path=>"../"
182 changes: 182 additions & 0 deletions gemfiles/3.2.13.rc2.gemfile.lock
@@ -0,0 +1,182 @@
PATH
remote: ../
specs:
clearance (1.0.0.rc5)
bcrypt-ruby
email_validator
rails (>= 3.0)

GEM
remote: http://rubygems.org/
specs:
actionmailer (3.2.13.rc2)
actionpack (= 3.2.13.rc2)
mail (~> 2.5.3)
actionpack (3.2.13.rc2)
activemodel (= 3.2.13.rc2)
activesupport (= 3.2.13.rc2)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
activemodel (3.2.13.rc2)
activesupport (= 3.2.13.rc2)
builder (~> 3.0.0)
activerecord (3.2.13.rc2)
activemodel (= 3.2.13.rc2)
activesupport (= 3.2.13.rc2)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.13.rc2)
activemodel (= 3.2.13.rc2)
activesupport (= 3.2.13.rc2)
activesupport (3.2.13.rc2)
i18n (= 0.6.1)
multi_json (~> 1.0)
appraisal (0.4.1)
bundler
rake
arel (3.0.2)
aruba (0.4.11)
childprocess (>= 0.2.3)
cucumber (>= 1.1.1)
ffi (>= 1.0.11)
rspec (>= 2.7.0)
bcrypt-ruby (3.0.1)
bourne (1.3.0)
mocha (= 0.13.0)
builder (3.0.4)
capybara (1.1.2)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
childprocess (0.3.9)
ffi (~> 1.0, >= 1.0.11)
cucumber (1.2.3)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
gherkin (~> 2.11.6)
multi_json (~> 1.3)
cucumber-rails (1.1.1)
capybara (>= 1.1.1)
cucumber (>= 1.1.0)
nokogiri (>= 1.5.0)
database_cleaner (0.8.0)
diff-lcs (1.1.3)
email_validator (1.3.0)
activemodel
erubis (2.7.0)
factory_girl (3.5.0)
activesupport (>= 3.0.0)
factory_girl_rails (3.5.0)
factory_girl (~> 3.5.0)
railties (>= 3.0.0)
ffi (1.4.0)
gherkin (2.11.6)
json (>= 1.7.6)
hike (1.2.1)
i18n (0.6.1)
journey (1.0.4)
json (1.7.7)
mail (2.5.3)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
metaclass (0.0.1)
mime-types (1.21)
mocha (0.13.0)
metaclass (~> 0.0.1)
multi_json (1.6.1)
nokogiri (1.5.6)
polyglot (0.3.3)
psych (1.3.4)
rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.3)
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.13.rc2)
actionmailer (= 3.2.13.rc2)
actionpack (= 3.2.13.rc2)
activerecord (= 3.2.13.rc2)
activeresource (= 3.2.13.rc2)
activesupport (= 3.2.13.rc2)
bundler (~> 1.0)
railties (= 3.2.13.rc2)
railties (3.2.13.rc2)
actionpack (= 3.2.13.rc2)
activesupport (= 3.2.13.rc2)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (10.0.3)
rdoc (3.12.2)
json (~> 1.4)
rspec (2.12.0)
rspec-core (~> 2.12.0)
rspec-expectations (~> 2.12.0)
rspec-mocks (~> 2.12.0)
rspec-core (2.12.2)
rspec-expectations (2.12.1)
diff-lcs (~> 1.1.3)
rspec-mocks (2.12.2)
rspec-rails (2.12.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 2.12.0)
rspec-expectations (~> 2.12.0)
rspec-mocks (~> 2.12.0)
rubyzip (0.9.9)
selenium-webdriver (2.31.0)
childprocess (>= 0.2.5)
multi_json (~> 1.0)
rubyzip
websocket (~> 1.0.4)
shoulda-matchers (1.2.0)
activesupport (>= 3.0.0)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.6)
thor (0.17.0)
tilt (1.3.5)
timecop (0.3.5)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.37)
websocket (1.0.7)
xpath (0.1.4)
nokogiri (~> 1.3)

PLATFORMS
ruby

DEPENDENCIES
appraisal (= 0.4.1)
aruba (= 0.4.11)
bourne (= 1.3.0)
bundler (~> 1.1)
capybara (= 1.1.2)
clearance!
cucumber-rails (= 1.1.1)
database_cleaner (= 0.8.0)
factory_girl_rails (= 3.5.0)
psych (~> 1.3.4)
rails (= 3.2.13.rc2)
rspec-rails (= 2.12.2)
shoulda-matchers (= 1.2.0)
sqlite3 (= 1.3.6)
timecop (= 0.3.5)

0 comments on commit 357118c

Please sign in to comment.