From dd16f8524c44f8802e634af2577fe5a149cd740e Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Sat, 17 Aug 2019 08:54:05 +0900
Subject: Revert "Revert "[rubygems/rubygems] [Require] Ensure -I beats a
 default gem""

This reverts commit 75d29db8f965893bb6ab38b9008abc80cdda246e.
---
 lib/rubygems/core_ext/kernel_require.rb | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'lib/rubygems/core_ext')

diff --git a/lib/rubygems/core_ext/kernel_require.rb b/lib/rubygems/core_ext/kernel_require.rb
index 8c85ef79fc..5986e356bc 100755
--- a/lib/rubygems/core_ext/kernel_require.rb
+++ b/lib/rubygems/core_ext/kernel_require.rb
@@ -36,6 +36,26 @@ module Kernel
 
     path = path.to_path if path.respond_to? :to_path
 
+    resolved_path = begin
+      rp = nil
+      $LOAD_PATH[0...Gem.load_path_insert_index || -1].each do |lp|
+        Gem.suffixes.each do |s|
+          full_path = File.expand_path(File.join(lp, "#{path}#{s}").untaint)
+          if File.file?(full_path)
+            rp = full_path
+            break
+          end
+        end
+        break if rp
+      end
+      rp
+    end
+
+    if resolved_path
+      RUBYGEMS_ACTIVATION_MONITOR.exit
+      return gem_original_require(resolved_path)
+    end
+
     if spec = Gem.find_unresolved_default_spec(path)
       begin
         Kernel.send(:gem, spec.name, "#{Gem::Requirement.default}.a")
-- 
cgit v1.2.3