appraisal 2.5.0 → 3.0.0.rc1

data/spec/appraisal/gemfile_spec.rb

@@ -1,27 +1,29 @@
-require 'spec_helper'
-require 'appraisal/gemfile'
-require 'active_support/core_ext/string/strip'
+# frozen_string_literal: true
 
-describe Appraisal::Gemfile do
+require "spec_helper"
+require "appraisal/gemfile"
+require "active_support/core_ext/string/strip"
+
+RSpec.describe Appraisal::Gemfile do
   include StreamHelpers
 
   it "supports gemfiles without sources" do
     gemfile = Appraisal::Gemfile.new
-    expect(gemfile.to_s.strip).to eq ''
+    expect(gemfile.to_s.strip).to eq ""
   end
 
   it "supports multiple sources" do
     gemfile = Appraisal::Gemfile.new
     gemfile.source "one"
     gemfile.source "two"
-    expect(gemfile.to_s.strip).to eq %{source "one"\nsource "two"}
+    expect(gemfile.to_s.strip).to eq %(source "one"\nsource "two")
   end
 
   it "ignores duplicate sources" do
     gemfile = Appraisal::Gemfile.new
     gemfile.source "one"
     gemfile.source "one"
-    expect(gemfile.to_s.strip).to eq %{source "one"}
+    expect(gemfile.to_s.strip).to eq %(source "one")
   end
 
   it "preserves dependency order" do
@@ -35,10 +37,10 @@ describe Appraisal::Gemfile do
   it "supports symbol sources" do
     gemfile = Appraisal::Gemfile.new
     gemfile.source :one
-    expect(gemfile.to_s.strip).to eq %{source :one}
+    expect(gemfile.to_s.strip).to eq %(source :one)
   end
 
-  it 'supports group syntax' do
+  it "supports group syntax" do
     gemfile = Appraisal::Gemfile.new
 
     gemfile.group :development, :test do
@@ -84,7 +86,7 @@ describe Appraisal::Gemfile do
     GEMFILE
   end
 
-  it 'supports platform syntax' do
+  it "supports platform syntax" do
     gemfile = Appraisal::Gemfile.new
 
     gemfile.platform :jruby do
@@ -226,7 +228,7 @@ describe Appraisal::Gemfile do
     context "no contents" do
       it "shows empty string" do
         gemfile = Appraisal::Gemfile.new
-        expect(gemfile.to_s).to eq ''
+        expect(gemfile.to_s).to eq ""
       end
     end
 
@@ -251,26 +253,26 @@ describe Appraisal::Gemfile do
   end
 
   context "relative path handling" do
-    before { stub_const('RUBY_VERSION', '2.3.0') }
+    before { stub_const("RUBY_VERSION", "2.3.0") }
 
     context "in :path option" do
       it "handles dot path" do
         gemfile = Appraisal::Gemfile.new
-        gemfile.gem "bacon", :path => "."
+        gemfile.gem "bacon", path: "."
 
         expect(gemfile.to_s).to eq %(gem "bacon", path: "../")
       end
 
       it "handles relative path" do
         gemfile = Appraisal::Gemfile.new
-        gemfile.gem "bacon", :path => "../bacon"
+        gemfile.gem "bacon", path: "../bacon"
 
         expect(gemfile.to_s).to eq %(gem "bacon", path: "../../bacon")
       end
 
       it "handles absolute path" do
         gemfile = Appraisal::Gemfile.new
-        gemfile.gem "bacon", :path => "/tmp"
+        gemfile.gem "bacon", path: "/tmp"
 
         expect(gemfile.to_s).to eq %(gem "bacon", path: "/tmp")
       end
@@ -279,31 +281,30 @@ describe Appraisal::Gemfile do
     context "in :git option" do
       it "handles dot git path" do
         gemfile = Appraisal::Gemfile.new
