diff options
| author | Hiroshi SHIBATA <[email protected]> | 2023-12-07 10:56:34 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <[email protected]> | 2023-12-07 11:37:08 +0900 |
| commit | 214f6d6598be8437284dede9eb9a041a3ebfb24e () | |
| tree | 07bdd14f63d36d5055d47d9a0262725a1b362b60 | |
| parent | 4f213ea1baa590c463c3554a6ff418d10dc291e0 (diff) | |
Move replace_require into bundled_gems.rb
| -rw-r--r-- | lib/bundled_gems.rb | 19 | ||||
| -rw-r--r-- | lib/bundler/rubygems_integration.rb | 21 |
2 files changed, 20 insertions, 20 deletions
@@ -56,6 +56,25 @@ module Gem::BUNDLED_GEMS DLEXT = /\.#{Regexp.union(dlext)}\z/ LIBEXT = /\.#{Regexp.union("rb", *dlext)}\z/ def self.find_gem(path) if !path return @@ -238,25 +238,6 @@ module Bundler 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) executables = nil @@ -379,7 +360,7 @@ module Bundler require "bundled_gems" rescue LoadError end unless defined?(::Gem::BUNDLED_GEMS) - replace_require(specs) if defined?(::Gem::BUNDLED_GEMS) replace_gem(specs, specs_by_name) stub_rubygems(specs) replace_bin_path(specs_by_name) |