appraisal 2.0.0 → 2.3.0

data/spec/acceptance/bundle_without_spec.rb

@@ -0,0 +1,51 @@
+require "spec_helper"
+
+describe "Bundler without flag" do
+  it "passes --without flag to Bundler on install" do
+    build_gems %w(pancake orange_juice waffle coffee sausage soda)
+
+    build_gemfile <<-Gemfile
+      source "https://rubygems.org"
+
+      gem "pancake"
+      gem "rake", "~> 10.5", :platform => :ruby_18
+
+      group :drinks do
+        gem "orange_juice"
+      end
+
+      gem "appraisal", :path => #{PROJECT_ROOT.inspect}
+    Gemfile
+
+    build_appraisal_file <<-Appraisals
+      appraise "breakfast" do
+        gem "waffle"
+
+        group :drinks do
+          gem "coffee"
+        end
+      end
+
+      appraise "lunch" do
+        gem "sausage"
+
+        group :drinks do
+          gem "soda"
+        end
+      end
+    Appraisals
+
+    run "bundle install --local"
+    output = run "appraisal install --without drinks"
+
+    expect(output).to include("Bundle complete")
+    expect(output).to include("Gems in the group drinks were not installed.")
+    expect(output).not_to include("orange_juice")
+    expect(output).not_to include("coffee")
+    expect(output).not_to include("soda")
+
+    output = run "appraisal install"
+
+    expect(output).to include("The Gemfile's dependencies are satisfied")
+  end
+end

data/spec/acceptance/cli/install_spec.rb

@@ -36,8 +36,8 @@ describe 'CLI', 'appraisal install' do
 
     run 'appraisal install'
 
-    expect(content_of 'gemfiles/1.0.0.gemfile.lock').not_to include
-      current_directory
+    expect(content_of("gemfiles/1.0.0.gemfile.lock")).
+      not_to include(current_directory)
   end
 
   context 'with job size', :parallel => true do
@@ -52,19 +52,61 @@ describe 'CLI', 'appraisal install' do
     it 'accepts --jobs option to set job size' do
       output = run 'appraisal install --jobs=2'
 
-      expect(output).to include
-        'bundle install --gemfile=gemfiles/1.0.0.gemfile --jobs=2'
+      expect(output).to include(
+        "bundle install --gemfile='#{file('gemfiles/1.0.0.gemfile')}' --jobs=2"
+      )
     end
 
     it 'ignores --jobs option if the job size is less than or equal to 1' do
       output = run 'appraisal install --jobs=0'
 
+      expect(output).to include(
+        "bundle install --gemfile='#{file('gemfiles/1.0.0.gemfile')}'"
+      )
       expect(output).not_to include(
-        'bundle install --gemfile=gemfiles/1.0.0.gemfile')
+        "bundle install --gemfile='#{file('gemfiles/1.0.0.gemfile')}' --jobs=0"
+      )
       expect(output).not_to include(
-        'bundle install --gemfile=gemfiles/1.0.0.gemfile --jobs=0')
-      expect(output).not_to include(
-        'bundle install --gemfile=gemfiles/1.0.0.gemfile --jobs=1')
+        "bundle install --gemfile='#{file('gemfiles/1.0.0.gemfile')}' --jobs=1"
+      )
+    end
+  end
+
+  context "with full-index", :parallel do
+    before do
+      build_appraisal_file <<-APPRAISAL
+        appraise '1.0.0' do
+          gem 'dummy', '1.0.0'
+        end
+      APPRAISAL
+    end
+
+    it "accepts --full-index option to pull the full RubyGems index" do
+      output = run("appraisal install --full-index")
+
+      expect(output).to include(
+        "bundle install --gemfile='#{file('gemfiles/1.0.0.gemfile')}' " \
+        "--retry 1 --full-index true"
+      )
+    end
+  end
+
+  context "with path", :parallel do
+    before do
+      build_appraisal_file <<-APPRAISAL
+        appraise '1.0.0' do
+          gem 'dummy', '1.0.0'
+        end
+      APPRAISAL
+    end
+
+    it "accepts --path option to specify the location to install gems into" do
+      output = run("appraisal install --path vendor/appraisal")
+
+      expect(output).to include(
+        "bundle install --gemfile='#{file('gemfiles/1.0.0.gemfile')}' " \
+        "--path #{file('vendor/appraisal')} --retry 1",
+      )
     end
   end
 end

