From 56ded0548d236164a2403111c2814dd011d75677 Mon Sep 17 00:00:00 2001 From: Elliot Winkler Date: Sun, 28 Dec 2014 14:54:33 -0300 Subject: [PATCH] Add support for Ruby 2.2 Secondary author: Luciano Sousa Also, upgrade to rspec-rails 3.2.0 explicitly. (See b7fe87ae915f6b1f99d64e847fea536ad0f78024 for an explanation of why 3.2.0 is necessary here.) --- .travis.yml | 1 + Appraisals | 2 +- Gemfile | 4 ++-- Gemfile.lock | 4 ++-- gemfiles/4.0.0.gemfile | 6 +++--- gemfiles/4.0.0.gemfile.lock | 6 +++--- gemfiles/4.0.1.gemfile | 6 +++--- gemfiles/4.0.1.gemfile.lock | 6 +++--- gemfiles/4.1.gemfile | 6 +++--- gemfiles/4.1.gemfile.lock | 6 +++--- gemfiles/4.2.gemfile | 6 +++--- gemfiles/4.2.gemfile.lock | 6 +++--- 12 files changed, 30 insertions(+), 29 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0780ba0a..b15e8a43 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ branches: rvm: - 2.0.0 - 2.1.4 + - 2.2.0 - rbx-19mode - jruby-19mode diff --git a/Appraisals b/Appraisals index 75b02e3f..fad4a86a 100644 --- a/Appraisals +++ b/Appraisals @@ -1,7 +1,7 @@ ruby_version = Gem::Version.new(RUBY_VERSION + '') shared_dependencies = proc do - gem 'rspec-rails', '~> 3.0' + gem 'rspec-rails', '>= 3.2.0', '< 4' gem 'shoulda-context', '~> 1.2.0' gem 'sqlite3', platform: :ruby gem 'activerecord-jdbc-adapter', platform: :jruby diff --git a/Gemfile b/Gemfile index 3a5f01be..e5a78964 100644 --- a/Gemfile +++ b/Gemfile @@ -4,8 +4,8 @@ gem 'appraisal', '~> 1.0' gem 'bundler', '~> 1.1' gem 'pry-nav' gem 'rake', '~> 10.0' -gem 'rspec-core', '~> 3.0' -gem 'rspec-expectations', '~> 3.0' +gem 'rspec-core', '>= 3.2.0', '< 4' +gem 'rspec-expectations', '>= 3.2.0', '< 4' # YARD gem 'yard' diff --git a/Gemfile.lock b/Gemfile.lock index a8ffbdde..eaf3d364 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -42,7 +42,7 @@ DEPENDENCIES pygments.rb rake (~> 10.0) redcarpet - rspec-core (~> 3.0) - rspec-expectations (~> 3.0) + rspec-core (>= 3.2.0, < 4) + rspec-expectations (>= 3.2.0, < 4) watchr yard diff --git a/gemfiles/4.0.0.gemfile b/gemfiles/4.0.0.gemfile index 841c8ecf..5af88c99 100644 --- a/gemfiles/4.0.0.gemfile +++ b/gemfiles/4.0.0.gemfile @@ -6,13 +6,13 @@ gem "appraisal", "~> 1.0" gem "bundler", "~> 1.1" gem "pry-nav" gem "rake", "~> 10.0" -gem "rspec-core", "~> 3.0" -gem "rspec-expectations", "~> 3.0" +gem "rspec-core", ">= 3.2.0", "< 4" +gem "rspec-expectations", ">= 3.2.0", "< 4" gem "yard" gem "redcarpet" gem "pygments.rb" gem "watchr" -gem "rspec-rails", "~> 3.0" +gem "rspec-rails", ">= 3.2.0", "< 4" gem "shoulda-context", "~> 1.2.0" gem "sqlite3", :platform => :ruby gem "activerecord-jdbc-adapter", :platform => :jruby diff --git a/gemfiles/4.0.0.gemfile.lock b/gemfiles/4.0.0.gemfile.lock index cdc5fd69..64ad8127 100644 --- a/gemfiles/4.0.0.gemfile.lock +++ b/gemfiles/4.0.0.gemfile.lock @@ -187,9 +187,9 @@ DEPENDENCIES rails (= 4.0.0) rake (~> 10.0) redcarpet - rspec-core (~> 3.0) - rspec-expectations (~> 3.0) - rspec-rails (~> 3.0) + rspec-core (>= 3.2.0, < 4) + rspec-expectations (>= 3.2.0, < 4) + rspec-rails (>= 3.2.0, < 4) sass-rails (~> 4.0.0) sdoc shoulda-context (~> 1.2.0) diff --git a/gemfiles/4.0.1.gemfile b/gemfiles/4.0.1.gemfile index 91effba2..5643f7ce 100644 --- a/gemfiles/4.0.1.gemfile +++ b/gemfiles/4.0.1.gemfile @@ -6,13 +6,13 @@ gem "appraisal", "~> 1.0" gem "bundler", "~> 1.1" gem "pry-nav" gem "rake", "~> 10.0" -gem "rspec-core", "~> 3.0" -gem "rspec-expectations", "~> 3.0" +gem "rspec-core", ">= 3.2.0", "< 4" +gem "rspec-expectations", ">= 3.2.0", "< 4" gem "yard" gem "redcarpet" gem "pygments.rb" gem "watchr" -gem "rspec-rails", "~> 3.0" +gem "rspec-rails", ">= 3.2.0", "< 4" gem "shoulda-context", "~> 1.2.0" gem "sqlite3", :platform => :ruby gem "activerecord-jdbc-adapter", :platform => :jruby diff --git a/gemfiles/4.0.1.gemfile.lock b/gemfiles/4.0.1.gemfile.lock index 367c5e58..98948b10 100644 --- a/gemfiles/4.0.1.gemfile.lock +++ b/gemfiles/4.0.1.gemfile.lock @@ -187,9 +187,9 @@ DEPENDENCIES rails (= 4.0.1) rake (~> 10.0) redcarpet - rspec-core (~> 3.0) - rspec-expectations (~> 3.0) - rspec-rails (~> 3.0) + rspec-core (>= 3.2.0, < 4) + rspec-expectations (>= 3.2.0, < 4) + rspec-rails (>= 3.2.0, < 4) sass-rails (~> 4.0.0) sdoc shoulda-context (~> 1.2.0) diff --git a/gemfiles/4.1.gemfile b/gemfiles/4.1.gemfile index 7e4c1630..f2af0d4f 100644 --- a/gemfiles/4.1.gemfile +++ b/gemfiles/4.1.gemfile @@ -6,13 +6,13 @@ gem "appraisal", "~> 1.0" gem "bundler", "~> 1.1" gem "pry-nav" gem "rake", "~> 10.0" -gem "rspec-core", "~> 3.0" -gem "rspec-expectations", "~> 3.0" +gem "rspec-core", ">= 3.2.0", "< 4" +gem "rspec-expectations", ">= 3.2.0", "< 4" gem "yard" gem "redcarpet" gem "pygments.rb" gem "watchr" -gem "rspec-rails", "~> 3.0" +gem "rspec-rails", ">= 3.2.0", "< 4" gem "shoulda-context", "~> 1.2.0" gem "sqlite3", :platform => :ruby gem "activerecord-jdbc-adapter", :platform => :jruby diff --git a/gemfiles/4.1.gemfile.lock b/gemfiles/4.1.gemfile.lock index 25368242..5094c21a 100644 --- a/gemfiles/4.1.gemfile.lock +++ b/gemfiles/4.1.gemfile.lock @@ -184,9 +184,9 @@ DEPENDENCIES rails (~> 4.1.0) rake (~> 10.0) redcarpet - rspec-core (~> 3.0) - rspec-expectations (~> 3.0) - rspec-rails (~> 3.0) + rspec-core (>= 3.2.0, < 4) + rspec-expectations (>= 3.2.0, < 4) + rspec-rails (>= 3.2.0, < 4) sass-rails (~> 4.0.3) sdoc (~> 0.4.0) shoulda-context (~> 1.2.0) diff --git a/gemfiles/4.2.gemfile b/gemfiles/4.2.gemfile index a5305534..31d7cc14 100644 --- a/gemfiles/4.2.gemfile +++ b/gemfiles/4.2.gemfile @@ -6,13 +6,13 @@ gem "appraisal", "~> 1.0" gem "bundler", "~> 1.1" gem "pry-nav" gem "rake", "~> 10.0" -gem "rspec-core", "~> 3.0" -gem "rspec-expectations", "~> 3.0" +gem "rspec-core", ">= 3.2.0", "< 4" +gem "rspec-expectations", ">= 3.2.0", "< 4" gem "yard" gem "redcarpet" gem "pygments.rb" gem "watchr" -gem "rspec-rails", "~> 3.0" +gem "rspec-rails", ">= 3.2.0", "< 4" gem "shoulda-context", "~> 1.2.0" gem "sqlite3", :platform => :ruby gem "activerecord-jdbc-adapter", :platform => :jruby diff --git a/gemfiles/4.2.gemfile.lock b/gemfiles/4.2.gemfile.lock index ee1b1d55..50277518 100644 --- a/gemfiles/4.2.gemfile.lock +++ b/gemfiles/4.2.gemfile.lock @@ -211,9 +211,9 @@ DEPENDENCIES rails (~> 4.2.0) rake (~> 10.0) redcarpet - rspec-core (~> 3.0) - rspec-expectations (~> 3.0) - rspec-rails (~> 3.0) + rspec-core (>= 3.2.0, < 4) + rspec-expectations (>= 3.2.0, < 4) + rspec-rails (>= 3.2.0, < 4) sass-rails (~> 5.0) sdoc (~> 0.4.0) shoulda-context (~> 1.2.0)