summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-10-16 06:00:39 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-10-16 06:00:39 +0000
commite775a930e1631f11b3bb9e2a0feb260f5a5df769 (patch)
tree3f02a9e126efb2059ce5fae303c648ac4414744f
parent33d1f172c839bc14ba71a8e74f5ca6b01b7e069b (diff)
* 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43300 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog13
-rw-r--r--lib/rubygems/commands/install_command.rb2
-rw-r--r--lib/rubygems/ext.rb2
-rw-r--r--test/rubygems/test_gem_source_specific_file.rb2
4 files changed, 15 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index ab3e4ee..89fd9d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 a45d905..0bb40ed 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 1823df4..5af6bbf 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 8ccbe50..fd1f449 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