summaryrefslogtreecommitdiff
path: root/lib/rubygems/dependency.rb
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-06 06:01:14 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-06 06:01:14 +0000
commit469bac0f9233d8ad2b53bea2f382578634fabf65 (patch)
treeecb999b03efbe4272614f2ffb4069a3f2b8bbabe /lib/rubygems/dependency.rb
parentea736d55f9596e79184b9b4ade439c71530e86d8 (diff)
* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems-2.6.3.
Please see entries of 2.6.3 on https://github.com/rubygems/rubygems/blob/master/History.txt git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/dependency.rb')
-rw-r--r--lib/rubygems/dependency.rb16
1 files changed, 3 insertions, 13 deletions
diff --git a/lib/rubygems/dependency.rb b/lib/rubygems/dependency.rb
index b7aea4692b..ecfd0b7909 100644
--- a/lib/rubygems/dependency.rb
+++ b/lib/rubygems/dependency.rb
@@ -286,9 +286,7 @@ class Gem::Dependency
}
end
- # `stubs_for` returns oldest first, but `matching_specs` is supposed to
- # return newest first, so just reverse the list
- matches.reverse
+ matches
end
##
@@ -307,18 +305,10 @@ class Gem::Dependency
specs = Gem::Specification.stubs_for name
if specs.empty?
- total = Gem::Specification.stubs.size
- msg = "Could not find '#{name}' (#{requirement}) among #{total} total gem(s)\n".dup
+ raise Gem::MissingSpecError.new name, requirement
else
- specs = specs.map(&:full_name)
- msg = "Could not find '#{name}' (#{requirement}) - did find: [#{specs.join ','}]\n".dup
+ raise Gem::MissingSpecVersionError.new name, requirement, specs
end
- msg << "Checked in 'GEM_PATH=#{Gem.path.join(File::PATH_SEPARATOR)}', execute `gem env` for more information"
-
- error = Gem::LoadError.new(msg)
- error.name = self.name
- error.requirement = self.requirement
- raise error
end
# TODO: any other resolver validations should go here