rubygems-update 3.0.6 → 3.2.14

data/test/rubygems/test_gem_request_set_lockfile_parser.rb

@@ -66,7 +66,6 @@ class TestGemRequestSetLockfileParser < Gem::TestCase
     assert_equal File.expand_path("#{@gem_deps_file}.lock"), e.path
   end
 
-
   def test_parse
     write_lockfile <<-LOCKFILE.strip
 GEM
@@ -94,7 +93,7 @@ DEPENDENCIES
 
     assert lockfile_set, 'could not find a LockSet'
 
-    assert_equal %w[a-2], lockfile_set.specs.map { |tuple| tuple.full_name }
+    assert_equal %w[a-2], lockfile_set.specs.map {|tuple| tuple.full_name }
   end
 
   def test_parse_dependencies
@@ -124,7 +123,7 @@ DEPENDENCIES
 
     assert lockfile_set, 'could not find a LockSet'
 
-    assert_equal %w[a-2], lockfile_set.specs.map { |tuple| tuple.full_name }
+    assert_equal %w[a-2], lockfile_set.specs.map {|tuple| tuple.full_name }
   end
 
   def test_parse_DEPENDENCIES_git
@@ -218,7 +217,7 @@ DEPENDENCIES
 
     assert lockfile_set, 'found a LockSet'
 
-    assert_equal %w[a-2], lockfile_set.specs.map { |s| s.full_name }
+    assert_equal %w[a-2], lockfile_set.specs.map {|s| s.full_name }
   end
 
   def test_parse_GEM_remote_multiple
@@ -246,10 +245,10 @@ DEPENDENCIES
 
     assert lockfile_set, 'found a LockSet'
 
