rubygems-update 3.3.18 → 3.4.19

data/test/rubygems/test_gem_request_set_lockfile_parser.rb

@@ -1,14 +1,15 @@
 # frozen_string_literal: true
-require_relative 'helper'
-require 'rubygems/request_set'
-require 'rubygems/request_set/lockfile'
-require 'rubygems/request_set/lockfile/tokenizer'
-require 'rubygems/request_set/lockfile/parser'
+
+require_relative "helper"
+require "rubygems/request_set"
+require "rubygems/request_set/lockfile"
+require "rubygems/request_set/lockfile/tokenizer"
+require "rubygems/request_set/lockfile/parser"
 
 class TestGemRequestSetLockfileParser < Gem::TestCase
   def setup
     super
-    @gem_deps_file = 'gem.deps.rb'
+    @gem_deps_file = "gem.deps.rb"
     @lock_file = File.expand_path "#{@gem_deps_file}.lock"
     @set = Gem::RequestSet.new
   end
@@ -53,7 +54,7 @@ class TestGemRequestSetLockfileParser < Gem::TestCase
     parser = tokenizer.make_parser nil, nil
 
     e = assert_raise Gem::RequestSet::Lockfile::ParseError do
-      parser.get :text, 'y'
+      parser.get :text, "y"
     end
 
     expected =
@@ -83,7 +84,7 @@ DEPENDENCIES
     platforms = []
     parse_lockfile @set, platforms
 
-    assert_equal [dep('a')], @set.dependencies
+    assert_equal [dep("a")], @set.dependencies
 
     assert_equal [Gem::Platform::RUBY], platforms
 
@@ -91,7 +92,7 @@ DEPENDENCIES
       Gem::Resolver::LockSet === set
     end
 
-    assert lockfile_set, 'could not find a LockSet'
+    assert lockfile_set, "could not find a LockSet"
 
     assert_equal %w[a-2], lockfile_set.specs.map {|tuple| tuple.full_name }
   end
@@ -113,7 +114,7 @@ DEPENDENCIES
     platforms = []
     parse_lockfile @set, platforms
 
-    assert_equal [dep('a', '>= 1', '<= 2')], @set.dependencies
+    assert_equal [dep("a", ">= 1", "<= 2")], @set.dependencies
 
     assert_equal [Gem::Platform::RUBY], platforms
 
@@ -121,7 +122,7 @@ DEPENDENCIES
       Gem::Resolver::LockSet === set
     end
 
-    assert lockfile_set, 'could not find a LockSet'
+    assert lockfile_set, "could not find a LockSet"
 
     assert_equal %w[a-2], lockfile_set.specs.map {|tuple| tuple.full_name }
   end
@@ -159,8 +160,8 @@ DEPENDENCIES
     parse_lockfile @set, []
 
     expected = [
-      dep('i18n-active_record', '= 0.0.2'),
-      dep('rails-footnotes',    '= 3.7.9'),
+      dep("i18n-active_record", "= 0.0.2"),
+      dep("rails-footnotes",    "= 3.7.9"),
     ]
 
     assert_equal expected, @set.dependencies
@@ -188,7 +189,7 @@ DEPENDENCIES
     parse_lockfile @set, []
 
     expected = [
-      dep('jwt', '= 1.1'),
+      dep("jwt", "= 1.1"),
     ]
 
     assert_equal expected, @set.dependencies
@@ -209,13 +210,13 @@ DEPENDENCIES
 
     parse_lockfile @set, []
 
-    assert_equal [dep('a', '>= 0')], @set.dependencies
+    assert_equal [dep("a", ">= 0")], @set.dependencies
 
     lockfile_set = @set.sets.find do |set|
       Gem::Resolver::LockSet === set
     end
 
-    assert lockfile_set, 'found a LockSet'
+    assert lockfile_set, "found a LockSet"
 
     assert_equal %w[a-2], lockfile_set.specs.map {|s| s.full_name }
   end
