From d1de97e0bcdb0f9b79cc3dbce843c4a8ac705443 Mon Sep 17 00:00:00 2001 From: mame Date: Wed, 7 Jul 2010 15:40:52 +0000 Subject: * gem_prelude.rb: provide workaround for gem activation. Currently, gem activation does not work by default. Now it can be worked around by requiring "rubygems" first. [ruby-core:29486] a patch from Evan Phoenix in [ruby-core:31096]. * lib/rubygems.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28570 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 9 +++++++++ gem_prelude.rb | 24 ++++++++++++++---------- lib/rubygems.rb | 20 ++++++++++++++++---- test/rubygems/test_gem_activation.rb | 2 +- 4 files changed, 40 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index cbb3e3b47d..df954ea102 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Thu Jul 8 00:15:50 2010 Yusuke Endoh + + * gem_prelude.rb: provide workaround for gem activation. Currently, + gem activation does not work by default. Now it can be worked + around by requiring "rubygems" first. [ruby-core:29486] + a patch from Evan Phoenix in [ruby-core:31096]. + + * lib/rubygems.rb: ditto. + Wed Jul 7 10:01:34 2010 Adrian Bloomer * numeric.c (fix_rev): Replaced fix_rev with '~num | FIXNUM_FLAG'. diff --git a/gem_prelude.rb b/gem_prelude.rb index 71f30bd9ce..c51f07ef08 100644 --- a/gem_prelude.rb +++ b/gem_prelude.rb @@ -136,7 +136,7 @@ if defined?(Gem) then @loaded_full_rubygems_library = false - def self.load_full_rubygems_library + def self.remove return if @loaded_full_rubygems_library @loaded_full_rubygems_library = true @@ -150,6 +150,12 @@ if defined?(Gem) then Kernel.module_eval do undef_method :gem if method_defined? :gem end + end + + def self.load_full_rubygems_library + return if @loaded_full_rubygems_library + + remove $".delete path_to_full_rubygems_library if $".any? {|path| path.end_with?('/rubygems.rb')} @@ -179,6 +185,7 @@ if defined?(Gem) then GemPaths = {} GemVersions = {} + GemLoadPaths = [] def push_gem_version_on_load_path(gem_name, *version_requirements) if version_requirements.empty? @@ -241,29 +248,27 @@ if defined?(Gem) then end end - require_paths = [] - GemPaths.each_value do |path| if File.exist?(file = File.join(path, ".require_paths")) then paths = File.read(file).split.map do |require_path| File.join path, require_path end - require_paths.concat paths + GemLoadPaths.concat paths else - require_paths << file if File.exist?(file = File.join(path, "bin")) - require_paths << file if File.exist?(file = File.join(path, "lib")) + GemLoadPaths << file if File.exist?(file = File.join(path, "bin")) + GemLoadPaths << file if File.exist?(file = File.join(path, "lib")) end end # "tag" the first require_path inserted into the $LOAD_PATH to enable # indexing correctly with rubygems proper when it inserts an explicitly # gem version - unless require_paths.empty? then - require_paths.first.instance_variable_set(:@gem_prelude_index, true) + unless GemLoadPaths.empty? then + GemLoadPaths.first.instance_variable_set(:@gem_prelude_index, true) end # gem directories must come after -I and ENV['RUBYLIB'] - $:[$:.index{|e|e.instance_variable_defined?(:@gem_prelude_index)}||-1,0] = require_paths + $:[$:.index{|e|e.instance_variable_defined?(:@gem_prelude_index)}||-1,0] = GemLoadPaths end def const_missing(constant) @@ -289,7 +294,6 @@ if defined?(Gem) then begin Gem.push_all_highest_version_gems_on_load_path - Gem::QuickLoader.fake_rubygems_as_loaded rescue Exception => e puts "Error loading gem paths on load path in gem_prelude" puts e diff --git a/lib/rubygems.rb b/lib/rubygems.rb index d2e0f2cb5d..51661159cc 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -7,6 +7,11 @@ gem_disabled = !defined? Gem +unless gem_disabled + # Nuke the Quickloader stuff + Gem::QuickLoader.remove +end + require 'rubygems/defaults' require 'thread' require 'etc' @@ -579,6 +584,12 @@ module Gem $LOAD_PATH.index { |p| p.instance_variable_defined? :@gem_prelude_index } end + def self.remove_prelude_paths + Gem::QuickLoader::GemLoadPaths.each do |path| + $LOAD_PATH.delete(path) + end + end + ## # The file name and line number of the caller of the caller of this method. @@ -1098,13 +1109,14 @@ end require 'rubygems/config_file' +Gem.remove_prelude_paths + ## # Enables the require hook for RubyGems. # -# Ruby 1.9 allows --disable-gems, so we require it when we didn't detect a Gem -# constant at rubygems.rb load time. - -require 'rubygems/custom_require' if gem_disabled or RUBY_VERSION < '1.9' +# We remove the paths prelude added, so we need custom require to get +# any gems now. +require 'rubygems/custom_require' Gem.clear_paths diff --git a/test/rubygems/test_gem_activation.rb b/test/rubygems/test_gem_activation.rb index d0acc29052..2d1cd4832d 100644 --- a/test/rubygems/test_gem_activation.rb +++ b/test/rubygems/test_gem_activation.rb @@ -17,4 +17,4 @@ end} /can't activate rubygems-bug-child.*already activated rubygems-bug-child-1\.1/, [], bug3140) end -end if defined?(::Gem) +end if defined?(::Gem) and RUBY_VERSION < "1.9" -- cgit v1.2.1