-        gemfile.gem "bacon", :git => "."
+        gemfile.gem "bacon", git: "."
 
         expect(gemfile.to_s).to eq %(gem "bacon", git: "../")
       end
 
       it "handles relative git path" do
         gemfile = Appraisal::Gemfile.new
-        gemfile.gem "bacon", :git => "../bacon"
+        gemfile.gem "bacon", git: "../bacon"
 
         expect(gemfile.to_s).to eq %(gem "bacon", git: "../../bacon")
       end
 
       it "handles absolute git path" do
         gemfile = Appraisal::Gemfile.new
-        gemfile.gem "bacon", :git => "/tmp"
+        gemfile.gem "bacon", git: "/tmp"
 
         expect(gemfile.to_s).to eq %(gem "bacon", git: "/tmp")
       end
 
       it "handles git uri" do
         gemfile = Appraisal::Gemfile.new
-        gemfile.gem "bacon", :git => "git@github.com:bacon/bacon.git"
+        gemfile.gem "bacon", git: "git@github.com:bacon/bacon.git"
 
-        expect(gemfile.to_s).
-          to eq %(gem "bacon", git: "git@github.com:bacon/bacon.git")
+        expect(gemfile.to_s).to eq %(gem "bacon", git: "git@github.com:bacon/bacon.git")
       end
     end
 
@@ -315,11 +316,11 @@ describe Appraisal::Gemfile do
           gem "bacon"
         end
 
-        expect(gemfile.to_s).to eq <<-gemfile.strip_heredoc.strip
+        expect(gemfile.to_s).to eq <<-GEMFILE.strip_heredoc.strip
           path "../" do
             gem "bacon"
           end
-        gemfile
+        GEMFILE
       end
 
       it "handles relative path" do
@@ -329,11 +330,11 @@ describe Appraisal::Gemfile do
           gem "bacon"
         end
 
-        expect(gemfile.to_s).to eq <<-gemfile.strip_heredoc.strip
+        expect(gemfile.to_s).to eq <<-GEMFILE.strip_heredoc.strip
           path "../../bacon" do
             gem "bacon"
           end
-        gemfile
+        GEMFILE
       end
 
       it "handles absolute path" do
@@ -343,11 +344,11 @@ describe Appraisal::Gemfile do
           gem "bacon"
         end
 
-        expect(gemfile.to_s).to eq <<-gemfile.strip_heredoc.strip
+        expect(gemfile.to_s).to eq <<-GEMFILE.strip_heredoc.strip
           path "/tmp" do
             gem "bacon"
           end
-        gemfile
+        GEMFILE
       end
     end
 
@@ -359,11 +360,11 @@ describe Appraisal::Gemfile do
           gem "bacon"
         end
 
-        expect(gemfile.to_s).to eq <<-gemfile.strip_heredoc.strip
+        expect(gemfile.to_s).to eq <<-GEMFILE.strip_heredoc.strip
           git "../" do
             gem "bacon"
           end
-        gemfile
+        GEMFILE
       end
 
       it "handles relative git path" do
@@ -373,11 +374,11 @@ describe Appraisal::Gemfile do
           gem "bacon"
         end
 
-        expect(gemfile.to_s).to eq <<-gemfile.strip_heredoc.strip
+        expect(gemfile.to_s).to eq <<-GEMFILE.strip_heredoc.strip
           git "../../bacon" do
             gem "bacon"
           end
-        gemfile
+        GEMFILE
       end
 
       it "handles absolute git path" do
@@ -387,11 +388,11 @@ describe Appraisal::Gemfile do
           gem "bacon"
         end
 
-        expect(gemfile.to_s).to eq <<-gemfile.strip_heredoc.strip
+        expect(gemfile.to_s).to eq <<-GEMFILE.strip_heredoc.strip
           git "/tmp" do
             gem "bacon"
           end
-        gemfile
+        GEMFILE
       end
 
       it "handles git uri" do
@@ -401,18 +402,18 @@ describe Appraisal::Gemfile do
           gem "bacon"
         end
 