@@ -237,13 +238,13 @@ DEPENDENCIES
 
     parse_lockfile @set, []
 
-    assert_equal [dep('a', '>= 0')], @set.dependencies
+    assert_equal [dep("a", ">= 0")], @set.dependencies
 
     lockfile_set = @set.sets.find do |set|
       Gem::Resolver::LockSet === set
     end
 
-    assert lockfile_set, 'found a LockSet'
+    assert lockfile_set, "found a LockSet"
 
     assert_equal %w[a-2], lockfile_set.specs.map {|s| s.full_name }
 
@@ -252,12 +253,12 @@ DEPENDENCIES
   end
 
   def test_parse_GIT
-    @set.instance_variable_set :@install_dir, 'install_dir'
+    @set.instance_variable_set :@install_dir, "install_dir"
 
     write_lockfile <<-LOCKFILE
 GIT
   remote: git://example/a.git
-  revision: master
+  revision: abranch
   specs:
     a (2)
       b (>= 3)
@@ -269,31 +270,31 @@ DEPENDENCIES
 
     parse_lockfile @set, []
 
-    assert_equal [dep('a', '= 2')], @set.dependencies
+    assert_equal [dep("a", "= 2")], @set.dependencies
 
     lockfile_set = @set.sets.find do |set|
       Gem::Resolver::LockSet === set
     end
 
-    refute lockfile_set, 'fount a LockSet'
+    refute lockfile_set, "found a LockSet"
 
     git_set = @set.sets.find do |set|
       Gem::Resolver::GitSet === set
     end
 
-    assert git_set, 'could not find a GitSet'
+    assert git_set, "could not find a GitSet"
 
     assert_equal %w[a-2], git_set.specs.values.map {|s| s.full_name }
 
