diff --git a/Gemfile.lock b/Gemfile.lock index 4242f059..1f223b12 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -34,12 +34,13 @@ GEM activesupport (3.2.16) i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) - appraisal (0.5.2) + appraisal (1.0.0.beta2) bundler rake + thor (>= 0.14.0) arel (3.0.3) aruba (0.5.3) - childprocess (>= 0.3.6) + childprocess (~> 0.3.6) cucumber (>= 1.1.1) rspec-expectations (>= 2.7.0) bourne (1.5.0) @@ -136,7 +137,7 @@ PLATFORMS DEPENDENCIES activerecord-jdbc-adapter activerecord-jdbcsqlite3-adapter - appraisal (~> 0.4) + appraisal (~> 1.0.0.beta2) aruba bourne (~> 1.3) bundler (~> 1.1) diff --git a/NEWS.md b/NEWS.md index ffb29889..59cfecc0 100644 --- a/NEWS.md +++ b/NEWS.md @@ -27,6 +27,9 @@ * Running `rake` now installs Appraisals before running the test suite. +* Additionally, we now manage Appraisals using the `appraisal` executable that + is coming in Appraisal 1.0.0 (we're using the beta for now). + # v 2.5.0 * Fix Rails/Test::Unit integration to ensure that the test case classes we are diff --git a/Rakefile b/Rakefile index b57d37b9..8378d186 100644 --- a/Rakefile +++ b/Rakefile @@ -24,6 +24,6 @@ task :default do end end -task :appraise => ['appraisal:install'] do - exec 'rake appraisal' +task :appraise do + exec 'appraisal install && appraisal rake' end diff --git a/gemfiles/3.0.gemfile b/gemfiles/3.0.gemfile index fa6ab3ed..cd7a8bcf 100644 --- a/gemfiles/3.0.gemfile +++ b/gemfiles/3.0.gemfile @@ -12,4 +12,4 @@ gem "therubyrhino", :platform=>:jruby gem "rails", "~> 3.0.17" gem "strong_parameters" -gemspec :path=>"../" \ No newline at end of file +gemspec :path=>".././" diff --git a/gemfiles/3.0.gemfile.lock b/gemfiles/3.0.gemfile.lock index eac2a26a..75739663 100644 --- a/gemfiles/3.0.gemfile.lock +++ b/gemfiles/3.0.gemfile.lock @@ -34,9 +34,10 @@ GEM activemodel (= 3.0.20) activesupport (= 3.0.20) activesupport (3.0.20) - appraisal (0.5.1) + appraisal (1.0.0.beta2) bundler rake + thor (>= 0.14.0) arel (2.0.10) aruba (0.5.1) childprocess (~> 0.3.6) @@ -129,7 +130,7 @@ PLATFORMS DEPENDENCIES activerecord-jdbc-adapter activerecord-jdbcsqlite3-adapter - appraisal (~> 0.4) + appraisal (~> 1.0.0.beta2) aruba bourne (~> 1.3) bundler (~> 1.1) diff --git a/gemfiles/3.1.gemfile b/gemfiles/3.1.gemfile index 531aca24..71e738c5 100644 --- a/gemfiles/3.1.gemfile +++ b/gemfiles/3.1.gemfile @@ -15,4 +15,4 @@ gem "jquery-rails" gem "sass-rails" gem "strong_parameters" -gemspec :path=>"../" \ No newline at end of file +gemspec :path=>".././" diff --git a/gemfiles/3.1.gemfile.lock b/gemfiles/3.1.gemfile.lock index e683b2fc..fa4eec6d 100644 --- a/gemfiles/3.1.gemfile.lock +++ b/gemfiles/3.1.gemfile.lock @@ -35,9 +35,10 @@ GEM activesupport (= 3.1.11) activesupport (3.1.11) multi_json (~> 1.0) - appraisal (0.5.1) + appraisal (1.0.0.beta2) bundler rake + thor (>= 0.14.0) arel (2.2.3) aruba (0.5.1) childprocess (~> 0.3.6) @@ -149,7 +150,7 @@ PLATFORMS DEPENDENCIES activerecord-jdbc-adapter activerecord-jdbcsqlite3-adapter - appraisal (~> 0.4) + appraisal (~> 1.0.0.beta2) aruba bcrypt-ruby (~> 3.0.0) bourne (~> 1.3) diff --git a/gemfiles/3.2.gemfile b/gemfiles/3.2.gemfile index be4a32c6..61e34495 100644 --- a/gemfiles/3.2.gemfile +++ b/gemfiles/3.2.gemfile @@ -15,4 +15,4 @@ gem "jquery-rails" gem "sass-rails" gem "strong_parameters" -gemspec :path=>"../" \ No newline at end of file +gemspec :path=>".././" diff --git a/gemfiles/3.2.gemfile.lock b/gemfiles/3.2.gemfile.lock index 758ea2b7..88bbbf0a 100644 --- a/gemfiles/3.2.gemfile.lock +++ b/gemfiles/3.2.gemfile.lock @@ -34,9 +34,10 @@ GEM activesupport (3.2.13) i18n (= 0.6.1) multi_json (~> 1.0) - appraisal (0.5.1) + appraisal (1.0.0.beta2) bundler rake + thor (>= 0.14.0) arel (3.0.2) aruba (0.5.1) childprocess (~> 0.3.6) @@ -103,7 +104,7 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (10.0.3) + rake (10.1.1) rdoc (3.12.2) json (~> 1.4) rspec-core (2.13.1) @@ -134,7 +135,7 @@ GEM actionpack (~> 3.0) activemodel (~> 3.0) railties (~> 3.0) - thor (0.17.0) + thor (0.18.1) tilt (1.3.6) treetop (1.4.12) polyglot @@ -147,7 +148,7 @@ PLATFORMS DEPENDENCIES activerecord-jdbc-adapter activerecord-jdbcsqlite3-adapter - appraisal (~> 0.4) + appraisal (~> 1.0.0.beta2) aruba bcrypt-ruby (~> 3.0.0) bourne (~> 1.3) diff --git a/gemfiles/4.0.0.gemfile b/gemfiles/4.0.0.gemfile index 60b613d5..57f517a7 100644 --- a/gemfiles/4.0.0.gemfile +++ b/gemfiles/4.0.0.gemfile @@ -16,4 +16,4 @@ gem "rails", "4.0.0" gem "sass-rails", "4.0.0" gem "bcrypt-ruby", "~> 3.0.0" -gemspec :path=>"../" \ No newline at end of file +gemspec :path=>".././" diff --git a/gemfiles/4.0.0.gemfile.lock b/gemfiles/4.0.0.gemfile.lock index af7ae93d..6499464d 100644 --- a/gemfiles/4.0.0.gemfile.lock +++ b/gemfiles/4.0.0.gemfile.lock @@ -35,9 +35,10 @@ GEM multi_json (~> 1.3) thread_safe (~> 0.1) tzinfo (~> 0.3.37) - appraisal (0.5.2) + appraisal (1.0.0.beta2) bundler rake + thor (>= 0.14.0) arel (4.0.1) aruba (0.5.3) childprocess (>= 0.3.6) @@ -103,7 +104,7 @@ GEM activesupport (= 4.0.0) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.1.0) + rake (10.1.1) rspec-core (2.14.7) rspec-expectations (2.14.4) diff-lcs (>= 1.1.3, < 2.0) @@ -148,7 +149,7 @@ DEPENDENCIES activerecord-jdbc-adapter activerecord-jdbcsqlite3-adapter activeresource (= 4.0.0) - appraisal (~> 0.4) + appraisal (~> 1.0.0.beta2) aruba bcrypt-ruby (~> 3.0.0) bourne (~> 1.3) diff --git a/gemfiles/4.0.1.gemfile b/gemfiles/4.0.1.gemfile index bf82206a..2c371e24 100644 --- a/gemfiles/4.0.1.gemfile +++ b/gemfiles/4.0.1.gemfile @@ -16,4 +16,4 @@ gem "rails", "4.0.1" gem "sass-rails", "4.0.1" gem "bcrypt-ruby", "~> 3.1.2" -gemspec :path=>"../" \ No newline at end of file +gemspec :path=>".././" diff --git a/gemfiles/4.0.1.gemfile.lock b/gemfiles/4.0.1.gemfile.lock index 3819667d..263df179 100644 --- a/gemfiles/4.0.1.gemfile.lock +++ b/gemfiles/4.0.1.gemfile.lock @@ -35,9 +35,10 @@ GEM multi_json (~> 1.3) thread_safe (~> 0.1) tzinfo (~> 0.3.37) - appraisal (0.5.2) + appraisal (1.0.0.beta2) bundler rake + thor (>= 0.14.0) arel (4.0.1) aruba (0.5.3) childprocess (>= 0.3.6) @@ -103,7 +104,7 @@ GEM activesupport (= 4.0.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.1.0) + rake (10.1.1) rspec-core (2.14.7) rspec-expectations (2.14.4) diff-lcs (>= 1.1.3, < 2.0) @@ -148,7 +149,7 @@ DEPENDENCIES activerecord-jdbc-adapter activerecord-jdbcsqlite3-adapter activeresource (= 4.0.0) - appraisal (~> 0.4) + appraisal (~> 1.0.0.beta2) aruba bcrypt-ruby (~> 3.1.2) bourne (~> 1.3) diff --git a/shoulda-matchers.gemspec b/shoulda-matchers.gemspec index 1108730d..067a642a 100644 --- a/shoulda-matchers.gemspec +++ b/shoulda-matchers.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |s| s.required_ruby_version = '>= 1.9.2' s.add_dependency('activesupport', '>= 3.0.0') - s.add_development_dependency('appraisal', '~> 0.4') + s.add_development_dependency('appraisal', '~> 1.0.0.beta2') s.add_development_dependency('aruba') s.add_development_dependency('pry') s.add_development_dependency('bourne', '~> 1.3')