From f8bcd57cb7223c59901cb9c73a4be976f3a583e8 Mon Sep 17 00:00:00 2001
From: drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 19 Dec 2013 03:05:37 +0000
Subject: * lib/rubygems:  Update to RubyGems master af60443.  Changes include:

  * Improved speed of `gem install --ignore-dependencies`.

  * Open read-write for exclusive flock.  [ruby-trunk - Bug #9257]

  * Remove specification before install to prevent infinite loop.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44286 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rubygems/commands/install_command.rb | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

(limited to 'lib/rubygems/commands')

diff --git a/lib/rubygems/commands/install_command.rb b/lib/rubygems/commands/install_command.rb
index d2dd7ac920..56ff8fc564 100644
--- a/lib/rubygems/commands/install_command.rb
+++ b/lib/rubygems/commands/install_command.rb
@@ -200,25 +200,31 @@ to write the specification by hand.  For example:
 
     req = Gem::Requirement.create(version)
 
-    inst = Gem::DependencyInstaller.new options
+    if options[:ignore_dependencies]
+      inst = Gem::Installer.new name, options
+      inst.install
+      @installed_specs.push(inst.spec)
+    else
+      inst = Gem::DependencyInstaller.new options
 
-    if options[:explain]
-      request_set = inst.resolve_dependencies name, req
+      if options[:explain]
+        request_set = inst.resolve_dependencies name, req
 
-      puts "Gems to install:"
+        puts "Gems to install:"
 
-      request_set.specs.map { |s| s.full_name }.sort.each do |s|
-        puts "  #{s}"
-      end
+        request_set.specs.map { |s| s.full_name }.sort.each do |s|
+          puts "  #{s}"
+        end
 
-      return
-    else
-      inst.install name, req
-    end
+        return
+      else
+        inst.install name, req
+      end
 
-    @installed_specs.push(*inst.installed_gems)
+      @installed_specs.push(*inst.installed_gems)
 
-    show_install_errors inst.errors
+      show_install_errors inst.errors
+    end
   end
 
   def install_gems # :nodoc:
-- 
cgit v1.2.3