rubygems-update 3.1.6 → 3.2.0.rc.1

data/test/rubygems/test_gem_request.rb

@@ -251,11 +251,11 @@ class TestGemRequest < Gem::TestCase
   def test_user_agent
     ua = make_request(@uri, nil, nil, nil).user_agent
 
-    assert_match %r%^RubyGems/\S+ \S+ Ruby/\S+ \(.*?\)%,          ua
-    assert_match %r%RubyGems/#{Regexp.escape Gem::VERSION}%,      ua
-    assert_match %r% #{Regexp.escape Gem::Platform.local.to_s} %, ua
-    assert_match %r%Ruby/#{Regexp.escape RUBY_VERSION}%,          ua
-    assert_match %r%\(#{Regexp.escape RUBY_RELEASE_DATE} %,       ua
+    assert_match %r{^RubyGems/\S+ \S+ Ruby/\S+ \(.*?\)},          ua
+    assert_match %r{RubyGems/#{Regexp.escape Gem::VERSION}},      ua
+    assert_match %r{ #{Regexp.escape Gem::Platform.local.to_s} }, ua
+    assert_match %r{Ruby/#{Regexp.escape RUBY_VERSION}},          ua
+    assert_match %r{\(#{Regexp.escape RUBY_RELEASE_DATE} },       ua
   end
 
   def test_user_agent_engine
@@ -266,7 +266,7 @@ class TestGemRequest < Gem::TestCase
 
     ua = make_request(@uri, nil, nil, nil).user_agent
 
-    assert_match %r%\) vroom%, ua
+    assert_match %r{\) vroom}, ua
   ensure
     util_restore_version
   end
@@ -279,7 +279,7 @@ class TestGemRequest < Gem::TestCase
 
     ua = make_request(@uri, nil, nil, nil).user_agent
 
-    assert_match %r%\)%, ua
+    assert_match %r{\)}, ua
   ensure
     util_restore_version
   end
@@ -292,7 +292,7 @@ class TestGemRequest < Gem::TestCase
 
     ua = make_request(@uri, nil, nil, nil).user_agent
 
-    assert_match %r% patchlevel 5\)%, ua
+    assert_match %r{ patchlevel 5\)}, ua
   ensure
     util_restore_version
   end
@@ -307,8 +307,8 @@ class TestGemRequest < Gem::TestCase
 
     ua = make_request(@uri, nil, nil, nil).user_agent
 
