[rubygems/rubygems] bundle exec does not need artifice in general

ruby/rubygems@cb1f19573a

Author: deivid-rodriguez

spec/bundler/commands/exec_spec.rb

@@ -204,7 +204,7 @@
       end
 
       it "uses version provided by ruby" do
-        bundle "exec erb --version", artifice: nil
+        bundle "exec erb --version"
 
         expect(stdboth).to eq(default_erb_version)
       end
@@ -227,7 +227,7 @@
       end
 
       it "uses version specified" do
-        bundle "exec erb --version", artifice: nil
+        bundle "exec erb --version"
 
         expect(stdboth).to eq(specified_erb_version)
       end
@@ -254,7 +254,7 @@
       end
 
       it "uses resolved version" do
-        bundle "exec erb --version", artifice: nil
+        bundle "exec erb --version"
 
         expect(stdboth).to eq(indirect_erb_version)
       end
@@ -583,7 +583,7 @@
     G
 
     bundle "config set auto_install 1"
-    bundle "exec myrackup"
+    bundle "exec myrackup", artifice: "compact_index"
     expect(out).to include("Installing foo 1.0")
   end
 
@@ -598,7 +598,7 @@
     G
 
     bundle "config set auto_install 1"
-    bundle "exec foo"
+    bundle "exec foo", artifice: "compact_index"
     expect(out).to include("Fetching myrack 0.9.1")
     expect(out).to include("Fetching #{lib_path("foo-1.0")}")
     expect(out.lines).to end_with("1.0")
@@ -625,7 +625,7 @@
       gem "fastlane"
     G
 
-    bundle "exec fastlane"
+    bundle "exec fastlane", artifice: "compact_index"
     expect(out).to include("Installing optparse 999.999.999")
     expect(out).to include("2.192.0")
   end
@@ -1250,9 +1250,9 @@ def require(path)
 
         env = { "PATH" => path }
         aggregate_failures do
-          expect(bundle("exec #{file}", artifice: nil, env: env)).to eq(default_openssl_version)
-          expect(bundle("exec bundle exec #{file}", artifice: nil, env: env)).to eq(default_openssl_version)
-          expect(bundle("exec ruby #{file}", artifice: nil, env: env)).to eq(default_openssl_version)
+          expect(bundle("exec #{file}", env: env)).to eq(default_openssl_version)
+          expect(bundle("exec bundle exec #{file}", env: env)).to eq(default_openssl_version)
+          expect(bundle("exec ruby #{file}", env: env)).to eq(default_openssl_version)
           expect(run(file.read, artifice: nil, env: env)).to eq(default_openssl_version)
         end
 

spec/bundler/runtime/setup_spec.rb

@@ -1464,7 +1464,7 @@ def lock_with(ruby_version = nil)
         install_gemfile "source 'https://gem.repo1'"
         create_file("script.rb", "#!/usr/bin/env ruby\n\n#{code}")
         FileUtils.chmod(0o777, bundled_app("script.rb"))
-        bundle "exec ./script.rb", artifice: nil, env: { "RUBYOPT" => activation_warning_hack_rubyopt }
+        bundle "exec ./script.rb", env: { "RUBYOPT" => activation_warning_hack_rubyopt }
         expect(out).to eq("{}")
       end
 

spec/bundler/support/helpers.rb

@@ -83,7 +83,7 @@ def bundle(cmd, options = {}, &block)
       load_path << custom_load_path if custom_load_path
 
       build_ruby_options = { load_path: load_path, requires: requires, env: env }
-      build_ruby_options.merge!(artifice: options.delete(:artifice)) if options.key?(:artifice)
+      build_ruby_options.merge!(artifice: options.delete(:artifice)) if options.key?(:artifice) || cmd.start_with?("exec")
 
       match_source(cmd)