Merge pull request #7719 from rubygems/deivid-rodriguez/auto-switch-from-binstubs

Auto switch to locked bundler version even when using binstubs

(cherry picked from commit 975ee9d)

Author: deivid-rodriguez

bundler/lib/bundler.rb

@@ -167,6 +167,10 @@ def setup(*groups)
       end
     end
 
+    def auto_switch
+      self_manager.restart_with_locked_bundler_if_needed
+    end
+
     # Automatically install dependencies if Bundler.settings[:auto_install] exists.
     # This is set through config cmd `bundle config set --global auto_install 1`.
     #

bundler/lib/bundler/cli.rb

@@ -65,7 +65,7 @@ def initialize(*args)
         Bundler.reset_settings_and_root!
       end
 
-      Bundler.self_manager.restart_with_locked_bundler_if_needed
+      Bundler.auto_switch
 
       Bundler.settings.set_command_option_if_given :retry, options[:retry]
 

bundler/lib/bundler/self_manager.rb

@@ -92,6 +92,7 @@ def needs_switching?
     def autoswitching_applies?
       ENV["BUNDLER_VERSION"].nil? &&
         Bundler.rubygems.supports_bundler_trampolining? &&
+        ruby_can_restart_with_same_arguments? &&
         SharedHelpers.in_bundle? &&
         lockfile_version
     end
@@ -151,6 +152,10 @@ def released?(version)
       !version.to_s.end_with?(".dev")
     end
 
+    def ruby_can_restart_with_same_arguments?
+      $PROGRAM_NAME != "-e"
+    end
+
     def updating?
       "update".start_with?(ARGV.first || " ") && ARGV[1..-1].any? {|a| a.start_with?("--bundler") }
     end

bundler/lib/bundler/setup.rb

@@ -5,6 +5,9 @@
 if Bundler::SharedHelpers.in_bundle?
   require_relative "../bundler"
 
+  # autoswitch to locked Bundler version if available
+  Bundler.auto_switch
+
   # try to auto_install first before we get to the `Bundler.ui.silence`, so user knows what is happening
   Bundler.auto_install
 

bundler/spec/runtime/self_management_spec.rb

@@ -35,6 +35,17 @@
       bundle "-v", artifice: nil
       expect(out).to end_with(previous_minor[0] == "2" ? "Bundler version #{previous_minor}" : previous_minor)
 
+      # App now uses locked version, even when not using the CLI directly
+      file = bundled_app("bin/bundle_version.rb")
+      create_file file, <<-RUBY
+        #!#{Gem.ruby}
+        require 'bundler/setup'
+        puts Bundler::VERSION
+      RUBY
+      file.chmod(0o777)
+      sys_exec "bin/bundle_version.rb", artifice: nil
+      expect(out).to eq(previous_minor)
+
       # Subsequent installs use the locked version without reinstalling
       bundle "install --verbose", artifice: nil
       expect(out).to include("Using bundler #{previous_minor}")
@@ -57,6 +68,17 @@
       bundle "-v"
       expect(out).to end_with(previous_minor[0] == "2" ? "Bundler version #{previous_minor}" : previous_minor)
 
+      # App now uses locked version, even when not using the CLI directly
+      file = bundled_app("bin/bundle_version.rb")
+      create_file file, <<-RUBY
+        #!#{Gem.ruby}
+        require 'bundler/setup'
+        puts Bundler::VERSION
+      RUBY
+      file.chmod(0o777)
+      sys_exec "bin/bundle_version.rb", artifice: nil
+      expect(out).to eq(previous_minor)
+
       # Subsequent installs use the locked version without reinstalling
       bundle "install --verbose"
       expect(out).to include("Using bundler #{previous_minor}")