summaryrefslogtreecommitdiff
path: root/lib/rubygems/requirement.rb
diff options
context:
space:
mode:
authorHiroshi SHIBATA <hsbt@ruby-lang.org>2020-10-15 13:25:27 +0900
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2020-10-15 14:12:02 +0900
commitab6c4f8be3dd0fb116ba2722a2fcdc53ad4ea0b7 (patch)
tree05165659632b47771323a56f7f10d1f04d56f189 /lib/rubygems/requirement.rb
parentf0c7a05b4c7657f1cff1698e5560f49248a08bfd (diff)
Merge rubygems-3.2.0.rc.2
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/3660
Diffstat (limited to 'lib/rubygems/requirement.rb')
-rw-r--r--lib/rubygems/requirement.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/rubygems/requirement.rb b/lib/rubygems/requirement.rb
index d9d7c2fbad..a2a5c7bca1 100644
--- a/lib/rubygems/requirement.rb
+++ b/lib/rubygems/requirement.rb
@@ -270,7 +270,7 @@ class Gem::Requirement
return unless Gem::Requirement === other
# An == check is always necessary
- return false unless requirements == other.requirements
+ return false unless _sorted_requirements == other._sorted_requirements
# An == check is sufficient unless any requirements use ~>
return true unless _tilde_requirements.any?
@@ -282,8 +282,12 @@ class Gem::Requirement
protected
+ def _sorted_requirements
+ @_sorted_requirements ||= requirements.sort_by(&:to_s)
+ end
+
def _tilde_requirements
- requirements.select {|r| r.first == "~>" }
+ @_tilde_requirements ||= _sorted_requirements.select {|r| r.first == "~>" }
end
private