summaryrefslogtreecommitdiff
path: root/lib/rubygems/resolver/activation_request.rb
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-24 15:28:23 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-24 15:28:23 +0000
commit996b1bfa95347e5171c3f7ab32b6740656ed7a8b (patch)
treebe0310be446bf313f16a12a3a3b56c30b4900cbd /lib/rubygems/resolver/activation_request.rb
parentce8729feb61d507805d965c5479f343e3701c659 (diff)
merge revision(s) 53707,53708,53709,53712,53777,53781: [Backport #12326]
* 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 * lib/rubygems/specification.rb: `coding` is affect only first line except shebang. * lib/rubygems/package.rb, lib/rubygems/package/*: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@56003 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/resolver/activation_request.rb')
-rw-r--r--lib/rubygems/resolver/activation_request.rb24
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
##