-    assert_match %r% revision 6\)%, ua
-    assert_match %r%Ruby/#{Regexp.escape RUBY_VERSION}dev%, ua
+    assert_match %r{ revision 6\)}, ua
+    assert_match %r{Ruby/#{Regexp.escape RUBY_VERSION}dev}, ua
   ensure
     util_restore_version
   end
@@ -322,7 +322,7 @@ class TestGemRequest < Gem::TestCase
 
     ua = make_request(@uri, nil, nil, nil).user_agent
 
-    assert_match %r%\(#{Regexp.escape RUBY_RELEASE_DATE}\)%, ua
+    assert_match %r{\(#{Regexp.escape RUBY_RELEASE_DATE}\)}, ua
   ensure
     util_restore_version
   end

data/test/rubygems/test_gem_request_set.rb

@@ -324,7 +324,7 @@ ruby "0"
     res = rs.resolve StaticSet.new([a, b])
     assert_equal 2, res.size
 
-    names = res.map { |s| s.full_name }.sort
+    names = res.map {|s| s.full_name }.sort
 
     assert_equal ["a-2", "b-2"], names
 
@@ -343,7 +343,7 @@ ruby "0"
     res = rs.resolve StaticSet.new([a, b, c])
     assert_equal 3, res.size
 
-    names = res.map { |s| s.full_name }.sort
+    names = res.map {|s| s.full_name }.sort
 
     assert_equal %w[a-1.b b-1.b c-1.1.b], names
   end
@@ -396,9 +396,9 @@ ruby "0"
     rs = Gem::RequestSet.new
 
     tf = Tempfile.open 'gem.deps.rb' do |io|
-      io.puts <<-gems_deps_rb
+      io.puts <<-GEMS_DEPS_RB
         gem "#{name}", :git => "#{repository}"
-      gems_deps_rb
+      GEMS_DEPS_RB
 
       io.flush
 
@@ -410,12 +410,12 @@ ruby "0"
     res = rs.resolve
     assert_equal 1, res.size
 
-    names = res.map { |s| s.full_name }.sort
+    names = res.map {|s| s.full_name }.sort
 
     assert_equal %w[a-1], names
 
     assert_equal [@DR::BestSet, @DR::GitSet, @DR::VendorSet, @DR::SourceSet],
-                 rs.sets.map { |set| set.class }
+                 rs.sets.map {|set| set.class }
   end
 
   def test_resolve_ignore_dependencies
@@ -429,7 +429,7 @@ ruby "0"
     res = rs.resolve StaticSet.new([a, b])
     assert_equal 1, res.size
 
-    names = res.map { |s| s.full_name }.sort
+    names = res.map {|s| s.full_name }.sort
 
     assert_equal %w[a-2], names
   end
@@ -459,10 +459,10 @@ ruby "0"
     rs = Gem::RequestSet.new
 
     tf = Tempfile.open 'gem.deps.rb' do |io|
-      io.puts <<-gems_deps_rb
+      io.puts <<-GEMS_DEPS_RB
         gem "#{a_name}", :path => "#{a_directory}"
         gem "#{b_name}", :path => "#{b_directory}"
-      gems_deps_rb
+      GEMS_DEPS_RB
 
       io.flush
 
@@ -474,12 +474,12 @@ ruby "0"
     res = rs.resolve
     assert_equal 2, res.size
 
-    names = res.map { |s| s.full_name }.sort
+    names = res.map {|s| s.full_name }.sort
 
     assert_equal ["a-1", "b-2"], names
 
     assert_equal [@DR::BestSet, @DR::GitSet, @DR::VendorSet, @DR::SourceSet],
-                 rs.sets.map { |set| set.class }
+                 rs.sets.map {|set| set.class }
   end
 
   def test_sorted_requests
@@ -492,8 +492,8 @@ ruby "0"
 
     rs.resolve StaticSet.new([a, b, c])
 
-    names = rs.sorted_requests.map { |s| s.full_name }
-    assert_equal %w!c-2 b-2 a-2!, names
+    names = rs.sorted_requests.map {|s| s.full_name }
+    assert_equal %w[c-2 b-2 a-2], names
   end
 
   def test_install
@@ -521,14 +521,14 @@ ruby "0"
       installers << installer
     end
 
-    assert_equal %w[b-1 a-1], reqs.map { |req| req.full_name }
+    assert_equal %w[b-1 a-1], reqs.map {|req| req.full_name }
     assert_equal %w[b-1 a-1],
-                 installers.map { |installer| installer.spec.full_name }
+                 installers.map {|installer| installer.spec.full_name }
 
     assert_path_exists File.join @gemhome, 'specifications', 'a-1.gemspec'
     assert_path_exists File.join @gemhome, 'specifications', 'b-1.gemspec'
 
-    assert_equal %w[b-1 a-1], installed.map { |s| s.full_name }
+    assert_equal %w[b-1 a-1], installed.map {|s| s.full_name }
 
     assert done_installing_ran
   end
@@ -551,7 +551,7 @@ ruby "0"
     assert_path_exists File.join @tempdir, 'specifications', 'a-1.gemspec'
     assert_path_exists File.join @tempdir, 'specifications', 'b-1.gemspec'
 
-    assert_equal %w!b-1 a-1!, installed.map { |s| s.full_name }
+    assert_equal %w[b-1 a-1], installed.map {|s| s.full_name }
   end
 
   def test_install_into_development_shallow
@@ -583,7 +583,7 @@ ruby "0"
       assert_equal @tempdir, ENV['GEM_HOME']
     end
 
-    assert_equal %w[a-1 b-1], installed.map { |s| s.full_name }.sort
+    assert_equal %w[a-1 b-1], installed.map {|s| s.full_name }.sort
   end
 
   def test_sorted_requests_development_shallow
@@ -608,7 +608,7 @@ ruby "0"
 
     rs.resolve StaticSet.new [a_spec, b_spec, c_spec]
 
-    assert_equal %w[b-1 a-1], rs.sorted_requests.map { |req| req.full_name }
+    assert_equal %w[b-1 a-1], rs.sorted_requests.map {|req| req.full_name }
   end
 
   def test_tsort_each_child_development
@@ -637,7 +637,7 @@ ruby "0"
 
     deps = rs.enum_for(:tsort_each_child, a_req).to_a
 
-    assert_equal %w[b], deps.map { |dep| dep.name }
+    assert_equal %w[b], deps.map {|dep| dep.name }
   end
 
   def test_tsort_each_child_development_shallow

data/test/rubygems/test_gem_request_set_gem_dependency_api.rb

@@ -49,8 +49,8 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
       s.add_runtime_dependency 'bar', '>= 1.6.0', '< 1.6.4'
     end
     @gda.gemspec
-    assert_equal %w{ foo bar }.sort, @set.dependencies.map(&:name).sort
-    bar = @set.dependencies.find { |d| d.name == 'bar' }
+    assert_equal %w[ foo bar ].sort, @set.dependencies.map(&:name).sort
+    bar = @set.dependencies.find {|d| d.name == 'bar' }
     assert_equal [["<", Gem::Version.create('1.6.4')],
                   [">=", Gem::Version.create('1.6.0')]], bar.requirement.requirements.sort
   end
@@ -490,7 +490,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
       groups = @gda.send :gem_group, 'a', :group => :b, :groups => [:c, :d]
     end
 
-    assert_equal [:a, :b, :c, :d], groups.sort_by { |group| group.to_s }
+    assert_equal [:a, :b, :c, :d], groups.sort_by {|group| group.to_s }
   end
 
   def test_gemspec

data/test/rubygems/test_gem_request_set_lockfile_parser.rb

@@ -94,7 +94,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 +124,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 +218,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 +246,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 +284,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 +438,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 +497,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

@@ -64,86 +64,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
@@ -164,28 +164,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
@@ -236,12 +236,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
@@ -257,31 +257,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