-        expect(gemfile.to_s).to eq <<-gemfile.strip_heredoc.strip
+        expect(gemfile.to_s).to eq <<-GEMFILE.strip_heredoc.strip
           git "git@github.com:bacon/bacon.git" do
             gem "bacon"
           end
-        gemfile
+        GEMFILE
       end
     end
 
     context "in gemspec directive" do
       it "handles gemspec path" do
         gemfile = Appraisal::Gemfile.new
-        gemfile.gemspec :path => "."
+        gemfile.gemspec path: "."
 
         expect(gemfile.to_s).to eq %(gemspec path: "../")
       end
@@ -420,12 +421,12 @@ describe Appraisal::Gemfile do
   end
 
   context "git_source support" do
-    before { stub_const('RUBY_VERSION', '2.3.0') }
+    before { stub_const("RUBY_VERSION", "2.3.0") }
 
     it "stores git_source declaration and apply it as git option" do
       gemfile = Appraisal::Gemfile.new
       gemfile.git_source(:custom_source) { |repo| "path/#{repo}" }
-      gemfile.gem "bacon", :custom_source => "bacon_pancake"
+      gemfile.gem "bacon", custom_source: "bacon_pancake"
 
       expect(gemfile.to_s).to eq %(gem "bacon", git: "../path/bacon_pancake")
     end

data/spec/appraisal/utils_spec.rb

@@ -1,34 +1,32 @@
-require 'spec_helper'
-require 'appraisal/utils'
+# frozen_string_literal: true
 
-describe Appraisal::Utils do
-  describe '.format_string' do
+require "spec_helper"
+require "appraisal/utils"
+
+RSpec.describe Appraisal::Utils do
+  describe ".format_string" do
     it "prints out a nice looking hash without brackets with new syntax" do
-      hash = { :foo => 'bar' }
+      hash = { foo: "bar" }
       expect(Appraisal::Utils.format_string(hash)).to eq('foo: "bar"')
 
-      hash = { 'baz' => { :ball => 'boo' }}
-      expect(Appraisal::Utils.format_string(hash)).
-        to eq('"baz" => { ball: "boo" }')
+      hash = { "baz" => { ball: "boo" } }
+      expect(Appraisal::Utils.format_string(hash)).to eq('"baz" => { ball: "boo" }')
     end
   end
 
-  describe '.format_arguments' do
-    before { stub_const('RUBY_VERSION', '2.3.0') }
+  describe ".format_arguments" do
+    before { stub_const("RUBY_VERSION", "2.3.0") }
 
-    it 'prints out arguments without enclosing square brackets' do
-      arguments = [:foo, { :bar => { :baz => 'ball' }}]
+    it "prints out arguments without enclosing square brackets" do
+      arguments = [:foo, { bar: { baz: "ball" } }]
 
-      expect(Appraisal::Utils.format_arguments(arguments)).to eq(
-        ':foo, bar: { baz: "ball" }'
-      )
+      expect(Appraisal::Utils.format_arguments(arguments)).to eq(':foo, bar: { baz: "ball" }')
     end
 
     it "returns nil if arguments is empty" do
       arguments = []
 
-      expect(Appraisal::Utils.format_arguments(arguments)).
-        to eq(nil)
+      expect(Appraisal::Utils.format_arguments(arguments)).to eq(nil)
     end
   end
 
@@ -45,25 +43,20 @@ describe Appraisal::Utils do
       expect(Appraisal::Utils.prefix_path("/tmp")).to eq "/tmp"
     end
 
-    it "strips out './' from path"  do
-      expect(Appraisal::Utils.prefix_path("./tmp/./appraisal././")).
-        to eq "../tmp/appraisal./"
+    it "strips out './' from path" do
+      expect(Appraisal::Utils.prefix_path("./tmp/./appraisal././")).to eq "../tmp/appraisal./"
     end
 
     it "does not prefix Git uri" do
