[rubygems/rubygems] Introduce bundle config set version feature

https://github.com/rubygems/rubygems/commit/c431a1df52

1 files changed, 18 insertions, 5 deletions

diff --git a/lib/bundler/self_manager.rb b/lib/bundler/self_manager.rb
index 827f3f9222..70a5fedabd 100644
--- a/lib/bundler/self_manager.rb
+++ b/lib/bundler/self_manager.rb
@@ -15,11 +15,23 @@ module Bundler
     def install_locked_bundler_and_restart_with_it_if_needed
       return unless needs_switching?
 
-      Bundler.ui.info \
-        "Bundler #{current_version} is running, but your lockfile was generated with #{lockfile_version}. " \
-        "Installing Bundler #{lockfile_version} and restarting using that version."
+      begin
+        # BUNDLE_VERSION=x.y.z
+        restart_version = Gem::Version.new(Bundler.settings[:version])
+
+        Bundler.ui.info \
+          "Bundler #{current_version} is running, but your configuration was #{restart_version}. " \
+          "Installing Bundler #{restart_version} and restarting using that version."
+      rescue ArgumentError
+        # BUNDLE_VERSION=local
+        restart_version = lockfile_version
+
+        Bundler.ui.info \
+          "Bundler #{current_version} is running, but your lockfile was generated with #{restart_version}. " \
+          "Installing Bundler #{restart_version} and restarting using that version."
+      end
 
-      install_and_restart_with(lockfile_version)
+      install_and_restart_with(restart_version)
     end
 
     def update_bundler_and_restart_with_it_if_needed(target)
@@ -79,7 +91,8 @@ module Bundler
       autoswitching_applies? &&
         released?(lockfile_version) &&
         !running?(lockfile_version) &&
-        !updating?
+        !updating? &&
+        Bundler.settings[:version] != "global"
     end
 
     def autoswitching_applies?