diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | lib/rubygems/commands/install_command.rb | 2 | ||||
| -rw-r--r-- | lib/rubygems/ext.rb | 2 | ||||
| -rw-r--r-- | test/rubygems/test_gem_source_specific_file.rb | 2 |
4 files changed, 15 insertions, 4 deletions
@@ -1,3 +1,16 @@ +Wed Oct 16 15:00:21 2013 Eric Hodel <drbrain@segment7.net> + + * 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@segment7.net> * lib/rubygems: Update to RubyGems master 278d00d. Changes: diff --git a/lib/rubygems/commands/install_command.rb b/lib/rubygems/commands/install_command.rb index a45d9057b0..0bb40ed633 100644 --- a/lib/rubygems/commands/install_command.rb +++ b/lib/rubygems/commands/install_command.rb @@ -35,7 +35,7 @@ class Gem::Commands::InstallCommand < Gem::Command 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 diff --git a/lib/rubygems/ext.rb b/lib/rubygems/ext.rb index 1823df4ce7..5af6bbf39e 100644 --- a/lib/rubygems/ext.rb +++ b/lib/rubygems/ext.rb @@ -4,8 +4,6 @@ # See LICENSE.txt for permissions. #++ -require 'rubygems' - ## # Classes for building C extensions live here. diff --git a/test/rubygems/test_gem_source_specific_file.rb b/test/rubygems/test_gem_source_specific_file.rb index 8ccbe50c91..fd1f4491ac 100644 --- a/test/rubygems/test_gem_source_specific_file.rb +++ b/test/rubygems/test_gem_source_specific_file.rb @@ -1,5 +1,5 @@ require 'rubygems/test_case' -require 'rubygems/source/specific_file' +require 'rubygems/source' class TestGemSourceSpecificFile < Gem::TestCase def setup |