-      expect(Appraisal::Utils.prefix_path("git@github.com:bacon/bacon.git")).
-        to eq "git@github.com:bacon/bacon.git"
-      expect(Appraisal::Utils.prefix_path("git://github.com/bacon/bacon.git")).
-        to eq "git://github.com/bacon/bacon.git"
-      expect(
-        Appraisal::Utils.prefix_path("https://github.com/bacon/bacon.git")
-      ).to eq("https://github.com/bacon/bacon.git")
+      expect(Appraisal::Utils.prefix_path("git@github.com:bacon/bacon.git")).to eq "git@github.com:bacon/bacon.git"
+      expect(Appraisal::Utils.prefix_path("git://github.com/bacon/bacon.git")).to eq "git://github.com/bacon/bacon.git"
+      expect(Appraisal::Utils.prefix_path("https://github.com/bacon/bacon.git")).to eq("https://github.com/bacon/bacon.git")
     end
   end
 
   describe ".bundler_version" do
     it "returns the bundler version" do
-      bundler = double("Bundler", :name => "bundler", :version => "a.b.c")
+      bundler = double("Bundler", name: "bundler", version: "a.b.c")
       allow(Gem::Specification).to receive(:detect).and_return(bundler)
 
       version = Appraisal::Utils.bundler_version

data/spec/spec_helper.rb

@@ -1,22 +1,30 @@
-require 'rubygems'
-require 'bundler/setup'
+# frozen_string_literal: true
+
+require "rubygems"
+require "bundler/setup"
 require "./spec/support/acceptance_test_helpers"
 require "./spec/support/stream_helpers"
 
-PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..')).freeze
-TMP_GEM_ROOT = File.join(PROJECT_ROOT, "tmp", "gems")
+PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..")).freeze
+TMP_GEM_ROOT = File.join(PROJECT_ROOT, "tmp", "bundler")
+TMP_GEM_BUILD = File.join(PROJECT_ROOT, "tmp", "build")
 ENV["APPRAISAL_UNDER_TEST"] = "1"
 
 RSpec.configure do |config|
   config.raise_errors_for_deprecations!
 
-  config.define_derived_metadata(:file_path => %r{spec\/acceptance\/}) do |metadata|
+  config.define_derived_metadata(file_path: %r{spec\/acceptance\/}) do |metadata|
     metadata[:type] = :acceptance
   end
 
-  config.include AcceptanceTestHelpers, :type => :acceptance
+  config.include AcceptanceTestHelpers, type: :acceptance
+
+  # disable monkey patching
+  # see: https://relishapp.com/rspec/rspec-core/v/3-8/docs/configuration/zero-monkey-patching-mode
+  config.disable_monkey_patching!
 
   config.before :suite do
     FileUtils.rm_rf TMP_GEM_ROOT
+    FileUtils.rm_rf TMP_GEM_BUILD
   end
 end

data/spec/support/acceptance_test_helpers.rb

@@ -1,23 +1,30 @@
-require 'rspec/expectations/expectation_target'
-require 'active_support/core_ext/string/strip'
-require 'active_support/core_ext/string/filters'
-require 'active_support/concern'
-require 'appraisal/utils'
+# frozen_string_literal: true
+
+require "rspec/expectations/expectation_target"
+require "active_support/core_ext/string/strip"
+require "active_support/core_ext/string/filters"
+require "active_support/concern"
+require "appraisal/utils"
 require "./spec/support/dependency_helpers"
 
 module AcceptanceTestHelpers
   extend ActiveSupport::Concern
   include DependencyHelpers
 
-  BUNDLER_ENVIRONMENT_VARIABLES = %w(RUBYOPT BUNDLE_PATH BUNDLE_BIN_PATH
-    BUNDLE_GEMFILE)
+  BUNDLER_ENVIRONMENT_VARIABLES = %w[
+    RUBYOPT
+    BUNDLE_PATH
+    BUNDLE_BIN_PATH
+    BUNDLE_GEMFILE
+    BUNDLER_SETUP
+  ].freeze
 
   included do
     metadata[:type] = :acceptance
 
