diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-08 06:01:49 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-08 06:01:49 +0000 |
| commit | 75894547f50888b86f15c118b6e047d8b9a94a74 (patch) | |
| tree | 09640cd4d0e802d5071f2ed71934c230405d5bf8 /lib/rubygems/dependency_installer.rb | |
| parent | ee68f78c2462908882e3394f8a91631ec4a45beb (diff) | |
* lib/rubygems/commands/cleanup_command.rb: Skip default gems when
cleaning up.
* test/rubygems/test_gem_commands_cleanup_command.rb: Test for above.
* lib/rubygems/commands/query_command.rb: Fixed listing remote gems.
* lib/rubygems/dependency_installer.rb: Ignore non-files when looking
for local gems.
* test/rubygems/test_gem_dependency_installer.rb: Test for above.
* lib/rubygems/uninstaller.rb: The user must confirm uninstalling gems
that have dependencies.
* test/rubygems/test_gem_uninstaller.rb: Test for above.
* lib/rubygems.rb (module Gem): Updated version.
* test/rubygems/*.pem: Updated to run in FIPS mode.
* test/rubygems/test_gem_security.rb: ditto.
* test/rubygems/test_gem_security_signer.rb: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38272 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/dependency_installer.rb')
| -rw-r--r-- | lib/rubygems/dependency_installer.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/rubygems/dependency_installer.rb b/lib/rubygems/dependency_installer.rb index a2665633fc..ed90af042c 100644 --- a/lib/rubygems/dependency_installer.rb +++ b/lib/rubygems/dependency_installer.rb @@ -33,6 +33,7 @@ class Gem::DependencyInstaller :prerelease => false, :security_policy => nil, # HACK NoSecurity requires OpenSSL. AlmostNo? Low? :wrappers => true, + :build_args => nil, :build_docs_in_background => false, }.freeze @@ -53,6 +54,7 @@ class Gem::DependencyInstaller # :security_policy:: See Gem::Installer::new and Gem::Security. # :user_install:: See Gem::Installer.new # :wrappers:: See Gem::Installer::new + # :build_args:: See Gem::Installer::new def initialize(options = {}) if options[:install_dir] then @@ -79,6 +81,7 @@ class Gem::DependencyInstaller @security_policy = options[:security_policy] @user_install = options[:user_install] @wrappers = options[:wrappers] + @build_args = options[:build_args] @build_docs_in_background = options[:build_docs_in_background] # Indicates that we should not try to update any deps unless @@ -257,7 +260,7 @@ class Gem::DependencyInstaller set = Gem::AvailableSet.new if consider_local? - if File.exists? gem_name + if File.file? gem_name then src = Gem::Source::SpecificFile.new(gem_name) set.add src.spec, src else @@ -353,7 +356,8 @@ class Gem::DependencyInstaller :install_dir => @install_dir, :security_policy => @security_policy, :user_install => @user_install, - :wrappers => @wrappers + :wrappers => @wrappers, + :build_args => @build_args spec = inst.install |