diff options
author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-09-18 08:37:18 +0000 |
---|---|---|
committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-09-18 08:37:18 +0000 |
commit | ec6c07570237b209d47b7690a5b5a6774301242b (patch) | |
tree | 70902f2e19499bb3bd26f014aa12bb43b96e9b22 /lib/rubygems/resolver | |
parent | 3367daf716bda6e73f3418dd601bd1713d557c07 (diff) |
Merge upstream revision of rubygems/rubygems.
This commits includes tiny bugfix and new features listed here:
* Add --re-sign flag to cert command by bronzdoc: https://github.com/rubygems/rubygems/pull/2391
* Download gems with threads. by indirect: https://github.com/rubygems/rubygems/pull/1898
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64769 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/resolver')
-rw-r--r-- | lib/rubygems/resolver/specification.rb | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/rubygems/resolver/specification.rb b/lib/rubygems/resolver/specification.rb index 44989d39ae..530ea9994d 100644 --- a/lib/rubygems/resolver/specification.rb +++ b/lib/rubygems/resolver/specification.rb @@ -84,11 +84,7 @@ class Gem::Resolver::Specification def install options = {} require 'rubygems/installer' - destination = options[:install_dir] || Gem.dir - - Gem.ensure_gem_subdirectories destination - - gem = source.download spec, destination + gem = download options installer = Gem::Installer.at gem, options @@ -97,6 +93,14 @@ class Gem::Resolver::Specification @spec = installer.install end + def download options + dir = options[:install_dir] || Gem.dir + + Gem.ensure_gem_subdirectories dir + + source.download spec, dir + end + ## # Returns true if this specification is installable on this platform. |