mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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
This commit is contained in:
parent
87923e02ba
commit
cb8be30ef1
3 changed files with 60 additions and 5 deletions
|
@ -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
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue