aboutsummaryrefslogtreecommitdiffstats
path: root/lib/rubygems/resolver
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-12-08 19:32:07 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-12-08 19:32:07 +0000
commitda3e610adf617503b20b34def31e89b3cc709dcd (patch)
treedf1b4202e88936f7132fc077d66847cbd66e41d1 /lib/rubygems/resolver
parentfe57c5d49e138601cc415a541b49afa90d2f77d4 (diff)
downloadruby-da3e610adf617503b20b34def31e89b3cc709dcd.tar.gz
* lib/rubygems: Update to RubyGems master 096db36. Changes include
support for PATH in Gemfile.lock and a typo fix from Akira Matsuda. * test/rubygems: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44081 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/resolver')
-rw-r--r--lib/rubygems/resolver/vendor_set.rb18
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/rubygems/resolver/vendor_set.rb b/lib/rubygems/resolver/vendor_set.rb
index 339492f690..3db637f4a3 100644
--- a/lib/rubygems/resolver/vendor_set.rb
+++ b/lib/rubygems/resolver/vendor_set.rb
@@ -15,6 +15,11 @@
class Gem::Resolver::VendorSet < Gem::Resolver::Set
+ ##
+ # The specifications for this set.
+
+ attr_reader :specs # :nodoc:
+
def initialize # :nodoc:
@directories = {}
@specs = {}
@@ -34,9 +39,7 @@ class Gem::Resolver::VendorSet < Gem::Resolver::Set
spec.full_gem_path = File.expand_path directory
- key = "#{spec.name}-#{spec.version}-#{spec.platform}"
-
- @specs[key] = spec
+ @specs[spec.name] = spec
@directories[spec] = directory
end
@@ -54,14 +57,11 @@ class Gem::Resolver::VendorSet < Gem::Resolver::Set
end
##
- # Loads a spec with the given +name+, +version+ and +platform+. Since the
- # +source+ is defined when the specification was added to index it is not
- # used.
+ # Loads a spec with the given +name+. +version+, +platform+ and +source+ are
+ # ignored.
def load_spec name, version, platform, source # :nodoc:
- key = "#{name}-#{version}-#{platform}"
-
- @specs.fetch key
+ @specs.fetch name
end
def pretty_print q # :nodoc: