mirror/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2026-01-26 20:19:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

[rubygems/rubygems] Avoid more warnings when using RubyGems with old Bundler

Browse Source 
We were only avoiding them when the RUBYGEMS_GEMDEPS variable is used.
Avoid the warnings in general, whenever the entrypoint to Bundler is
`require`.

https://github.com/rubygems/rubygems/commit/8683faef36
This commit is contained in:
David Rodríguez 2025-07-10 19:46:39 +02:00 committed by Hiroshi SHIBATA
parent a93c684077
commit c3d41492e1
No known key found for this signature in database
GPG Key ID: F9CF13417264FAC2
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/rubygems.rb
View File

@ -640,9 +640,8 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
# Load Bundler extensions to RubyGems, making sure to avoid redefinition
# warnings in platform constants
def self.load_bundler_extensions
require "bundler/version"
return if Bundler::VERSION >= "2.6.9"
def self.load_bundler_extensions(version)
return unless version <= "2.6.9"
previous_platforms = {}
@ -1169,7 +1168,6 @@ An Array (#{env.inspect}) was passed in from #{caller[3]}
ENV["BUNDLE_GEMFILE"] ||= File.expand_path(path)
require_relative "rubygems/user_interaction"
Gem.load_bundler_extensions
require "bundler"
begin
Gem::DefaultUserInteraction.use_ui(ui) do

7
lib/rubygems/core_ext/kernel_require.rb
View File

@ -64,8 +64,11 @@ module Kernel
rp
end
Kernel.send(:gem, name, Gem::Requirement.default_prerelease) unless
resolved_path
next if resolved_path
Kernel.send(:gem, name, Gem::Requirement.default_prerelease)
Gem.load_bundler_extensions(Gem.loaded_specs[name].version) if name == "bundler"
next
end