data/spec/acceptance/cli/update_spec.rb

@@ -25,8 +25,9 @@ describe 'CLI', 'appraisal update' do
 
   context 'with no arguments' do
     it 'updates all the gems' do
-      run 'appraisal update'
+      output = run 'appraisal update'
 
+      expect(output).to include("gemfiles/dummy.gemfile bundle update")
       expect(content_of 'gemfiles/dummy.gemfile.lock').to include 'dummy (1.0.1)'
       expect(content_of 'gemfiles/dummy.gemfile.lock').to include 'dummy2 (1.0.1)'
     end

data/spec/acceptance/gemspec_spec.rb

@@ -67,6 +67,7 @@ describe 'Gemspec' do
         s.name = 'gemspec_project'
         s.version = '0.1'
         s.summary = 'Awesome Gem!'
+        s.authors = "Appraisal"
 
         s.add_development_dependency('dummy', '1.1.0')
       end

data/spec/acceptance/travis_ci_integration_spec.rb

@@ -21,7 +21,7 @@ describe "Travis CI integration" do
 
       expect(output).to include <<-stdout.strip_heredoc
         # Put this in your .travis.yml
-        gemfiles:
+        gemfile:
           - gemfiles/1.0.0.gemfile
           - gemfiles/1.1.0.gemfile
       stdout
@@ -44,7 +44,7 @@ describe "Travis CI integration" do
     context "with incorrect gemfiles directive" do
       before do
         write_file ".travis.yml", <<-travis_yml
-          gemfiles:
+          gemfile:
             - gemfiles/1.0.0.gemfile
             - gemfiles/1.0.1.gemfile
         travis_yml
@@ -60,7 +60,7 @@ describe "Travis CI integration" do
     context "with correct gemfiles directive" do
       before do
         write_file ".travis.yml", <<-travis_yml
-          gemfiles:
+          gemfile:
             - gemfiles/1.0.0.gemfile
             - gemfiles/1.1.0.gemfile
         travis_yml

data/spec/appraisal/{file_spec.rb → appraisal_file_spec.rb}

@@ -1,13 +1,14 @@
 require 'spec_helper'
-require 'appraisal/file'
+require 'appraisal/appraisal_file'
 
 # Requiring this to make the test pass on Rubinius 2.2.5
 # https://github.com/rubinius/rubinius/issues/2934
 require 'rspec/matchers/built_in/raise_error'
 
-describe Appraisal::File do
+describe Appraisal::AppraisalFile do
   it "complains when no Appraisals file is found" do
-    allow(::File).to receive(:exist?).with("Appraisals").and_return(false)
+    allow(File).to receive(:exist?).with(/Gemfile/).and_return(true)
+    allow(File).to receive(:exist?).with("Appraisals").and_return(false)
     expect { described_class.new }.to raise_error(Appraisal::AppraisalsNotFound)
   end
 end

data/spec/appraisal/appraisal_spec.rb

@@ -34,6 +34,8 @@ describe Appraisal::Appraisal do
     before do
       @appraisal = Appraisal::Appraisal.new('fake', 'fake')
       allow(@appraisal).to receive(:gemfile_path).and_return("/home/test/test directory")
+      allow(@appraisal).to receive(:project_root).
+        and_return(Pathname.new("/home/test"))
       allow(Appraisal::Command).to receive(:new).and_return(double(:run => true))
     end
 
@@ -41,7 +43,7 @@ describe Appraisal::Appraisal do
       stub_const('Bundler::VERSION', '1.3.0')
 
       warning = capture(:stderr) do
-        @appraisal.install(42)
+        @appraisal.install("jobs" => 42)
       end
 
       expect(Appraisal::Command).to have_received(:new).
@@ -52,12 +54,26 @@ describe Appraisal::Appraisal do
     it 'runs parallel install command on Bundler >= 1.4.0' do
       stub_const('Bundler::VERSION', '1.4.0')
 
-      @appraisal.install(42)
+      @appraisal.install("jobs" => 42)
 
       expect(Appraisal::Command).to have_received(:new).
         with("#{bundle_check_command} || #{bundle_parallel_install_command}")
     end
 
