diff options
author | evan <evan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-07-20 18:30:46 +0000 |
---|---|---|
committer | evan <evan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-07-20 18:30:46 +0000 |
commit | bb43e6892c25570605ddb183364e5690c3b22708 (patch) | |
tree | edba6c6d5a0c02c955169b8014da33533715c54d /lib/rubygems | |
parent | b117475e18baa73a1787d8038693b1801dafd9f8 (diff) | |
download | ruby-bb43e6892c25570605ddb183364e5690c3b22708.tar.gz |
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
Diffstat (limited to 'lib/rubygems')
-rw-r--r-- | lib/rubygems/custom_require.rb | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/lib/rubygems/custom_require.rb b/lib/rubygems/custom_require.rb index 43b3136b60..a410a3cfe0 100644 --- a/lib/rubygems/custom_require.rb +++ b/lib/rubygems/custom_require.rb @@ -4,8 +4,6 @@ # See LICENSE.txt for permissions. #++ -require 'rubygems' - module Kernel ## @@ -30,17 +28,15 @@ module Kernel def require(path) # :doc: gem_original_require path rescue LoadError => load_error - if load_error.message.end_with?(path) and - spec = Gem.searcher.find(path) then - Gem.activate(spec.name, "= #{spec.version}") - gem_original_require path - else - raise load_error + if load_error.message.end_with?(path) + return true if Gem.try_activate(path) end + + raise load_error end private :require private :gem_original_require -end +end unless Kernel.private_method_defined?(:gem_original_require) |