drbrain	2013-10-16 15:00:39 +0900 (Wed, 16 Oct 2013)

  New Revision: 43300

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=43300

  Log:
    * lib/rubygems:  Update to RubyGems master b955554.  Changes:
    
      Fixed NameError for Gem::Ext due to re-entering file lookup in
      RubyGems' overridden require.  Bug by Koichi Sasada.
    
      Fixed possible circular require warning in tests.
    
      Used existing constant for `gem install -g` dependecy file list.
    
    * test/rubygems:  ditto.

  Modified files:
    trunk/ChangeLog
    trunk/lib/rubygems/commands/install_command.rb
    trunk/lib/rubygems/ext.rb
    trunk/test/rubygems/test_gem_source_specific_file.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 43299)
+++ ChangeLog	(revision 43300)
@@ -1,3 +1,16 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed Oct 16 15:00:21 2013  Eric Hodel  <drbrain@s...>
+
+	* lib/rubygems:  Update to RubyGems master b955554.  Changes:
+
+	  Fixed NameError for Gem::Ext due to re-entering file lookup in
+	  RubyGems' overridden require.  Bug by Koichi Sasada.
+
+	  Fixed possible circular require warning in tests.
+
+	  Used existing constant for `gem install -g` dependecy file list.
+
+	* test/rubygems:  ditto.
+
 Wed Oct 16 09:42:42 2013  Eric Hodel  <drbrain@s...>
 
 	* lib/rubygems:  Update to RubyGems master 278d00d.  Changes:
Index: lib/rubygems/commands/install_command.rb
===================================================================
--- lib/rubygems/commands/install_command.rb	(revision 43299)
+++ lib/rubygems/commands/install_command.rb	(revision 43300)
@@ -35,7 +35,7 @@ class Gem::Commands::InstallCommand < Ge https://github.com/ruby/ruby/blob/trunk/lib/rubygems/commands/install_command.rb#L35
     add_option(:"Install/Update", '-g', '--file [FILE]',
                'Read from a gem dependencies API file and',
                'install the listed gems') do |v,o|
-      v = %w[gem.deps.rb Gemfile Isolate].find do |file|
+      v = Gem::GEM_DEP_FILES.find do |file|
         File.exist? file
       end unless v
 
Index: lib/rubygems/ext.rb
===================================================================
--- lib/rubygems/ext.rb	(revision 43299)
+++ lib/rubygems/ext.rb	(revision 43300)
@@ -4,8 +4,6 @@ https://github.com/ruby/ruby/blob/trunk/lib/rubygems/ext.rb#L4
 # See LICENSE.txt for permissions.
 #++
 
-require 'rubygems'
-
 ##
 # Classes for building C extensions live here.
 
Index: test/rubygems/test_gem_source_specific_file.rb
===================================================================
--- test/rubygems/test_gem_source_specific_file.rb	(revision 43299)
+++ test/rubygems/test_gem_source_specific_file.rb	(revision 43300)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem_source_specific_file.rb#L1
 require 'rubygems/test_case'
-require 'rubygems/source/specific_file'
+require 'rubygems/source'
 
 class TestGemSourceSpecificFile < Gem::TestCase
   def setup

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/