+    it 'runs install command with retries on Bundler' do
+      @appraisal.install("retry" => 3)
+
+      expect(Appraisal::Command).to have_received(:new).
+        with("#{bundle_check_command} || #{bundle_install_command_with_retries}")
+    end
+
+    it "runs install command with path on Bundler" do
+      @appraisal.install("path" => "vendor/appraisal")
+
+      expect(Appraisal::Command).to have_received(:new).
+        with("#{bundle_check_command} || #{bundle_install_command_with_path}")
+    end
+
     def bundle_check_command
       "bundle check --gemfile='/home/test/test directory'"
     end
@@ -69,5 +85,14 @@ describe Appraisal::Appraisal do
     def bundle_parallel_install_command
       "bundle install --gemfile='/home/test/test directory' --jobs=42"
     end
+
+    def bundle_install_command_with_retries
+      "bundle install --gemfile='/home/test/test directory' --retry 3"
+    end
+
+    def bundle_install_command_with_path
+      "bundle install --gemfile='/home/test/test directory' " \
+        "--path /home/test/vendor/appraisal"
+    end
   end
 end

data/spec/appraisal/gemfile_spec.rb

@@ -251,26 +251,28 @@ describe Appraisal::Gemfile do
   end
 
   context "relative path handling" do
+    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 => "."
 
