diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rubygems.rb | 16 | ||||
| -rw-r--r-- | lib/rubygems/custom_require.rb | 14 |
2 files changed, 18 insertions, 12 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 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) |