-    assert_equal [dep('b', '>= 3'), dep('c')],
+    assert_equal [dep("b", ">= 3"), dep("c")],
                  git_set.specs.values.first.dependencies
 
     expected = {
-      'a' => %w[git://example/a.git master],
+      "a" => %w[git://example/a.git abranch],
     }
 
     assert_equal expected, git_set.repositories
-    assert_equal 'install_dir', git_set.root_dir
+    assert_equal "install_dir", git_set.root_dir
   end
 
   def test_parse_GIT_branch
@@ -312,22 +313,22 @@ DEPENDENCIES
 
     parse_lockfile @set, []
 
-    assert_equal [dep('a', '= 2')], @set.dependencies
+    assert_equal [dep("a", "= 2")], @set.dependencies
 
     lockfile_set = @set.sets.find do |set|
       Gem::Resolver::LockSet === set
     end
 
-    refute lockfile_set, 'fount a LockSet'
+    refute lockfile_set, "found a LockSet"
 
     git_set = @set.sets.find do |set|
       Gem::Resolver::GitSet === set
     end
 
-    assert git_set, 'could not find a GitSet'
+    assert git_set, "could not find a GitSet"
 
     expected = {
-      'a' => %w[git://example/a.git 1234abc],
+      "a" => %w[git://example/a.git 1234abc],
     }
 
     assert_equal expected, git_set.repositories
@@ -349,22 +350,22 @@ DEPENDENCIES
 
     parse_lockfile @set, []
 
-    assert_equal [dep('a', '= 2')], @set.dependencies
+    assert_equal [dep("a", "= 2")], @set.dependencies
 
     lockfile_set = @set.sets.find do |set|
       Gem::Resolver::LockSet === set
     end
 
-    refute lockfile_set, 'fount a LockSet'
+    refute lockfile_set, "found a LockSet"
 
     git_set = @set.sets.find do |set|
       Gem::Resolver::GitSet === set
     end
 
-    assert git_set, 'could not find a GitSet'
+    assert git_set, "could not find a GitSet"
 
     expected = {
-      'a' => %w[git://example/a.git 1234abc],
+      "a" => %w[git://example/a.git 1234abc],
     }
 
     assert_equal expected, git_set.repositories
@@ -386,22 +387,22 @@ DEPENDENCIES
 
     parse_lockfile @set, []
 
-    assert_equal [dep('a', '= 2')], @set.dependencies
+    assert_equal [dep("a", "= 2")], @set.dependencies
 
     lockfile_set = @set.sets.find do |set|
       Gem::Resolver::LockSet === set
     end
 
-    refute lockfile_set, 'fount a LockSet'
+    refute lockfile_set, "found a LockSet"
 
     git_set = @set.sets.find do |set|
       Gem::Resolver::GitSet === set
     end
 
-    assert git_set, 'could not find a GitSet'
+    assert git_set, "could not find a GitSet"
 
     expected = {
-      'a' => %w[git://example/a.git 1234abc],
+      "a" => %w[git://example/a.git 1234abc],
     }
 
     assert_equal expected, git_set.repositories
@@ -423,45 +424,45 @@ DEPENDENCIES
 
     parse_lockfile @set, []
 
-    assert_equal [dep('a', '= 1')], @set.dependencies
+    assert_equal [dep("a", "= 1")], @set.dependencies
 
     lockfile_set = @set.sets.find do |set|
       Gem::Resolver::LockSet === set
     end
 
-    refute lockfile_set, 'found a LockSet'
+    refute lockfile_set, "found a LockSet"
 
     vendor_set = @set.sets.find do |set|
       Gem::Resolver::VendorSet === set
     end
 
-    assert vendor_set, 'could not find a VendorSet'
+    assert vendor_set, "could not find a VendorSet"
 
     assert_equal %w[a-1], vendor_set.specs.values.map {|s| s.full_name }
 
-    spec = vendor_set.load_spec 'a', nil, nil, nil
+    spec = vendor_set.load_spec "a", nil, nil, nil
 
-    assert_equal [dep('b', '= 2')], spec.dependencies
+    assert_equal [dep("b", "= 2")], spec.dependencies
   end
 
   def test_parse_dependency
-    write_lockfile ' 1)'
+    write_lockfile " 1)"
 
     tokenizer = Gem::RequestSet::Lockfile::Tokenizer.from_file @lock_file
     parser = tokenizer.make_parser nil, nil
 
-    parsed = parser.parse_dependency 'a', '='
+    parsed = parser.parse_dependency "a", "="
 
-    assert_equal dep('a', '= 1'), parsed
+    assert_equal dep("a", "= 1"), parsed
 
-    write_lockfile ')'
+    write_lockfile ")"
 
     tokenizer = Gem::RequestSet::Lockfile::Tokenizer.from_file @lock_file
     parser = tokenizer.make_parser nil, nil
 
-    parsed = parser.parse_dependency 'a', '2'
+    parsed = parser.parse_dependency "a", "2"
 
-    assert_equal dep('a', '= 2'), parsed
+    assert_equal dep("a", "= 2"), parsed
   end
 
   def test_parse_gem_specs_dependency
@@ -486,7 +487,7 @@ DEPENDENCIES
     platforms = []
     parse_lockfile @set, platforms
 
-    assert_equal [dep('a')], @set.dependencies
+    assert_equal [dep("a")], @set.dependencies
 
     assert_equal [Gem::Platform::RUBY], platforms
 
@@ -494,13 +495,13 @@ DEPENDENCIES
       Gem::Resolver::LockSet === set
     end
 
-    assert lockfile_set, 'could not find a LockSet'
+    assert lockfile_set, "could not find a LockSet"
 
     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'),
+      Gem::Platform.new("x86_64-linux"),
     ]
 
     assert_equal expected, lockfile_set.specs.map {|tuple| tuple.platform }
@@ -508,10 +509,10 @@ DEPENDENCIES
     spec = lockfile_set.specs.first
 
     expected = [
-      dep('b', '= 3'),
-      dep('c', '~> 4'),
-      dep('d'),
-      dep('e', '~> 5.0', '>= 5.0.1'),
+      dep("b", "= 3"),
+      dep("c", "~> 4"),
+      dep("d"),
+      dep("e", "~> 5.0", ">= 5.0.1"),
     ]
 
     assert_equal expected, spec.dependencies
@@ -530,7 +531,7 @@ DEPENDENCIES
   end
 
   def write_lockfile(lockfile)
-    File.open @lock_file, 'w' do |io|
+    File.open @lock_file, "w" do |io|
       io.write lockfile
     end
   end

data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb

@@ -1,15 +1,16 @@
 # frozen_string_literal: true
-require_relative 'helper'
-require 'rubygems/request_set'
-require 'rubygems/request_set/lockfile'
-require 'rubygems/request_set/lockfile/tokenizer'
-require 'rubygems/request_set/lockfile/parser'
+
+require_relative "helper"
+require "rubygems/request_set"
+require "rubygems/request_set/lockfile"
+require "rubygems/request_set/lockfile/tokenizer"
+require "rubygems/request_set/lockfile/parser"
 
 class TestGemRequestSetLockfileTokenizer < Gem::TestCase
   def setup
     super
 
-    @gem_deps_file = 'gem.deps.rb'
+    @gem_deps_file = "gem.deps.rb"
     @lock_file = File.expand_path "#{@gem_deps_file}.lock"
   end
 
@@ -34,10 +35,10 @@ class TestGemRequestSetLockfileTokenizer < Gem::TestCase
   end
 
   def test_token_pos
-    tokenizer = Gem::RequestSet::Lockfile::Tokenizer.new ''
+    tokenizer = Gem::RequestSet::Lockfile::Tokenizer.new ""
     assert_equal [5, 0], tokenizer.token_pos(5)
 
-    tokenizer = Gem::RequestSet::Lockfile::Tokenizer.new '', nil, 1, 2
+    tokenizer = Gem::RequestSet::Lockfile::Tokenizer.new "", nil, 1, 2
     assert_equal [3, 1], tokenizer.token_pos(5)
   end
 
@@ -63,74 +64,74 @@ DEPENDENCIES
     LOCKFILE
 
     expected = [
-      [:section,     'GEM',               0,  0],
+      [:section,     "GEM",               0,  0],
       [:newline,     nil,                 3,  0],
 
-      [:entry,       'remote',            2,  1],
+      [:entry,       "remote",            2,  1],
       [:text,        @gem_repo,           10, 1],
       [:newline,     nil,                 34, 1],
 
-      [:entry,       'specs',             2,  2],
+      [:entry,       "specs",             2,  2],
       [:newline,     nil,                 8,  2],
 
-      [:text,        'a',                 4,  3],
+      [:text,        "a",                 4,  3],
       [:l_paren,     nil,                 6,  3],
-      [:text,        '2',                 7,  3],
+      [:text,        "2",                 7,  3],
       [:r_paren,     nil,                 8,  3],
       [:newline,     nil,                 9,  3],
 
-      [:text,        'b',                 6,  4],
+      [:text,        "b",                 6,  4],
       [:l_paren,     nil,                 8,  4],
-      [:requirement, '=',                 9,  4],
-      [:text,        '2',                 11, 4],
+      [:requirement, "=",                 9,  4],
+      [:text,        "2",                 11, 4],
       [:r_paren,     nil,                 12, 4],
       [:newline,     nil,                 13, 4],
 
-      [:text,        'c',                 6,  5],
+      [:text,        "c",                 6,  5],
       [:l_paren,     nil,                 8,  5],
-      [:requirement, '!=',                9,  5],
-      [:text,        '3',                 12, 5],
+      [:requirement, "!=",                9,  5],
+      [:text,        "3",                 12, 5],
       [:r_paren,     nil,                 13, 5],
       [:newline,     nil,                 14, 5],
 
-      [:text,        'd',                 6,  6],
+      [:text,        "d",                 6,  6],
       [:l_paren,     nil,                 8,  6],
-      [:requirement, '>',                 9,  6],
-      [:text,        '4',                 11, 6],
+      [:requirement, ">",                 9,  6],
+      [:text,        "4",                 11, 6],
       [:r_paren,     nil,                 12, 6],
       [:newline,     nil,                 13, 6],
 
-      [:text,        'e',                 6,  7],
+      [:text,        "e",                 6,  7],
       [:l_paren,     nil,                 8,  7],
-      [:requirement, '<',                 9,  7],
-      [:text,        '5',                 11, 7],
+      [:requirement, "<",                 9,  7],
+      [:text,        "5",                 11, 7],
       [:r_paren,     nil,                 12, 7],
       [:newline,     nil,                 13, 7],
 
-      [:text,        'f',                 6,  8],
+      [:text,        "f",                 6,  8],
       [:l_paren,     nil,                 8,  8],
-      [:requirement, '>=',                9,  8],
-      [:text,        '6',                 12, 8],
+      [:requirement, ">=",                9,  8],
+      [:text,        "6",                 12, 8],
       [:r_paren,     nil,                 13, 8],
       [:newline,     nil,                 14, 8],
 
-      [:text,        'g',                 6,  9],
+      [:text,        "g",                 6,  9],
       [:l_paren,     nil,                 8,  9],
-      [:requirement, '<=',                9,  9],
-      [:text,        '7',                 12, 9],
+      [:requirement, "<=",                9,  9],
+      [:text,        "7",                 12, 9],
       [:r_paren,     nil,                 13, 9],
       [:newline,     nil,                 14, 9],
 
-      [:text,        'h',                 6,  10],
+      [:text,        "h",                 6,  10],
       [:l_paren,     nil,                 8,  10],
-      [:requirement, '~>',                9,  10],
-      [:text,        '8',                 12, 10],
+      [:requirement, "~>",                9,  10],
+      [:text,        "8",                 12, 10],
       [:r_paren,     nil,                 13, 10],
       [:newline,     nil,                 14, 10],
 
       [:newline,     nil,                 0,  11],
 
-      [:section,     'PLATFORMS',         0,  12],
+      [:section,     "PLATFORMS",         0,  12],
       [:newline,     nil,                 9,  12],
 
       [:text,        Gem::Platform::RUBY, 2,  13],
@@ -138,10 +139,10 @@ DEPENDENCIES
 
       [:newline,     nil,                 0,  14],
 
-      [:section,     'DEPENDENCIES',      0,  15],
+      [:section,     "DEPENDENCIES",      0,  15],
       [:newline,     nil,                 12, 15],
 
-      [:text,        'a',                 2,  16],
+      [:text,        "a",                 2,  16],
       [:newline,     nil,                 3,  16],
     ]
 
@@ -163,27 +164,27 @@ DEPENDENCIES
     LOCKFILE
 
     expected = [
-      [:section, 'GEM',               0,  0],
+      [:section, "GEM",               0,  0],
       [:newline, nil,                 3,  0],
-      [:entry,   'remote',            2,  1],
+      [:entry,   "remote",            2,  1],
       [:text,    @gem_repo,           10, 1],
       [:newline, nil,                 34, 1],
-      [:entry,   'specs',             2,  2],
+      [:entry,   "specs",             2,  2],
       [:newline, nil,                 8,  2],
-      [:text,    'Ab',                4,  3],
+      [:text,    "Ab",                4,  3],
       [:l_paren, nil,                 7,  3],
-      [:text,    '2',                 8,  3],
+      [:text,    "2",                 8,  3],
       [:r_paren, nil,                 9,  3],
       [:newline, nil,                 10, 3],
       [:newline, nil,                 0,  4],
-      [:section, 'PLATFORMS',         0,  5],
+      [: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],
+      [:section, "DEPENDENCIES",      0,  8],
       [:newline, nil,                 12, 8],
-      [:text,    'Ab',                2,  9],
+      [:text,    "Ab",                2,  9],
       [:newline, nil,                 4,  9],
     ]
 
@@ -191,7 +192,7 @@ DEPENDENCIES
   end
 
   def test_tokenize_conflict_markers
-    write_lockfile '<<<<<<<'
+    write_lockfile "<<<<<<<"
 
     e = assert_raise Gem::RequestSet::Lockfile::ParseError do
       tokenize_lockfile
@@ -200,7 +201,7 @@ DEPENDENCIES
     assert_equal "your #{@lock_file} contains merge conflict markers (at line 0 column 0)",
                  e.message
 
-    write_lockfile '|||||||'
+    write_lockfile "|||||||"
 
     e = assert_raise Gem::RequestSet::Lockfile::ParseError do
       tokenize_lockfile
@@ -209,7 +210,7 @@ DEPENDENCIES
     assert_equal "your #{@lock_file} contains merge conflict markers (at line 0 column 0)",
                  e.message
 
-    write_lockfile '======='
+    write_lockfile "======="
 
     e = assert_raise Gem::RequestSet::Lockfile::ParseError do
       tokenize_lockfile
@@ -218,7 +219,7 @@ DEPENDENCIES
     assert_equal "your #{@lock_file} contains merge conflict markers (at line 0 column 0)",
                  e.message
 
-    write_lockfile '>>>>>>>'
+    write_lockfile ">>>>>>>"
 
     e = assert_raise Gem::RequestSet::Lockfile::ParseError do
       tokenize_lockfile
@@ -235,10 +236,10 @@ DEPENDENCIES
     LOCKFILE
 
     expected = [
-      [:section, 'DEPENDENCIES', 0,  0],
+      [:section, "DEPENDENCIES", 0,  0],
       [:newline, nil,            12, 0],
 
-      [:text,    'a',            2,  1],
+      [:text,    "a",            2,  1],
       [:bang,    nil,            3,  1],
       [:newline, nil,            4,  1],
     ]
@@ -256,29 +257,29 @@ GEM
     LOCKFILE
 
     expected = [
-      [:section,     'GEM',     0,  0],
+      [:section,     "GEM",     0,  0],
       [:newline,     nil,       3,  0],
 
-      [:entry,       'remote',  2,  1],
+      [:entry,       "remote",  2,  1],
       [:text,        @gem_repo, 10, 1],
       [:newline,     nil,       34, 1],
 
-      [:entry,       'specs',   2,  2],
+      [:entry,       "specs",   2,  2],
       [:newline,     nil,       8,  2],
 
-      [:text,        'a',       4,  3],
+      [:text,        "a",       4,  3],
       [:l_paren,     nil,       6,  3],
-      [:text,        '2',       7,  3],
+      [:text,        "2",       7,  3],
       [:r_paren,     nil,       8,  3],
       [:newline,     nil,       9,  3],
 
-      [:text,        'b',       6,  4],
+      [:text,        "b",       6,  4],
       [:l_paren,     nil,       8,  4],
-      [:requirement, '~>',      9,  4],
-      [:text,        '3.0',     12, 4],
+      [:requirement, "~>",      9,  4],
+      [:text,        "3.0",     12, 4],
       [:comma,       nil,       15, 4],
-      [:requirement, '>=',      17, 4],
-      [:text,        '3.0.1',   20, 4],
+      [:requirement, ">=",      17, 4],
+      [:text,        "3.0.1",   20, 4],
       [:r_paren,     nil,       25, 4],
       [:newline,     nil,       26, 4],
     ]
@@ -295,7 +296,7 @@ GEM
   end
 
   def write_lockfile(lockfile)
-    File.open @lock_file, 'w' do |io|
+    File.open @lock_file, "w" do |io|
       io.write lockfile
     end
   end