🐛 Handling of ENV, and BUNDLE_PATH specifically

Fixes #21

Thanks to @richard-kramer for the report!

Author: pboling

docs/Appraisal/Git.html

@@ -15,12 +15,16 @@ def initialize(command, options = {})
     end
 
     def run
+      # Capture BUNDLE_PATH from the current environment before with_original_env scrubs it
+      bundle_path = ENV["BUNDLE_PATH"]
       run_env = test_environment.merge(env)
 
       if @skip_bundle_exec
         execute(run_env)
       else
         Bundler.with_original_env do
+          # Restore BUNDLE_PATH if it was set
+          ENV["BUNDLE_PATH"] = bundle_path if bundle_path
           ensure_bundler_is_available
           execute(run_env)
         end

lib/appraisal/command.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe "Bundle with custom path" do
-  let(:gem_name) { "rack" }
+  let(:gem_name) { "include_with_respect" }
   let(:path) { "vendor/bundle" }
 
   shared_examples "gemfile dependencies are satisfied" do

spec/acceptance/bundle_with_custom_path_spec.rb

@@ -67,7 +67,7 @@
     before do
       build_appraisal_file <<-APPRAISAL.strip_heredoc.rstrip
         appraise 'rails-7' do
-          gem 'rack', '~> 2.2.0'
+          gem 'status_tag', '~> 0.2'
         end
       APPRAISAL
     end

spec/acceptance/cli/named_appraisal_install_spec.rb

@@ -56,7 +56,7 @@
     before do
       build_appraisal_file <<-APPRAISAL.strip_heredoc.rstrip
         appraise 'rails-7' do
-          gem 'rake', '~> 13.0'
+          gem 'status_tag', '~> 0.2'
         end
       APPRAISAL
 

spec/acceptance/cli/named_appraisal_update_spec.rb

@@ -5,23 +5,23 @@
 RSpec.describe "CLI with ore", ".install --gem-manager=ore", :ore do
   it "installs the dependencies using ore" do
     build_appraisal_file <<-APPRAISAL.strip_heredoc.rstrip
-      appraise 'rack_1' do
-        gem 'rack', '~> 2.2.0'
+      appraise 'via_ore' do
+          gem 'status_tag', '~> 0.2'
       end
     APPRAISAL
 
     output = run "appraisal install --gem-manager=ore"
 
     expect(output).to include("ore lock")
     expect(output).to include("ore install")
-    expect(file("gemfiles/rack_1.gemfile.lock")).to be_exists
+    expect(file("gemfiles/via_ore.gemfile.lock")).to be_exists
   end
 
   context "with jobs option" do
     it "passes -workers flag to ore" do
       build_appraisal_file <<-APPRAISAL.strip_heredoc.rstrip
-        appraise 'rack_workers' do
-          gem 'rack', '~> 2.2.0'
+        appraise 'ore_workers' do
+          gem 'status_tag', '~> 0.2'
         end
       APPRAISAL
 
@@ -35,8 +35,8 @@
   context "with path option" do
     it "passes -vendor flag to ore" do
       build_appraisal_file <<-APPRAISAL.strip_heredoc.rstrip
-        appraise 'rack_vendor' do
-          gem 'rack', '~> 2.2.0'
+        appraise 'ore_vendor' do
+          gem 'status_tag', '~> 0.2'
         end
       APPRAISAL
 
@@ -51,8 +51,8 @@
   context "with without option" do
     it "passes -without flag to ore with comma-separated groups" do
       build_appraisal_file <<-APPRAISAL.strip_heredoc.rstrip
-        appraise 'rack_without' do
-          gem 'rack', '~> 2.2.0'
+        appraise 'ore_without' do
+          gem 'status_tag', '~> 0.2'
         end
       APPRAISAL
 

spec/acceptance/cli/ore_install_spec.rb

@@ -6,7 +6,7 @@
   before do
     build_appraisal_file <<-APPRAISAL.strip_heredoc.rstrip
       appraise 'rack_update' do
-        gem 'rack', '~> 2.2.0'
+        gem 'status_tag', '~> 0.2'
       end
     APPRAISAL
 

spec/acceptance/cli/ore_update_spec.rb

@@ -69,14 +69,26 @@
       end
     end
 
-    context "when skip_bundle_exec is true" do
-      let(:command) { described_class.new(command_string, :gemfile => gemfile, :skip_bundle_exec => true) }
-
-      it "does not wrap execution in Bundler.with_original_env and does not ensure bundler" do
-        expect(Bundler).not_to receive(:with_original_env)
-        expect(command).not_to receive(:ensure_bundler_is_available)
+    context "with BUNDLE_PATH set in environment" do
+      it "preserves BUNDLE_PATH within Bundler.with_original_env" do
+        ENV["BUNDLE_PATH"] = "/custom/path"
+
+        # We need to mock Bundler.with_original_env to actually yield
+        # but also simulate it scrubbing the environment as it would in reality
+        allow(Bundler).to receive(:with_original_env) do |&block|
+          old_bundle_path = ENV.delete("BUNDLE_PATH")
+          block.call
+          ENV["BUNDLE_PATH"] = old_bundle_path
+        end
+
+        expect(Kernel).to receive(:system) do
+          expect(ENV["BUNDLE_PATH"]).to eq("/custom/path")
+          true
+        end
 
         command.run
+
+        ENV.delete("BUNDLE_PATH")
       end
     end
   end