Pull rubygem's custom require into gem_prelude

This solves the gem loading issue by never touching $LOAD_PATH
in gem_prelude and instead loading all of rubygems more quickly.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28693 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 13 insertions, 3 deletions

diff --git a/lib/rubygems.rb b/lib/rubygems.rb
index 51661159cc..42e189ed4a 100644
--- a/lib/rubygems.rb
+++ b/lib/rubygems.rb
@@ -1031,7 +1031,7 @@ end
 
 module Kernel
 
-  undef gem if respond_to? :gem # defined in gem_prelude.rb on 1.9
+  remove_method :gem if respond_to?(:gem, true) # defined in gem_prelude.rb on 1.9
 
   ##
   # Use Kernel#gem to activate a specific version of +gem_name+.
@@ -1109,14 +1109,24 @@ end
 
 require 'rubygems/config_file'
 
-Gem.remove_prelude_paths
+class << Gem
+  remove_method :try_activate if Gem.respond_to?(:try_activate, true)
+
+  def try_activate(path)
+    spec = Gem.searcher.find(path)
+    return false unless spec
+
+    Gem.activate(spec.name, "= #{spec.version}")
+    return true
+  end
+end
 
 ##
 # Enables the require hook for RubyGems.
 #
 # We remove the paths prelude added, so we need custom require to get
 # any gems now.
-require 'rubygems/custom_require'
+# require 'rubygems/custom_require'
 
 Gem.clear_paths