* 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

1 files changed, 18 insertions, 10 deletions

diff --git a/lib/rubygems/request_set/lockfile/parser.rb b/lib/rubygems/request_set/lockfile/parser.rb
index 18aaadf3bb..ebea940188 100644
--- a/lib/rubygems/request_set/lockfile/parser.rb
+++ b/lib/rubygems/request_set/lockfile/parser.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 class Gem::RequestSet::Lockfile::Parser
   ###
   # Parses lockfiles
@@ -325,15 +325,24 @@ class Gem::RequestSet::Lockfile::Parser
     @tokens.peek
   end
 
-  def pinned_requirement name # :nodoc:
-    spec = @set.sets.select { |set|
-      Gem::Resolver::GitSet    === set or
-        Gem::Resolver::VendorSet === set
-    }.map { |set|
-      set.specs[name]
-    }.compact.first
+  if [].respond_to? :flat_map
+    def pinned_requirement name # :nodoc:
+      requirement = Gem::Dependency.new name
+      specification = @set.sets.flat_map { |set|
+        set.find_all(requirement)
+      }.compact.first
 
-    spec.version
+      specification && specification.version
+    end
+  else # FIXME: remove when 1.8 is dropped
+    def pinned_requirement name # :nodoc:
+      requirement = Gem::Dependency.new name
+      specification = @set.sets.map { |set|
+        set.find_all(requirement)
+      }.flatten(1).compact.first
+
+      specification && specification.version
+    end
   end
 
   ##
@@ -343,4 +352,3 @@ class Gem::RequestSet::Lockfile::Parser
     @tokens.unshift token
   end
 end
-