-        expect(gemfile.to_s).to eq %(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"
 
-        expect(gemfile.to_s).to eq %(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"
 
-        expect(gemfile.to_s).to eq %(gem "bacon", :path => "/tmp")
+        expect(gemfile.to_s).to eq %(gem "bacon", path: "/tmp")
       end
     end
 
@@ -279,21 +281,21 @@ describe Appraisal::Gemfile do
         gemfile = Appraisal::Gemfile.new
         gemfile.gem "bacon", :git => "."
 
-        expect(gemfile.to_s).to eq %(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"
 
-        expect(gemfile.to_s).to eq %(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"
 
-        expect(gemfile.to_s).to eq %(gem "bacon", :git => "/tmp")
+        expect(gemfile.to_s).to eq %(gem "bacon", git: "/tmp")
       end
 
       it "handles git uri" do
@@ -301,7 +303,7 @@ describe Appraisal::Gemfile do
         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")
+          to eq %(gem "bacon", git: "git@github.com:bacon/bacon.git")
       end
     end
 
@@ -412,8 +414,20 @@ describe Appraisal::Gemfile do
         gemfile = Appraisal::Gemfile.new
         gemfile.gemspec :path => "."
 
-        expect(gemfile.to_s).to eq %(gemspec :path => "../")
+        expect(gemfile.to_s).to eq %(gemspec path: "../")
       end
     end
   end
+
+  context "git_source support" do
+    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"
+
+      expect(gemfile.to_s).to eq %(gem "bacon", git: "../path/bacon_pancake")
+    end
+  end
 end

data/spec/appraisal/utils_spec.rb

@@ -3,22 +3,24 @@ require 'appraisal/utils'
 
 describe Appraisal::Utils do
   describe '.format_string' do
-    it 'prints out a nice looking hash without a brackets' do
+    it "prints out a nice looking hash without brackets with new syntax" do
       hash = { :foo => 'bar' }
-      expect(Appraisal::Utils.format_string(hash)).to eq(':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" }')
+        to eq('"baz" => { ball: "boo" }')
     end
   end
 
   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' }}]
 
       expect(Appraisal::Utils.format_arguments(arguments)).to eq(
-        ':foo, :bar => { :baz => "ball" }'
+        ':foo, bar: { baz: "ball" }'
       )
     end
 
@@ -58,4 +60,16 @@ describe Appraisal::Utils do
       ).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")
+      allow(Gem::Specification).to receive(:detect).and_return(bundler)
+
+      version = Appraisal::Utils.bundler_version
+
+      expect(version).to eq "a.b.c"
+      expect(Gem::Specification).to have_received(:detect)
+    end
+  end
 end

data/spec/support/acceptance_test_helpers.rb

@@ -80,12 +80,15 @@ module AcceptanceTestHelpers
         s.name = 'stage'
         s.version = '0.1'
         s.summary = 'Awesome Gem!'
+        s.authors = "Appraisal"
       end
     gemspec
   end
 
   def content_of(path)
-    file(path).read
+    file(path).read.tap do |content|
+      content.gsub!(/(\S+): /, ":\\1 => ")
+    end
   end
 
   def file(path)
@@ -125,8 +128,9 @@ module AcceptanceTestHelpers
         Reinstall Bundler to #{TMP_GEM_ROOT} as `BUNDLE_DISABLE_SHARED_GEMS`
         is enabled.
       WARNING
+      version = Utils.bundler_version
 
-      run "gem install bundler --install-dir '#{TMP_GEM_ROOT}'"
+      run "gem install bundler --version #{version} --install-dir '#{TMP_GEM_ROOT}'"
     end
   end
 
@@ -135,11 +139,6 @@ module AcceptanceTestHelpers
       source 'https://rubygems.org'
 
       gem 'appraisal', :path => '#{PROJECT_ROOT}'
-
-      if RUBY_VERSION < "1.9"
-        gem "i18n", "~> 0.6.0"
-        gem "activesupport", "~> 3.2.21"
-      end
     Gemfile
 
     run "bundle install --binstubs --local"

data/spec/support/dependency_helpers.rb

@@ -53,4 +53,8 @@ module DependencyHelpers
       FileUtils.rm_r(path)
     end
   end
+
+  def build_git_gems(gems)
+    gems.each { |gem| build_git_gem(gem) }
+  end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: appraisal
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Joe Ferris
 - Prem Sichanugrist
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2020-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -60,7 +60,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.21
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -103,25 +103,27 @@ files:
 - bin/appraisal
 - lib/appraisal.rb
 - lib/appraisal/appraisal.rb
+- lib/appraisal/appraisal_file.rb
 - lib/appraisal/bundler_dsl.rb
 - lib/appraisal/cli.rb
 - lib/appraisal/command.rb
 - lib/appraisal/dependency.rb
 - lib/appraisal/dependency_list.rb
 - lib/appraisal/errors.rb
-- lib/appraisal/file.rb
 - lib/appraisal/gemfile.rb
 - lib/appraisal/gemspec.rb
-- lib/appraisal/git_source.rb
+- lib/appraisal/git.rb
 - lib/appraisal/group.rb
-- lib/appraisal/path_source.rb
+- lib/appraisal/path.rb
 - lib/appraisal/platform.rb
+- lib/appraisal/source.rb
 - lib/appraisal/task.rb
 - lib/appraisal/travis_ci_helper.rb
 - lib/appraisal/utils.rb
 - lib/appraisal/version.rb
 - spec/acceptance/appraisals_file_bundler_dsl_compatibility_spec.rb
 - spec/acceptance/bundle_with_custom_path_spec.rb
+- spec/acceptance/bundle_without_spec.rb
 - spec/acceptance/cli/clean_spec.rb
 - spec/acceptance/cli/generate_spec.rb
 - spec/acceptance/cli/help_spec.rb
@@ -134,9 +136,9 @@ files:
 - spec/acceptance/gemfile_dsl_compatibility_spec.rb
 - spec/acceptance/gemspec_spec.rb
 - spec/acceptance/travis_ci_integration_spec.rb
+- spec/appraisal/appraisal_file_spec.rb
 - spec/appraisal/appraisal_spec.rb
 - spec/appraisal/dependency_list_spec.rb
-- spec/appraisal/file_spec.rb
 - spec/appraisal/gemfile_spec.rb
 - spec/appraisal/utils_spec.rb
 - spec/spec_helper.rb
@@ -147,7 +149,7 @@ homepage: http://github.com/thoughtbot/appraisal
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -155,21 +157,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Find out what your Ruby gems are worth
 test_files:
 - spec/acceptance/appraisals_file_bundler_dsl_compatibility_spec.rb
 - spec/acceptance/bundle_with_custom_path_spec.rb
+- spec/acceptance/bundle_without_spec.rb
 - spec/acceptance/cli/clean_spec.rb
 - spec/acceptance/cli/generate_spec.rb
 - spec/acceptance/cli/help_spec.rb
@@ -182,9 +184,9 @@ test_files:
 - spec/acceptance/gemfile_dsl_compatibility_spec.rb
 - spec/acceptance/gemspec_spec.rb
 - spec/acceptance/travis_ci_integration_spec.rb
+- spec/appraisal/appraisal_file_spec.rb
 - spec/appraisal/appraisal_spec.rb
 - spec/appraisal/dependency_list_spec.rb
-- spec/appraisal/file_spec.rb
 - spec/appraisal/gemfile_spec.rb
 - spec/appraisal/utils_spec.rb
 - spec/spec_helper.rb