[rubygems/rubygems] Remove no longer necessary workarounds for restarts

Since we no longer pass ruby CLI flags in our spec commands, we no
longer need the previous workaround and can get the realworld code
tested.

ruby/rubygems@fd92c855fb

Author: deivid-rodriguez

lib/bundler/self_manager.rb

@@ -70,24 +70,9 @@ def restart_with(version)
       configured_gem_home = ENV["GEM_HOME"]
       configured_gem_path = ENV["GEM_PATH"]
 
-      # Bundler specs need some stuff to be required before Bundler starts
-      # running, for example, for faking the compact index API. However, these
-      # flags are lost when we reexec to a different version of Bundler. In the
-      # future, we may be able to properly reconstruct the original Ruby
-      # invocation (see https://bugs.ruby-lang.org/issues/6648), but for now
-      # there's no way to do it, so we need to be explicit about how to re-exec.
-      # This may be a feature end users request at some point, but maybe by that
-      # time, we have builtin tools to do. So for now, we use an undocumented
-      # ENV variable only for our specs.
-      bundler_spec_original_cmd = ENV["BUNDLER_SPEC_ORIGINAL_CMD"]
-      if bundler_spec_original_cmd
-        require "shellwords"
-        cmd = [*Shellwords.shellsplit(bundler_spec_original_cmd), *ARGV]
-      else
-        argv0 = File.exist?($PROGRAM_NAME) ? $PROGRAM_NAME : Process.argv0
-        cmd = [argv0, *ARGV]
-        cmd.unshift(Gem.ruby) unless File.executable?(argv0)
-      end
+      argv0 = File.exist?($PROGRAM_NAME) ? $PROGRAM_NAME : Process.argv0
+      cmd = [argv0, *ARGV]
+      cmd.unshift(Gem.ruby) unless File.executable?(argv0)
 
       Bundler.with_original_env do
         Kernel.exec(

spec/bundler/commands/update_spec.rb

@@ -1558,7 +1558,7 @@
     G
     lockfile lockfile.sub(/(^\s*)#{Bundler::VERSION}($)/, "2.99.9")
 
-    bundle :update, bundler: true, verbose: true, preserve_ruby_flags: true, env: { "BUNDLER_4_MODE" => nil }
+    bundle :update, bundler: true, verbose: true, env: { "BUNDLER_4_MODE" => nil }
 
     expect(out).to include("Updating bundler to 999.0.0")
     expect(out).to include("Running `bundle update --bundler \"> 0.a\" --verbose` with bundler 999.0.0")

spec/bundler/lock/lockfile_spec.rb

@@ -109,7 +109,7 @@
          #{version}
     L
 
-    install_gemfile <<-G, verbose: true, preserve_ruby_flags: true, env: { "BUNDLER_4_MODE" => nil }
+    install_gemfile <<-G, verbose: true, env: { "BUNDLER_4_MODE" => nil }
       source "https://gem.repo4"
 
       gem "myrack"

spec/bundler/runtime/self_management_spec.rb

@@ -34,7 +34,7 @@
       lockfile_bundled_with(previous_minor)
 
       bundle "config set --local path.system true"
-      bundle "install", preserve_ruby_flags: true
+      bundle "install"
       expect(out).to include("Bundler #{current_version} is running, but your lockfile was generated with #{previous_minor}. Installing Bundler #{previous_minor} and restarting using that version.")
 
       # It uninstalls the older system bundler
@@ -70,7 +70,7 @@
       lockfile_bundled_with(previous_minor)
 
       bundle "config set --local path vendor/bundle"
-      bundle "install", preserve_ruby_flags: true
+      bundle "install"
       expect(out).to include("Bundler #{current_version} is running, but your lockfile was generated with #{previous_minor}. Installing Bundler #{previous_minor} and restarting using that version.")
       expect(vendored_gems("gems/bundler-#{previous_minor}")).to exist
 
@@ -107,7 +107,7 @@
       lockfile_bundled_with(previous_minor)
 
       bundle "config set --local deployment true"
-      bundle "install", preserve_ruby_flags: true
+      bundle "install"
       expect(out).to include("Bundler #{current_version} is running, but your lockfile was generated with #{previous_minor}. Installing Bundler #{previous_minor} and restarting using that version.")
       expect(vendored_gems("gems/bundler-#{previous_minor}")).to exist
 
@@ -162,7 +162,7 @@
       lockfile_bundled_with(current_version)
 
       bundle "config set --local version #{previous_minor}"
-      bundle "install", preserve_ruby_flags: true
+      bundle "install"
       expect(out).to include("Bundler #{current_version} is running, but your configuration was #{previous_minor}. Installing Bundler #{previous_minor} and restarting using that version.")
 
       bundle "-v"

spec/bundler/support/helpers.rb

@@ -71,7 +71,6 @@ def bundle(cmd, options = {}, &block)
       bundle_bin ||= installed_bindir.join("bundle")
 
       env = options.delete(:env) || {}
-      preserve_ruby_flags = options.delete(:preserve_ruby_flags)
 
       requires = options.delete(:requires) || []
 
@@ -102,7 +101,6 @@ def bundle(cmd, options = {}, &block)
       end.join
 
       cmd = "#{Gem.ruby} #{bundle_bin} #{cmd}#{args}"
-      env["BUNDLER_SPEC_ORIGINAL_CMD"] = "#{Gem.ruby} #{bundle_bin}" if preserve_ruby_flags
       sys_exec(cmd, { env: env, dir: dir, raise_on_error: raise_on_error }, &block)
     end