-    before :parallel => true do
+    before parallel: true do
       unless Appraisal::Utils.support_parallel_installation?
-        pending 'This Bundler version does not support --jobs flag.'
+        pending "This Bundler version does not support --jobs flag."
       end
     end
 
@@ -39,7 +46,7 @@ module AcceptanceTestHelpers
   def save_environment_variables
     @original_environment_variables = {}
 
-    (BUNDLER_ENVIRONMENT_VARIABLES + %w(PATH)).each do |key|
+    (BUNDLER_ENVIRONMENT_VARIABLES + %w[PATH]).each do |key|
       @original_environment_variables[key] = ENV[key]
     end
   end
@@ -51,7 +58,7 @@ module AcceptanceTestHelpers
   end
 
   def add_binstub_path
-    ENV['PATH'] = "bin:#{ENV['PATH']}"
+    ENV["PATH"] = "bin:#{ENV['PATH']}"
   end
 
   def restore_environment_variables
@@ -61,28 +68,28 @@ module AcceptanceTestHelpers
   end
 
   def build_appraisal_file(content)
-    write_file 'Appraisals', content.strip_heredoc
+    write_file "Appraisals", content.strip_heredoc
   end
 
   def build_gemfile(content)
-    write_file 'Gemfile', content.strip_heredoc
+    write_file "Gemfile", content.strip_heredoc
   end
 
   def add_gemspec_to_gemfile
     in_test_directory do
-      File.open('Gemfile', 'a') { |file| file.puts 'gemspec' }
+      File.open("Gemfile", "a") { |file| file.puts "gemspec" }
     end
   end
 
   def build_gemspec
-    write_file "stage.gemspec", <<-gemspec
+    write_file "stage.gemspec", <<-GEMSPEC
       Gem::Specification.new do |s|
         s.name = 'stage'
         s.version = '0.1'
         s.summary = 'Awesome Gem!'
         s.authors = "Appraisal"
       end
-    gemspec
+    GEMSPEC
   end
 
   def content_of(path)
@@ -102,11 +109,11 @@ module AcceptanceTestHelpers
   private
 
   def current_directory
-    File.expand_path('tmp/stage')
+    File.expand_path("tmp/stage")
   end
 
   def write_file(filename, content)
-    in_test_directory { File.open(filename, 'w') { |file| file.puts content } }
+    in_test_directory { File.open(filename, "w") { |file| file.puts content } }
   end
 
   def cleanup_artifacts
@@ -116,8 +123,8 @@ module AcceptanceTestHelpers
   def build_default_dummy_gems
     FileUtils.mkdir_p(TMP_GEM_ROOT)
 
-    build_gem 'dummy', '1.0.0'
-    build_gem 'dummy', '1.1.0'
+    build_gem "dummy", "1.0.0"
+    build_gem "dummy", "1.1.0"
   end
 
   def ensure_bundler_is_available
@@ -135,11 +142,11 @@ module AcceptanceTestHelpers
   end
 
   def build_default_gemfile
-    build_gemfile <<-Gemfile
+    build_gemfile <<-GEMFILE
       source 'https://rubygems.org'
 
       gem 'appraisal', :path => '#{PROJECT_ROOT}'
-    Gemfile
+    GEMFILE
 
     run "bundle install --local"
     run "bundle binstubs --all"
@@ -160,10 +167,10 @@ module AcceptanceTestHelpers
         end
 
         if raise_on_error && exitstatus != 0
-          raise RuntimeError, <<-error_message.strip_heredoc
+          raise RuntimeError, <<-ERROR_MESSAGE.strip_heredoc
             Command #{command.inspect} exited with status #{exitstatus}. Output:
             #{output.gsub(/^/, '  ')}