-    assert_equal %w[a-2], lockfile_set.specs.map { |s| s.full_name }
+    assert_equal %w[a-2], lockfile_set.specs.map {|s| s.full_name }
 
     assert_equal %w[https://gems.example/ https://other.example/],
-                 lockfile_set.specs.flat_map { |s| s.sources.map{ |src| src.uri.to_s } }
+                 lockfile_set.specs.flat_map {|s| s.sources.map{|src| src.uri.to_s } }
   end
 
   def test_parse_GIT
@@ -284,7 +283,7 @@ DEPENDENCIES
 
     assert git_set, 'could not find a GitSet'
 
-    assert_equal %w[a-2], git_set.specs.values.map { |s| s.full_name }
+    assert_equal %w[a-2], git_set.specs.values.map {|s| s.full_name }
 
     assert_equal [dep('b', '>= 3'), dep('c')],
                  git_set.specs.values.first.dependencies
@@ -438,7 +437,7 @@ DEPENDENCIES
 
     assert vendor_set, 'could not find a VendorSet'
 
-    assert_equal %w[a-1], vendor_set.specs.values.map { |s| s.full_name }
+    assert_equal %w[a-1], vendor_set.specs.values.map {|s| s.full_name }
 
     spec = vendor_set.load_spec 'a', nil, nil, nil
 
@@ -497,14 +496,14 @@ DEPENDENCIES
 
     assert lockfile_set, 'could not find a LockSet'
 
-    assert_equal %w[a-2 b-3], lockfile_set.specs.map { |tuple| tuple.full_name }
+    assert_equal %w[a-2 b-3], lockfile_set.specs.map {|tuple| tuple.full_name }
 
     expected = [
       Gem::Platform::RUBY,
       Gem::Platform.new('x86_64-linux'),
     ]
 
-    assert_equal expected, lockfile_set.specs.map { |tuple| tuple.platform }
+    assert_equal expected, lockfile_set.specs.map {|tuple| tuple.platform }
 
     spec = lockfile_set.specs.first
 

data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb

@@ -63,86 +63,86 @@ DEPENDENCIES
     LOCKFILE
 
     expected = [
-      [:section,     'GEM',                0,  0],
-      [:newline,     nil,                  3,  0],
-
-      [:entry,       'remote',             2,  1],
-      [:text,        @gem_repo,           10,  1],
-      [:newline,     nil,                 34,  1],
-
-      [:entry,       'specs',              2,  2],
-      [:newline,     nil,                  8,  2],
-
-      [:text,        'a',                  4,  3],
-      [:l_paren,     nil,                  6,  3],
-      [:text,        '2',                  7,  3],
-      [:r_paren,     nil,                  8,  3],
-      [:newline,     nil,                  9,  3],
-
-      [:text,        'b',                  6,  4],
-      [:l_paren,     nil,                  8,  4],
-      [:requirement, '=',                  9,  4],
-      [:text,        '2',                 11,  4],
-      [:r_paren,     nil,                 12,  4],
-      [:newline,     nil,                 13,  4],
-
-      [:text,        'c',                  6,  5],
-      [:l_paren,     nil,                  8,  5],
-      [:requirement, '!=',                 9,  5],
-      [:text,        '3',                 12,  5],
-      [:r_paren,     nil,                 13,  5],
-      [:newline,     nil,                 14,  5],
-
-      [:text,        'd',                  6,  6],
-      [:l_paren,     nil,                  8,  6],
-      [:requirement, '>',                  9,  6],
-      [:text,        '4',                 11,  6],
-      [:r_paren,     nil,                 12,  6],
-      [:newline,     nil,                 13,  6],
-
-      [:text,        'e',                  6,  7],
-      [:l_paren,     nil,                  8,  7],
-      [:requirement, '<',                  9,  7],
-      [:text,        '5',                 11,  7],
-      [:r_paren,     nil,                 12,  7],
-      [:newline,     nil,                 13,  7],
-
-      [:text,        'f',                  6,  8],
-      [:l_paren,     nil,                  8,  8],
-      [:requirement, '>=',                 9,  8],
-      [:text,        '6',                 12,  8],
-      [:r_paren,     nil,                 13,  8],
-      [:newline,     nil,                 14,  8],
-
-      [:text,        'g',                  6,  9],
-      [:l_paren,     nil,                  8,  9],
-      [:requirement, '<=',                 9,  9],
-      [:text,        '7',                 12,  9],
-      [:r_paren,     nil,                 13,  9],
-      [:newline,     nil,                 14,  9],
-
-      [:text,        'h',                  6, 10],
-      [:l_paren,     nil,                  8, 10],
-      [:requirement, '~>',                 9, 10],
+      [:section,     'GEM',               0,  0],
+      [:newline,     nil,                 3,  0],
+
+      [:entry,       'remote',            2,  1],
+      [:text,        @gem_repo,           10, 1],
+      [:newline,     nil,                 34, 1],
+
+      [:entry,       'specs',             2,  2],
+      [:newline,     nil,                 8,  2],
+
+      [:text,        'a',                 4,  3],
+      [:l_paren,     nil,                 6,  3],
+      [:text,        '2',                 7,  3],
+      [:r_paren,     nil,                 8,  3],
+      [:newline,     nil,                 9,  3],
+
+      [:text,        'b',                 6,  4],
+      [:l_paren,     nil,                 8,  4],
+      [:requirement, '=',                 9,  4],
+      [:text,        '2',                 11, 4],
+      [:r_paren,     nil,                 12, 4],
+      [:newline,     nil,                 13, 4],
+
+      [:text,        'c',                 6,  5],
+      [:l_paren,     nil,                 8,  5],
+      [:requirement, '!=',                9,  5],
+      [:text,        '3',                 12, 5],
+      [:r_paren,     nil,                 13, 5],
+      [:newline,     nil,                 14, 5],
+
+      [:text,        'd',                 6,  6],
+      [:l_paren,     nil,                 8,  6],
+      [:requirement, '>',                 9,  6],
+      [:text,        '4',                 11, 6],
+      [:r_paren,     nil,                 12, 6],
+      [:newline,     nil,                 13, 6],
+
+      [:text,        'e',                 6,  7],
+      [:l_paren,     nil,                 8,  7],
+      [:requirement, '<',                 9,  7],
+      [:text,        '5',                 11, 7],
+      [:r_paren,     nil,                 12, 7],
+      [:newline,     nil,                 13, 7],
+
+      [:text,        'f',                 6,  8],
+      [:l_paren,     nil,                 8,  8],
+      [:requirement, '>=',                9,  8],
+      [:text,        '6',                 12, 8],
+      [:r_paren,     nil,                 13, 8],
+      [:newline,     nil,                 14, 8],
+
+      [:text,        'g',                 6,  9],
+      [:l_paren,     nil,                 8,  9],
+      [:requirement, '<=',                9,  9],
+      [:text,        '7',                 12, 9],
+      [:r_paren,     nil,                 13, 9],
+      [:newline,     nil,                 14, 9],
+
+      [:text,        'h',                 6,  10],
+      [:l_paren,     nil,                 8,  10],
+      [:requirement, '~>',                9,  10],
       [:text,        '8',                 12, 10],
       [:r_paren,     nil,                 13, 10],
       [:newline,     nil,                 14, 10],
 
-      [:newline,     nil,                  0, 11],
+      [:newline,     nil,                 0,  11],
 
-      [:section,     'PLATFORMS',          0, 12],
-      [:newline,     nil,                  9, 12],
+      [:section,     'PLATFORMS',         0,  12],
+      [:newline,     nil,                 9,  12],
 
-      [:text,        Gem::Platform::RUBY,  2, 13],
-      [:newline,     nil,                  6, 13],
+      [:text,        Gem::Platform::RUBY, 2,  13],
+      [:newline,     nil,                 6,  13],
 
-      [:newline,     nil,                  0, 14],
+      [:newline,     nil,                 0,  14],
 
-      [:section,     'DEPENDENCIES',       0, 15],
+      [:section,     'DEPENDENCIES',      0,  15],
       [:newline,     nil,                 12, 15],
 
-      [:text,        'a',                  2, 16],
-      [:newline,     nil,                  3, 16],
+      [:text,        'a',                 2,  16],
+      [:newline,     nil,                 3,  16],
     ]
 
     assert_equal expected, tokenize_lockfile
@@ -163,28 +163,28 @@ DEPENDENCIES
     LOCKFILE
 
     expected = [
-      [:section, 'GEM',                0, 0],
-      [:newline, nil,                  3, 0],
-      [:entry,   'remote',             2, 1],
+      [:section, 'GEM',               0,  0],
+      [:newline, nil,                 3,  0],
+      [:entry,   'remote',            2,  1],
       [:text,    @gem_repo,           10, 1],
       [:newline, nil,                 34, 1],
-      [:entry,   'specs',              2, 2],
-      [:newline, nil,                  8, 2],
-      [:text,    'Ab',                 4, 3],
-      [:l_paren, nil,                  7, 3],
-      [:text,    '2',                  8, 3],
-      [:r_paren, nil,                  9, 3],
+      [:entry,   'specs',             2,  2],
+      [:newline, nil,                 8,  2],
+      [:text,    'Ab',                4,  3],
+      [:l_paren, nil,                 7,  3],
+      [:text,    '2',                 8,  3],
+      [:r_paren, nil,                 9,  3],
       [:newline, nil,                 10, 3],
-      [:newline, nil,                  0, 4],
-      [:section, 'PLATFORMS',          0, 5],
-      [:newline, nil,                  9, 5],
-      [:text,    Gem::Platform::RUBY,  2, 6],
-      [:newline, nil,                  6, 6],
-      [:newline, nil,                  0, 7],
-      [:section, 'DEPENDENCIES',       0, 8],
+      [:newline, nil,                 0,  4],
+      [:section, 'PLATFORMS',         0,  5],
+      [:newline, nil,                 9,  5],
+      [:text,    Gem::Platform::RUBY, 2,  6],
+      [:newline, nil,                 6,  6],
+      [:newline, nil,                 0,  7],
+      [:section, 'DEPENDENCIES',      0,  8],
       [:newline, nil,                 12, 8],
-      [:text,    'Ab',                 2, 9],
-      [:newline, nil,                  4, 9],
+      [:text,    'Ab',                2,  9],
+      [:newline, nil,                 4,  9],
     ]
 
     assert_equal expected, tokenize_lockfile
@@ -235,12 +235,12 @@ DEPENDENCIES
     LOCKFILE
 
     expected = [
-      [:section, 'DEPENDENCIES',  0,  0],
-      [:newline, nil,            12,  0],
+      [:section, 'DEPENDENCIES', 0,  0],
+      [:newline, nil,            12, 0],
 
-      [:text,    'a',             2,  1],
-      [:bang,    nil,             3,  1],
-      [:newline, nil,             4,  1],
+      [:text,    'a',            2,  1],
+      [:bang,    nil,            3,  1],
+      [:newline, nil,            4,  1],
     ]
 
     assert_equal expected, tokenize_lockfile
@@ -256,31 +256,31 @@ GEM
     LOCKFILE
 
     expected = [
-      [:section,     'GEM',      0,  0],
-      [:newline,     nil,        3,  0],
-
-      [:entry,       'remote',   2,  1],
-      [:text,        @gem_repo, 10,  1],
-      [:newline,     nil,       34,  1],
-
-      [:entry,       'specs',    2,  2],
-      [:newline,     nil,        8,  2],
-
-      [:text,        'a',        4,  3],
-      [:l_paren,     nil,        6,  3],
-      [:text,        '2',        7,  3],
-      [:r_paren,     nil,        8,  3],
-      [:newline,     nil,        9,  3],
-
-      [:text,        'b',        6,  4],
-      [:l_paren,     nil,        8,  4],
-      [:requirement, '~>',       9,  4],
-      [:text,        '3.0',     12,  4],
-      [:comma,       nil,       15,  4],
-      [:requirement, '>=',      17,  4],
-      [:text,        '3.0.1',   20,  4],
-      [:r_paren,     nil,       25,  4],
-      [:newline,     nil,       26,  4],
+      [:section,     'GEM',     0,  0],
+      [:newline,     nil,       3,  0],
+
+      [:entry,       'remote',  2,  1],
+      [:text,        @gem_repo, 10, 1],
+      [:newline,     nil,       34, 1],
+
+      [:entry,       'specs',   2,  2],
+      [:newline,     nil,       8,  2],
+
+      [:text,        'a',       4,  3],
+      [:l_paren,     nil,       6,  3],
+      [:text,        '2',       7,  3],
+      [:r_paren,     nil,       8,  3],
+      [:newline,     nil,       9,  3],
+
+      [:text,        'b',       6,  4],
+      [:l_paren,     nil,       8,  4],
+      [:requirement, '~>',      9,  4],
+      [:text,        '3.0',     12, 4],
+      [:comma,       nil,       15, 4],
+      [:requirement, '>=',      17, 4],
+      [:text,        '3.0.1',   20, 4],
+      [:r_paren,     nil,       25, 4],
+      [:newline,     nil,       26, 4],
     ]
 
     assert_equal expected, tokenize_lockfile

data/test/rubygems/test_gem_requirement.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require "rubygems/requirement"
 
 class TestGemRequirement < Gem::TestCase
-
   def test_concat
     r = req '>= 1'
 
@@ -23,6 +22,8 @@ class TestGemRequirement < Gem::TestCase
     refute_requirement_equal "~> 1.3", "~> 1.3.0"
     refute_requirement_equal "~> 1.3.0", "~> 1.3"
 
+    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"]
 
@@ -35,7 +36,6 @@ class TestGemRequirement < Gem::TestCase
     assert_requirement_equal "= 2", ["2"]
     assert_requirement_equal "= 2", v(2)
     assert_requirement_equal "2.0", "2"
-    assert_requirement_equal ["= 2", ">= 2"], [">= 2", "= 2"]
   end
 
   def test_create
@@ -83,6 +83,12 @@ class TestGemRequirement < Gem::TestCase
       Gem::Requirement.parse(Gem::Version.new('2'))
   end
 
+  if RUBY_VERSION >= '2.5' && !(Gem.java_platform? && ENV["JRUBY_OPTS"] =~ /--debug/)
+    def test_parse_deduplication
+      assert_same '~>', Gem::Requirement.parse('~> 1').first
+    end
+  end
+
   def test_parse_bad
     [
       nil,
@@ -266,6 +272,12 @@ class TestGemRequirement < Gem::TestCase
     assert_satisfied_by "3.0.rc2",     "< 3.0.1"
 
     assert_satisfied_by "3.0.rc2",     "> 0"
+
+    assert_satisfied_by "5.0.0.rc2",   "~> 5.a"
+    refute_satisfied_by "5.0.0.rc2",   "~> 5.x"
+
+    assert_satisfied_by "5.0.0",       "~> 5.a"
+    assert_satisfied_by "5.0.0",       "~> 5.x"
   end
 
   def test_illformed_requirements
@@ -385,11 +397,32 @@ class TestGemRequirement < Gem::TestCase
     r2 = req('2.0', '1.0')
     assert_equal r1.hash, r2.hash
 
-    r1 = req('1.0', '2.0').tap { |r| r.concat(['3.0']) }
-    r2 = req('3.0', '1.0').tap { |r| r.concat(['2.0']) }
+    r1 = req('1.0', '2.0').tap {|r| r.concat(['3.0']) }
+    r2 = req('3.0', '1.0').tap {|r| r.concat(['2.0']) }
     assert_equal r1.hash, r2.hash
   end
 
+  def test_hash_returns_equal_hashes_for_equivalent_requirements
+    refute_requirement_hash_equal "= 1.2", "= 1.3"
+    refute_requirement_hash_equal "= 1.3", "= 1.2"
+
+    refute_requirement_hash_equal "~> 1.3", "~> 1.3.0"
+    refute_requirement_hash_equal "~> 1.3.0", "~> 1.3"
+
+    assert_requirement_hash_equal ["> 2", "~> 1.3", "~> 1.3.1"], ["~> 1.3.1", "~> 1.3", "> 2"]
+
+    assert_requirement_hash_equal ["> 2", "~> 1.3"], ["> 2.0", "~> 1.3"]
+    assert_requirement_hash_equal ["> 2.0", "~> 1.3"], ["> 2", "~> 1.3"]
+
+    assert_requirement_hash_equal "= 1.0", "= 1.0.0"
+    assert_requirement_hash_equal "= 1.1", "= 1.1.0"
+    assert_requirement_hash_equal "= 1", "= 1.0.0"
+
+    assert_requirement_hash_equal "1.0", "1.0.0"
+    assert_requirement_hash_equal "1.1", "1.1.0"
+    assert_requirement_hash_equal "1", "1.0.0"
+  end
+
   # Assert that two requirements are equal. Handles Gem::Requirements,
   # strings, arrays, numbers, and versions.
 
@@ -404,6 +437,13 @@ class TestGemRequirement < Gem::TestCase
       "#{requirement} is satisfied by #{version}"
   end
 
+  # Assert that two requirement hashes are equal. Handles Gem::Requirements,
+  # strings, arrays, numbers, and versions.
+
+  def assert_requirement_hash_equal(expected, actual)
+    assert_equal req(expected).hash, req(actual).hash
+  end
+
   # Refute the assumption that two requirements are equal.
 
   def refute_requirement_equal(unexpected, actual)
@@ -416,4 +456,10 @@ class TestGemRequirement < Gem::TestCase
     refute req(requirement).satisfied_by?(v(version)),
       "#{requirement} is not satisfied by #{version}"
   end
+
+  # Refute the assumption that two requirements hashes are equal.
+
+  def refute_requirement_hash_equal(unexpected, actual)
+    refute_equal req(unexpected).hash, req(actual).hash
+  end
 end