From cb8be30ef1fb54d31529ce9f22bfc1768d19ba92 Mon Sep 17 00:00:00 2001 From: drbrain Date: Sun, 22 Dec 2013 02:06:02 +0000 Subject: * lib/rubygems/commands/install_command.rb: Restore gem install --ignore-dependencies for remote gems * test/rubygems/test_gem_commands_install_command.rb: Test for the above. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44333 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rubygems/commands/install_command.rb | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/rubygems/commands/install_command.rb b/lib/rubygems/commands/install_command.rb index 56ff8fc564..4485eb12e8 100644 --- a/lib/rubygems/commands/install_command.rb +++ b/lib/rubygems/commands/install_command.rb @@ -69,7 +69,7 @@ class Gem::Commands::InstallCommand < Gem::Command o[:explain] = v end - @installed_specs = nil + @installed_specs = [] end def arguments # :nodoc: @@ -200,10 +200,8 @@ to write the specification by hand. For example: req = Gem::Requirement.create(version) - if options[:ignore_dependencies] - inst = Gem::Installer.new name, options - inst.install - @installed_specs.push(inst.spec) + if options[:ignore_dependencies] then + install_gem_without_dependencies name, req else inst = Gem::DependencyInstaller.new options @@ -227,6 +225,30 @@ to write the specification by hand. For example: end end + def install_gem_without_dependencies name, req # :nodoc: + gem = nil + + if remote? then + dependency = Gem::Dependency.new name, req + dependency.prerelease = options[:prerelease] + + fetcher = Gem::RemoteFetcher.fetcher + gem = fetcher.download_to_cache dependency + end + + if local? and not gem then + source = Gem::Source::Local.new + spec = source.find_gem name, req + + gem = source.download spec + end + + inst = Gem::Installer.new gem, options + inst.install + + @installed_specs.push(inst.spec) + end + def install_gems # :nodoc: exit_code = 0 -- cgit v1.2.3