-          error_message
+          ERROR_MESSAGE
         end
       end
     end

data/spec/support/dependency_helpers.rb

@@ -1,32 +1,44 @@
+# frozen_string_literal: true
+
 module DependencyHelpers
-  def build_gem(gem_name, version = '1.0.0')
-    ENV['GEM_HOME'] = TMP_GEM_ROOT
+  def build_gem(gem_name, version = "1.0.0")
+    ENV["GEM_HOME"] = TMP_GEM_ROOT
 
-    unless File.exist? "tmp/gems/gems/#{gem_name}-#{version}"
-      FileUtils.mkdir_p "tmp/gems/#{gem_name}/lib"
+    unless File.exist? "#{TMP_GEM_ROOT}/gems/#{gem_name}-#{version}"
+      FileUtils.mkdir_p "#{TMP_GEM_BUILD}/#{gem_name}/lib"
 
-      FileUtils.cd "tmp/gems/#{gem_name}" do
+      FileUtils.cd "#{TMP_GEM_BUILD}/#{gem_name}" do
         gemspec = "#{gem_name}.gemspec"
         lib_file = "lib/#{gem_name}.rb"
 
-        File.open gemspec, 'w' do |file|
-          file.puts <<-gemspec
+        File.open gemspec, "w" do |file|
+          file.puts <<-GEMSPEC
             Gem::Specification.new do |s|
               s.name    = #{gem_name.inspect}
               s.version = #{version.inspect}
               s.authors = 'Mr. Smith'
               s.summary = 'summary'
               s.files   = #{lib_file.inspect}
+              s.license = 'MIT'
+              s.homepage = 'http://github.com/thoughtbot/#{gem_name}'
+              s.required_ruby_version = '>= 2.3.0'
             end
-          gemspec
+          GEMSPEC
         end
 
-        File.open lib_file, 'w' do |file|
+        File.open lib_file, "w" do |file|
           file.puts "$#{gem_name}_version = '#{version}'"
         end
 
-        `gem build #{gemspec} 2>&1`
-        `gem install -lN #{gem_name}-#{version}.gem -v #{version} 2>&1`
+        redirect = ENV["VERBOSE"] ? "" : "2>&1"
+
+        puts "building gem: #{gem_name} #{version}" if ENV["VERBOSE"]
+        `gem build #{gemspec} #{redirect}`
+
+        puts "installing gem: #{gem_name} #{version}" if ENV["VERBOSE"]
+        `gem install -lN #{gem_name}-#{version}.gem -v #{version} #{redirect}`
+
+        puts "" if ENV["VERBOSE"]
       end
     end
   end
@@ -35,21 +47,23 @@ module DependencyHelpers
     gems.each { |gem| build_gem(gem) }
   end
 
-  def build_git_gem(gem_name, version = '1.0.0')
+  def build_git_gem(gem_name, version = "1.0.0")
+    puts "building git gem: #{gem_name} #{version}" if ENV["VERBOSE"]
     build_gem gem_name, version
 
-    Dir.chdir "tmp/gems/#{gem_name}" do
-      `git init .`
+    Dir.chdir "#{TMP_GEM_BUILD}/#{gem_name}" do
+      `git init . --initial-branch=master`
       `git config user.email "appraisal@thoughtbot.com"`
       `git config user.name "Appraisal"`
       `git add .`
-      `git commit -a -m "initial commit"`
+      `git commit --all --no-verify --message "initial commit"`
     end
 
     # Cleanup Bundler cache path manually for now
     git_cache_path = File.join(ENV["GEM_HOME"], "cache", "bundler", "git")
 
     Dir[File.join(git_cache_path, "#{gem_name}-*")].each do |path|
+      puts "deleting: #{path}" if ENV["VERBOSE"]
       FileUtils.rm_r(path)
     end
   end

data/spec/support/stream_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "tempfile"
 
 module StreamHelpers