From c652c233aac5a40e83b6b9d34696b9b55b15dbd9 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Tue, 12 May 2026 15:51:25 +0900
Subject: [PATCH] Read BUNDLE_VERSION env var in BundlerVersionFinder

Bundler::Settings resolves the `version` setting from the BUNDLE_VERSION
environment variable, but Gem::BundlerVersionFinder only consulted the
.bundle/config file. As a result `BUNDLE_VERSION=system` was ignored at
activation time and a lockfile-pinned bundler installed globally won
out over the default gem.

https://github.com/ruby/rubygems/issues/9534
---
 lib/rubygems/bundler_version_finder.rb        |  3 ++
 .../test_gem_bundler_version_finder.rb        | 42 +++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/lib/rubygems/bundler_version_finder.rb b/lib/rubygems/bundler_version_finder.rb
index d792358da701..c2d6f4106c52 100644
--- a/lib/rubygems/bundler_version_finder.rb
+++ b/lib/rubygems/bundler_version_finder.rb
@@ -70,6 +70,9 @@ def self.lockfile_contents
   private_class_method :lockfile_contents
 
   def self.bundle_config_version
+    env_version = ENV["BUNDLE_VERSION"]
+    return env_version if env_version && !env_version.empty?
+
     version = nil
 
     [bundler_local_config_file, bundler_global_config_file].each do |config_file|
diff --git a/test/rubygems/test_gem_bundler_version_finder.rb b/test/rubygems/test_gem_bundler_version_finder.rb
index 88ee9c6759f2..be8c5914f48e 100644
--- a/test/rubygems/test_gem_bundler_version_finder.rb
+++ b/test/rubygems/test_gem_bundler_version_finder.rb
@@ -104,6 +104,48 @@ def test_bundler_version_with_bundle_config_version
     end
   end
 
+  def test_bundler_version_with_bundle_version_env_system
+    ENV["BUNDLE_VERSION"] = "system"
+
+    bvf.stub(:lockfile_contents, "\n\nBUNDLED WITH\n   1.1.1.1\n") do
+      assert_nil bvf.bundler_version
+    end
+  end
+
+  def test_bundler_version_with_bundle_version_env_overrides_config
+    ENV["BUNDLE_VERSION"] = "2.3.4"
+
+    config_content = <<~CONFIG
+      BUNDLE_VERSION: "1.2.3"
+    CONFIG
+
+    Tempfile.create("bundle_config") do |f|
+      f.write(config_content)
+      f.flush
+
+      bvf.stub(:bundler_global_config_file, f.path) do
+        assert_equal v("2.3.4"), bvf.bundler_version
+      end
+    end
+  end
+
+  def test_bundler_version_with_empty_bundle_version_env
+    ENV["BUNDLE_VERSION"] = ""
+
+    config_content = <<~CONFIG
+      BUNDLE_VERSION: "1.2.3"
+    CONFIG
+
+    Tempfile.create("bundle_config") do |f|
+      f.write(config_content)
+      f.flush
+
+      bvf.stub(:bundler_global_config_file, f.path) do
+        assert_equal v("1.2.3"), bvf.bundler_version
+      end
+    end
+  end
+
   def test_bundler_version_with_bundle_config_non_existent_file
     bvf.stub(:bundler_global_config_file, "/non/existent/path") do
       assert_nil bvf.bundler_version