Move replace_require into bundled_gems.rb

2 files changed, 20 insertions, 20 deletions

diff --git a/lib/bundled_gems.rb b/lib/bundled_gems.rb
index 391cf3d3a0..7c454e453e 100644
--- a/lib/bundled_gems.rb
+++ b/lib/bundled_gems.rb
@@ -56,6 +56,25 @@ module Gem::BUNDLED_GEMS
   DLEXT = /\.#{Regexp.union(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)
     if !path
       return
diff --git a/lib/bundler/rubygems_integration.rb b/lib/bundler/rubygems_integration.rb
index 9cd4d37928..cf60f2c9b8 100644
--- a/lib/bundler/rubygems_integration.rb
+++ b/lib/bundler/rubygems_integration.rb
@@ -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)
+      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)