Sort requirements only for comparison, preserve the original order ot…

…herwise
rubygems · Sep 2, 2020 · e241b74 · e241b74
1 parent 9418218
commit e241b74
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/lib/rubygems/requirement.rb b/lib/rubygems/requirement.rb
@@ -131,7 +131,6 @@ def initialize(*requirements)
     requirements = requirements.flatten
     requirements.compact!
     requirements.uniq!
-    requirements.sort_by!(&:to_s)
 
     if requirements.empty?
       @requirements = [DefaultRequirement]
@@ -271,7 +270,7 @@ def ==(other) # :nodoc:
     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?
@@ -283,8 +282,12 @@ def ==(other) # :nodoc:
 
   protected
 
+  def _sorted_requirements
+    requirements.sort_by(&:to_s)
+  end
+
   def _tilde_requirements
-    requirements.select {|r| r.first == "~>" }
+    _sorted_requirements.select {|r| r.first == "~>" }
   end
 
   private

diff --git a/test/rubygems/test_gem_requirement.rb b/test/rubygems/test_gem_requirement.rb
@@ -22,7 +22,7 @@ def test_equals2
     refute_requirement_equal "~> 1.3", "~> 1.3.0"
     refute_requirement_equal "~> 1.3.0", "~> 1.3"
 
-    assert_requirement_equal ["> 2", "~> 1.3"], ["~> 1.3", "> 2"]
+    assert_requirement_equal ["> 2", "~> 1.3", "~> 1.3.1"], ["~> 1.3.1", "~> 1.3", "> 2"]
 
     assert_requirement_equal ["> 2", "~> 1.3"], ["> 2.0", "~> 1.3"]
     assert_requirement_equal ["> 2.0", "~> 1.3"], ["> 2", "~> 1.3"]

diff --git a/test/rubygems/test_gem_specification.rb b/test/rubygems/test_gem_specification.rb
@@ -2557,11 +2557,11 @@ def test_to_ruby_fancy
   if s.respond_to? :add_runtime_dependency then
     s.add_runtime_dependency(%q<rake>.freeze, [\"> 0.4\"])
     s.add_runtime_dependency(%q<jabber4r>.freeze, [\"> 0.0.0\"])
-    s.add_runtime_dependency(%q<pqa>.freeze, [\"<= 0.6\", \"> 0.4\"])
+    s.add_runtime_dependency(%q<pqa>.freeze, [\"> 0.4\", \"<= 0.6\"])
   else
     s.add_dependency(%q<rake>.freeze, [\"> 0.4\"])
     s.add_dependency(%q<jabber4r>.freeze, [\"> 0.0.0\"])
-    s.add_dependency(%q<pqa>.freeze, [\"<= 0.6\", \"> 0.4\"])
+    s.add_dependency(%q<pqa>.freeze, [\"> 0.4\", \"<= 0.6\"])
   end
 end
     SPEC
@@ -2578,7 +2578,7 @@ def test_to_ruby_keeps_requirements_as_originally_specified
       s.add_dependency 'b', ['~> 1.0', '>= 1.0.0']
     end
 
-    assert_includes spec.to_ruby, '">= 1.0.0", "~> 1.0"'
+    assert_includes spec.to_ruby, '"~> 1.0", ">= 1.0.0"'
   end
 
   def test_to_ruby_legacy