1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move replace_require into bundled_gems.rb

Browse Source
This commit is contained in:
Hiroshi SHIBATA 2023-12-07 10:56:34 +09:00
parent 4f213ea1ba
commit 214f6d6598
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/bundled_gems.rb
View File

@ -56,6 +56,25 @@ module Gem::BUNDLED_GEMS
DLEXT = /\.#{Regexp.union(dlext)}\z/ DLEXT = /\.#{Regexp.union(dlext)}\z/
LIBEXT = /\.#{Regexp.union("rb", *dlext)}\z/ LIBEXT = /\.#{Regexp.union("rb", *dlext)}\z/
def self.replace_require(specs)
return if [::Kernel.singleton_class, ::Kernel].any? {|klass| klass.respond_to?(:no_warning_require) }
[::Kernel.singleton_class, ::Kernel].each do |kernel_class|
kernel_class.send(:alias_method, :no_warning_require, :require)
kernel_class.send(:define_method, :require) do |name|
if message = ::Gem::BUNDLED_GEMS.warning?(name, specs: specs) # rubocop:disable Style/HashSyntax
warn message, :uplevel => 1
end
kernel_class.send(:no_warning_require, name)
end
if kernel_class == ::Kernel
kernel_class.send(:private, :require)
else
kernel_class.send(:public, :require)
end
end
end
def self.find_gem(path) def self.find_gem(path)
if !path if !path
return return

21
lib/bundler/rubygems_integration.rb
View File

@ -238,25 +238,6 @@ module Bundler
end end
end end
def replace_require(specs)
return if [::Kernel.singleton_class, ::Kernel].any? {|klass| klass.respond_to?(:no_warning_require) }
[::Kernel.singleton_class, ::Kernel].each do |kernel_class|
kernel_class.send(:alias_method, :no_warning_require, :require)
kernel_class.send(:define_method, :require) do |name|
if message = ::Gem::BUNDLED_GEMS.warning?(name, specs: specs) # rubocop:disable Style/HashSyntax
warn message, :uplevel => 1
end
kernel_class.send(:no_warning_require, name)
end
if kernel_class == ::Kernel
kernel_class.send(:private, :require)
else
kernel_class.send(:public, :require)
end
end
end
def replace_gem(specs, specs_by_name) def replace_gem(specs, specs_by_name)
executables = nil executables = nil
@ -379,7 +360,7 @@ module Bundler
require "bundled_gems" require "bundled_gems"
rescue LoadError rescue LoadError
end unless defined?(::Gem::BUNDLED_GEMS) end unless defined?(::Gem::BUNDLED_GEMS)
replace_require(specs) if defined?(::Gem::BUNDLED_GEMS) Gem::BUNDLED_GEMS.replace_require(specs) if defined?(::Gem::BUNDLED_GEMS)
replace_gem(specs, specs_by_name) replace_gem(specs, specs_by_name)
stub_rubygems(specs) stub_rubygems(specs)
replace_bin_path(specs_by_name) replace_bin_path(specs_by_name)