summaryrefslogtreecommitdiff
path: root/gem_prelude.rb
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-23 05:37:26 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-23 05:37:26 +0000
commit80db78f51c82cb1290e11810c8c0c03afcdf6996 (patch)
tree341678d98a7b0ded39c6d288023df029cfcb5271 /gem_prelude.rb
parent9e67f6ecec169787bb489ccb3f71d32a141f01da (diff)
* gem_prelude.rb (Gem::QuickLoader.load_full_rubygems_library):
get rid of creating same regexps many times. * lib/rubygems/custom_require.rb (Kernel#require): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27455 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'gem_prelude.rb')
-rw-r--r--gem_prelude.rb10
1 files changed, 3 insertions, 7 deletions
diff --git a/gem_prelude.rb b/gem_prelude.rb
index 5928356afa..99dd6e5eb2 100644
--- a/gem_prelude.rb
+++ b/gem_prelude.rb
@@ -142,9 +142,7 @@ if defined?(Gem) then
@loaded_full_rubygems_library = true
class << Gem
- Gem::GEM_PRELUDE_METHODS.each do |method_name|
- undef_method method_name
- end
+ undef_method *Gem::GEM_PRELUDE_METHODS
undef_method :const_missing
undef_method :method_missing
end
@@ -154,10 +152,8 @@ if defined?(Gem) then
end
$".delete path_to_full_rubygems_library
- $".each do |path|
- if /#{Regexp.escape File::SEPARATOR}rubygems\.rb\z/ =~ path
- raise LoadError, "another rubygems is already loaded from #{path}"
- end
+ if $".any? {|path| path.end_with?('/rubygems.rb')}
+ raise LoadError, "another rubygems is already loaded from #{path}"
end
require 'rubygems'
end