From 96a6eb2cfeee06d311290c235edde03b54c49b42 Mon Sep 17 00:00:00 2001 From: Elliot Winkler Date: Wed, 24 Jan 2018 00:01:41 -0600 Subject: [PATCH] Upgrade Appraisal to 2.2.0 --- Gemfile | 2 +- Gemfile.lock | 6 +++--- gemfiles/4.2.gemfile | 20 ++++++++++---------- gemfiles/4.2.gemfile.lock | 4 ++-- gemfiles/5.0.gemfile | 18 +++++++++--------- gemfiles/5.0.gemfile.lock | 4 ++-- gemfiles/5.1.gemfile | 18 +++++++++--------- gemfiles/5.1.gemfile.lock | 4 ++-- spec/support/tests/current_bundle.rb | 12 +++--------- 9 files changed, 41 insertions(+), 47 deletions(-) diff --git a/Gemfile b/Gemfile index 54080911..d5e2a45b 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'appraisal', '2.1.0' +gem 'appraisal', '2.2.0' gem 'bundler', '~> 1.1' gem 'pry' gem 'pry-byebug' diff --git a/Gemfile.lock b/Gemfile.lock index 4b86c788..83425b1e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - appraisal (2.1.0) + appraisal (2.2.0) bundler rake thor (>= 0.14.0) @@ -34,7 +34,7 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.6.0) rspec-support (3.6.0) - thor (0.19.4) + thor (0.20.0) yard (0.9.12) zeus (0.15.14) method_source (>= 0.6.7) @@ -43,7 +43,7 @@ PLATFORMS ruby DEPENDENCIES - appraisal (= 2.1.0) + appraisal (= 2.2.0) bundler (~> 1.1) fssm pry diff --git a/gemfiles/4.2.gemfile b/gemfiles/4.2.gemfile index 1d590bdc..8bb462c0 100644 --- a/gemfiles/4.2.gemfile +++ b/gemfiles/4.2.gemfile @@ -2,24 +2,24 @@ source "https://rubygems.org" -gem "appraisal", "2.1.0" +gem "appraisal", "2.2.0" gem "bundler", "~> 1.1" gem "pry" gem "pry-byebug" gem "rake", "12.1.0" gem "rspec", "~> 3.6" -gem "zeus", :require => false +gem "zeus", require: false gem "yard" gem "redcarpet" gem "pygments.rb" gem "fssm" -gem "activerecord-jdbc-adapter", :platform => :jruby -gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby -gem "jdbc-sqlite3", :platform => :jruby -gem "jruby-openssl", :platform => :jruby -gem "therubyrhino", :platform => :jruby -gem "sqlite3", :platform => :ruby -gem "pg", :platform => :ruby +gem "activerecord-jdbc-adapter", platform: :jruby +gem "activerecord-jdbcsqlite3-adapter", platform: :jruby +gem "jdbc-sqlite3", platform: :jruby +gem "jruby-openssl", platform: :jruby +gem "therubyrhino", platform: :jruby +gem "sqlite3", platform: :ruby +gem "pg", platform: :ruby gem "spring" gem "spring-commands-rspec" gem "minitest-reporters" @@ -32,7 +32,7 @@ gem "coffee-rails", "~> 4.1.0" gem "jquery-rails" gem "turbolinks" gem "jbuilder", "~> 2.0" -gem "sdoc", "~> 0.4.0", :group => :doc +gem "sdoc", "~> 0.4.0", group: :doc gem "bcrypt", "~> 3.1.7" gem "activeresource", "4.0.0" gem "json", "~> 1.4" diff --git a/gemfiles/4.2.gemfile.lock b/gemfiles/4.2.gemfile.lock index ec9ca051..91b6b113 100644 --- a/gemfiles/4.2.gemfile.lock +++ b/gemfiles/4.2.gemfile.lock @@ -40,7 +40,7 @@ GEM thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) ansi (1.5.0) - appraisal (2.1.0) + appraisal (2.2.0) bundler rake thor (>= 0.14.0) @@ -209,7 +209,7 @@ DEPENDENCIES activerecord-jdbc-adapter activerecord-jdbcsqlite3-adapter activeresource (= 4.0.0) - appraisal (= 2.1.0) + appraisal (= 2.2.0) bcrypt (~> 3.1.7) bundler (~> 1.1) coffee-rails (~> 4.1.0) diff --git a/gemfiles/5.0.gemfile b/gemfiles/5.0.gemfile index 12a86697..3da1fbe3 100644 --- a/gemfiles/5.0.gemfile +++ b/gemfiles/5.0.gemfile @@ -2,24 +2,24 @@ source "https://rubygems.org" -gem "appraisal", "2.1.0" +gem "appraisal", "2.2.0" gem "bundler", "~> 1.1" gem "pry" gem "pry-byebug" gem "rake", "12.1.0" gem "rspec", "~> 3.6" -gem "zeus", :require => false +gem "zeus", require: false gem "yard" gem "redcarpet" gem "pygments.rb" gem "fssm" -gem "activerecord-jdbc-adapter", :platform => :jruby -gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby -gem "jdbc-sqlite3", :platform => :jruby -gem "jruby-openssl", :platform => :jruby -gem "therubyrhino", :platform => :jruby -gem "sqlite3", :platform => :ruby -gem "pg", :platform => :ruby +gem "activerecord-jdbc-adapter", platform: :jruby +gem "activerecord-jdbcsqlite3-adapter", platform: :jruby +gem "jdbc-sqlite3", platform: :jruby +gem "jruby-openssl", platform: :jruby +gem "therubyrhino", platform: :jruby +gem "sqlite3", platform: :ruby +gem "pg", platform: :ruby gem "spring" gem "spring-commands-rspec" gem "minitest-reporters" diff --git a/gemfiles/5.0.gemfile.lock b/gemfiles/5.0.gemfile.lock index 5795ac95..36632a21 100644 --- a/gemfiles/5.0.gemfile.lock +++ b/gemfiles/5.0.gemfile.lock @@ -39,7 +39,7 @@ GEM minitest (~> 5.1) tzinfo (~> 1.1) ansi (1.5.0) - appraisal (2.1.0) + appraisal (2.2.0) bundler rake thor (>= 0.14.0) @@ -202,7 +202,7 @@ PLATFORMS DEPENDENCIES activerecord-jdbc-adapter activerecord-jdbcsqlite3-adapter - appraisal (= 2.1.0) + appraisal (= 2.2.0) bcrypt (~> 3.1.7) bundler (~> 1.1) fssm diff --git a/gemfiles/5.1.gemfile b/gemfiles/5.1.gemfile index aad8be24..4b159353 100644 --- a/gemfiles/5.1.gemfile +++ b/gemfiles/5.1.gemfile @@ -2,24 +2,24 @@ source "https://rubygems.org" -gem "appraisal", "2.1.0" +gem "appraisal", "2.2.0" gem "bundler", "~> 1.1" gem "pry" gem "pry-byebug" gem "rake", "12.1.0" gem "rspec", "~> 3.6" -gem "zeus", :require => false +gem "zeus", require: false gem "yard" gem "redcarpet" gem "pygments.rb" gem "fssm" -gem "activerecord-jdbc-adapter", :platform => :jruby -gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby -gem "jdbc-sqlite3", :platform => :jruby -gem "jruby-openssl", :platform => :jruby -gem "therubyrhino", :platform => :jruby -gem "sqlite3", :platform => :ruby -gem "pg", :platform => :ruby +gem "activerecord-jdbc-adapter", platform: :jruby +gem "activerecord-jdbcsqlite3-adapter", platform: :jruby +gem "jdbc-sqlite3", platform: :jruby +gem "jruby-openssl", platform: :jruby +gem "therubyrhino", platform: :jruby +gem "sqlite3", platform: :ruby +gem "pg", platform: :ruby gem "spring" gem "spring-commands-rspec" gem "minitest-reporters" diff --git a/gemfiles/5.1.gemfile.lock b/gemfiles/5.1.gemfile.lock index 9396b0aa..c99cdafc 100644 --- a/gemfiles/5.1.gemfile.lock +++ b/gemfiles/5.1.gemfile.lock @@ -41,7 +41,7 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) ansi (1.5.0) - appraisal (2.1.0) + appraisal (2.2.0) bundler rake thor (>= 0.14.0) @@ -219,7 +219,7 @@ PLATFORMS DEPENDENCIES activerecord-jdbc-adapter activerecord-jdbcsqlite3-adapter - appraisal (= 2.1.0) + appraisal (= 2.2.0) bcrypt (~> 3.1.7) bundler (~> 1.1) capybara (~> 2.13) diff --git a/spec/support/tests/current_bundle.rb b/spec/support/tests/current_bundle.rb index dcc71872..80a08cd9 100644 --- a/spec/support/tests/current_bundle.rb +++ b/spec/support/tests/current_bundle.rb @@ -32,18 +32,12 @@ EOT available_appraisals.sort.last end - private - def available_appraisals - appraisals = [] - - Appraisal::File.each do |appraisal| - appraisals << appraisal.name - end - - appraisals + Appraisal::AppraisalFile.each.map(&:name) end + private + def current_appraisal if appraisal_in_use? File.basename(path, ".gemfile")