diff options
author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-02-01 12:43:26 +0000 |
---|---|---|
committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-02-01 12:43:26 +0000 |
commit | a21d403f21473b21b5766c2483b4325240e9edda (patch) | |
tree | bd10197f9589251f35f0f9dc6fa387f0e298a6ef /lib/rubygems/resolver/activation_request.rb | |
parent | 94cfa2893ccab71341d4671201253339d56d6c97 (diff) | |
download | ruby-a21d403f21473b21b5766c2483b4325240e9edda.tar.gz |
* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems-2.5.2.
It supports to enable frozen string literal and add `--norc` option for
disable to `.gemrc` configuration.
See 2.5.2 release notes for other fixes and enhancements.
https://github.com/rubygems/rubygems/blob/a8aa3bac723f045c52471c7b9328310a048561e0/History.txt#L3
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53707 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/resolver/activation_request.rb')
-rw-r--r-- | lib/rubygems/resolver/activation_request.rb | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/lib/rubygems/resolver/activation_request.rb b/lib/rubygems/resolver/activation_request.rb index 2dd540cda0..135d75d6bc 100644 --- a/lib/rubygems/resolver/activation_request.rb +++ b/lib/rubygems/resolver/activation_request.rb @@ -1,4 +1,4 @@ -# frozen_string_literal: false +# frozen_string_literal: true ## # Specifies a Specification object that should be activated. Also contains a # dependency that was used to introduce this activation. @@ -50,15 +50,27 @@ class Gem::Resolver::ActivationRequest # Downloads a gem at +path+ and returns the file path. def download path - if @spec.respond_to? :source + Gem.ensure_gem_subdirectories path + + if @spec.respond_to? :sources + exception = nil + path = @spec.sources.find{ |source| + begin + source.download full_spec, path + rescue exception + end + } + return path if path + raise exception if exception + + elsif @spec.respond_to? :source source = @spec.source + source.download full_spec, path + else source = Gem.sources.first + source.download full_spec, path end - - Gem.ensure_gem_subdirectories path - - source.download full_spec, path end ## |