rubygems-update 3.1.1 → 3.2.0.rc.2

data/test/rubygems/test_gem_security_policy.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 require 'rubygems/test_case'
@@ -8,7 +7,6 @@ unless defined?(OpenSSL::SSL)
 end
 
 class TestGemSecurityPolicy < Gem::TestCase
-
   ALTERNATE_KEY    = load_key 'alternate'
   INVALID_KEY      = load_key 'invalid'
   CHILD_KEY        = load_key 'child'
@@ -34,7 +32,7 @@ class TestGemSecurityPolicy < Gem::TestCase
       s.files = %w[lib/code.rb]
     end
 
-    @digest = Gem::Security::DIGEST_ALGORITHM
+    @digest = OpenSSL::Digest.new Gem::Security::DIGEST_NAME
     @trust_dir = Gem::Security.trust_dir.dir # HACK use the object
 
     @no        = Gem::Security::NoSecurity
@@ -397,13 +395,11 @@ class TestGemSecurityPolicy < Gem::TestCase
   def test_verify_wrong_digest_type
     Gem::Security.trust_dir.trust_cert PUBLIC_CERT
 
-    sha512 = OpenSSL::Digest::SHA512
-
-    data = sha512.new
+    data = OpenSSL::Digest.new('SHA512')
     data << 'hello'
 
     digests    = { 'SHA512' => { 0 => data } }
-    signature  = PRIVATE_KEY.sign sha512.new, data.digest
+    signature  = PRIVATE_KEY.sign 'sha512', data.digest
     signatures = { 0 => signature }
 
     e = assert_raises Gem::Security::Exception do
@@ -482,7 +478,7 @@ class TestGemSecurityPolicy < Gem::TestCase
     def s.full_name() 'metadata.gz' end
 
     digests = package.digest s
-    digests[Gem::Security::DIGEST_NAME]['data.tar.gz'] = @digest.new 'hello'
+    digests[Gem::Security::DIGEST_NAME]['data.tar.gz'] = @digest.hexdigest 'hello'
 
     metadata_gz_digest = digests[Gem::Security::DIGEST_NAME]['metadata.gz']
 
@@ -511,7 +507,7 @@ class TestGemSecurityPolicy < Gem::TestCase
     def s.full_name() 'metadata.gz' end
 
     digests = package.digest s
-    digests[Gem::Security::DIGEST_NAME]['data.tar.gz'] = @digest.new 'hello'
+    digests[Gem::Security::DIGEST_NAME]['data.tar.gz'] = @digest.hexdigest 'hello'
 
     assert_raises Gem::Security::Exception do
       @high.verify_signatures @spec, digests, {}
@@ -536,5 +532,4 @@ class TestGemSecurityPolicy < Gem::TestCase
 
     return digests, signatures
   end
-
 end if defined?(OpenSSL::SSL)

data/test/rubygems/test_gem_security_signer.rb

@@ -6,7 +6,6 @@ unless defined?(OpenSSL::SSL)
 end
 
 class TestGemSecuritySigner < Gem::TestCase
-
   ALTERNATE_KEY  = load_key 'alternate'
   CHILD_KEY      = load_key 'child'
   GRANDCHILD_KEY = load_key 'grandchild'
@@ -37,8 +36,8 @@ class TestGemSecuritySigner < Gem::TestCase
   def test_initialize_cert_chain_mixed
     signer = Gem::Security::Signer.new nil, [@cert_file, CHILD_CERT]
 
-    assert_equal [PUBLIC_CERT, CHILD_CERT].map { |c| c.to_pem },
-                 signer.cert_chain.map { |c| c.to_pem }
+    assert_equal [PUBLIC_CERT, CHILD_CERT].map {|c| c.to_pem },
+                 signer.cert_chain.map {|c| c.to_pem }
   end
 
   def test_initialize_cert_chain_invalid
@@ -50,8 +49,8 @@ class TestGemSecuritySigner < Gem::TestCase
   def test_initialize_cert_chain_path
     signer = Gem::Security::Signer.new nil, [@cert_file]
 
-    assert_equal [PUBLIC_CERT].map { |c| c.to_pem },
-                 signer.cert_chain.map { |c| c.to_pem }
+    assert_equal [PUBLIC_CERT].map {|c| c.to_pem },
+                 signer.cert_chain.map {|c| c.to_pem }
   end
 
   def test_initialize_default
@@ -66,7 +65,7 @@ class TestGemSecuritySigner < Gem::TestCase
     signer = Gem::Security::Signer.new nil, nil
 
     assert_equal PRIVATE_KEY.to_pem, signer.key.to_pem
-    assert_equal [PUBLIC_CERT.to_pem], signer.cert_chain.map { |c| c.to_pem }
+    assert_equal [PUBLIC_CERT.to_pem], signer.cert_chain.map {|c| c.to_pem }
   end
 
   def test_initialize_key_path
@@ -100,7 +99,7 @@ class TestGemSecuritySigner < Gem::TestCase
     signer.load_cert_chain
 
     assert_equal [PUBLIC_CERT.to_pem, CHILD_CERT.to_pem],
-                 signer.cert_chain.map { |c| c.to_pem }
+                 signer.cert_chain.map {|c| c.to_pem }
   end
 
   def test_load_cert_chain_broken
@@ -112,7 +111,7 @@ class TestGemSecuritySigner < Gem::TestCase
     signer.load_cert_chain
 
     assert_equal [CHILD_CERT.to_pem, GRANDCHILD_CERT.to_pem],
-                 signer.cert_chain.map { |c| c.to_pem }
+                 signer.cert_chain.map {|c| c.to_pem }
   end
 
   def test_sign
@@ -191,7 +190,7 @@ toqvglr0kdbknSRRjBVLK6tsgr07aLT9gNP7mTW2PA==
       signer.sign 'hello'
     end
 
-    assert_match %r%certificate /CN=nobody/DC=example not valid%, e.message
+    assert_match %r{certificate /CN=nobody/DC=example not valid}, e.message
   end
 
   def test_sign_no_key
@@ -215,5 +214,4 @@ toqvglr0kdbknSRRjBVLK6tsgr07aLT9gNP7mTW2PA==
       signer.sign 'hello'
     end
   end
-
 end if defined?(OpenSSL::SSL)

data/test/rubygems/test_gem_security_trust_dir.rb

@@ -6,7 +6,6 @@ unless defined?(OpenSSL::SSL)
 end
 
 class TestGemSecurityTrustDir < Gem::TestCase
-
   CHILD_CERT = load_cert 'child'
 
   def setup
@@ -18,7 +17,7 @@ class TestGemSecurityTrustDir < Gem::TestCase
   end
 
   def test_cert_path
-    digest = Gem::Security::DIGEST_ALGORITHM.hexdigest PUBLIC_CERT.subject.to_s
+    digest = OpenSSL::Digest.hexdigest Gem::Security::DIGEST_NAME, PUBLIC_CERT.subject.to_s
 
     expected = File.join @dest_dir, "cert-#{digest}.pem"
 
@@ -42,7 +41,7 @@ class TestGemSecurityTrustDir < Gem::TestCase
   end
 
   def test_name_path
-    digest = Gem::Security::DIGEST_ALGORITHM.hexdigest PUBLIC_CERT.subject.to_s
+    digest = OpenSSL::Digest.hexdigest Gem::Security::DIGEST_NAME, PUBLIC_CERT.subject.to_s
 
     expected = File.join @dest_dir, "cert-#{digest}.pem"
 
@@ -96,5 +95,4 @@ class TestGemSecurityTrustDir < Gem::TestCase
 
     assert_equal mask, File.stat(@dest_dir).mode unless win_platform?
   end
-
 end if defined?(OpenSSL::SSL)

data/test/rubygems/test_gem_server.rb

@@ -4,13 +4,10 @@ require 'rubygems/server'
 require 'stringio'
 
 class Gem::Server
-
   attr_reader :server
-
 end
 
 class TestGemServer < Gem::TestCase
-
   def process_based_port
     0
   end
@@ -88,7 +85,7 @@ class TestGemServer < Gem::TestCase
     end
 
     assert_equal 200, @res.status, @res.body
-    assert_match %r| \d\d:\d\d:\d\d |, @res['date']
+    assert_match %r{ \d\d:\d\d:\d\d }, @res['date']
     assert_equal 'application/octet-stream', @res['content-type']
     assert_equal [['a', Gem::Version.new(2), Gem::Platform::RUBY]],
     Marshal.load(@res.body)
@@ -127,7 +124,7 @@ class TestGemServer < Gem::TestCase
     end
 
     assert_equal 200, @res.status, @res.body
-    assert_match %r| \d\d:\d\d:\d\d |, @res['date']
+    assert_match %r{ \d\d:\d\d:\d\d }, @res['date']
     assert_equal 'application/x-gzip', @res['content-type']
     assert_equal [['a', Gem::Version.new(2), Gem::Platform::RUBY]],
                  Marshal.load(Gem::Util.gunzip(@res.body))
@@ -162,7 +159,7 @@ class TestGemServer < Gem::TestCase
     end
 
     assert_equal 200, @res.status, @res.body
-    assert_match %r| \d\d:\d\d:\d\d |, @res['date']
+    assert_match %r{ \d\d:\d\d:\d\d }, @res['date']
     assert_equal 'application/octet-stream', @res['content-type']
     assert_equal [['a', v('3.a'), Gem::Platform::RUBY]],
                  Marshal.load(@res.body)
@@ -177,7 +174,7 @@ class TestGemServer < Gem::TestCase
     end
 
     assert_equal 200, @res.status, @res.body
-    assert_match %r| \d\d:\d\d:\d\d |, @res['date']
+    assert_match %r{ \d\d:\d\d:\d\d }, @res['date']
     assert_equal 'application/x-gzip', @res['content-type']
     assert_equal [['a', v('3.a'), Gem::Platform::RUBY]],
                  Marshal.load(Gem::Util.gunzip(@res.body))
@@ -223,7 +220,7 @@ class TestGemServer < Gem::TestCase
     @server.quick @req, @res
 
     assert_equal 404, @res.status, @res.body
-    assert_match %r| \d\d:\d\d:\d\d |, @res['date']
+    assert_match %r{ \d\d:\d\d:\d\d }, @res['date']
     assert_equal 'text/plain', @res['content-type']
     assert_equal 'No gems found matching "z-9"', @res.body
     assert_equal 404, @res.status
@@ -320,7 +317,7 @@ class TestGemServer < Gem::TestCase
     @server.rdoc @req, @res
 
     assert_equal 200, @res.status, @res.body
-    assert_match %r|No documentation found|, @res.body
+    assert_match %r{No documentation found}, @res.body
     assert_equal 'text/html', @res['content-type']
   end
 
@@ -331,7 +328,7 @@ class TestGemServer < Gem::TestCase
     @server.root @req, @res
 
     assert_equal 200, @res.status, @res.body
-    assert_match %r| \d\d:\d\d:\d\d |, @res['date']
+    assert_match %r{ \d\d:\d\d:\d\d }, @res['date']
     assert_equal 'text/html', @res['content-type']
   end
 
@@ -529,7 +526,7 @@ class TestGemServer < Gem::TestCase
     @server.specs @req, @res
 
     assert_equal 200, @res.status, @res.body
-    assert_match %r| \d\d:\d\d:\d\d |, @res['date']
+    assert_match %r{ \d\d:\d\d:\d\d }, @res['date']
     assert_equal 'application/octet-stream', @res['content-type']
 
     assert_equal [['a', Gem::Version.new(1), Gem::Platform::RUBY],
@@ -569,7 +566,7 @@ class TestGemServer < Gem::TestCase
     @server.specs @req, @res
 
     assert_equal 200, @res.status, @res.body
-    assert_match %r| \d\d:\d\d:\d\d |, @res['date']
+    assert_match %r{ \d\d:\d\d:\d\d }, @res['date']
     assert_equal 'application/x-gzip', @res['content-type']
 
     assert_equal [['a', Gem::Version.new(1), Gem::Platform::RUBY],
@@ -591,7 +588,7 @@ class TestGemServer < Gem::TestCase
 
     @server.root @req, @res
 
-    refute_match %r|%3A%2F%2F|, @res.body
+    refute_match %r{%3A%2F%2F}, @res.body
   end
 
   def util_listen
@@ -608,5 +605,4 @@ class TestGemServer < Gem::TestCase
 
     @server.instance_variable_set :@server, webrick
   end
-
 end

data/test/rubygems/test_gem_silent_ui.rb

@@ -4,7 +4,6 @@ require 'rubygems/user_interaction'
 require 'timeout'
 
 class TestGemSilentUI < Gem::TestCase
-
   def setup
     super
     @sui = Gem::SilentUI.new
@@ -114,5 +113,4 @@ class TestGemSilentUI < Gem::TestCase
     assert_empty out, 'No output'
     assert_empty err, 'No output'
   end
-
 end

data/test/rubygems/test_gem_source.rb

@@ -4,7 +4,6 @@ require 'rubygems/source'
 require 'rubygems/indexer'
 
 class TestGemSource < Gem::TestCase
-
   def tuple(*args)
     Gem::NameTuple.new(*args)
   end
@@ -55,8 +54,6 @@ class TestGemSource < Gem::TestCase
   end
 
   def test_dependency_resolver_set_file_uri
-    skip 'install builder gem' unless defined? Builder::XChar
-
     Gem::Indexer.new(@tempdir).generate_index
 
     source = Gem::Source.new "file://#{@tempdir}/"
@@ -125,7 +122,7 @@ class TestGemSource < Gem::TestCase
   end
 
   def test_load_specs
-    released = @source.load_specs(:released).map { |spec| spec.full_name }
+    released = @source.load_specs(:released).map {|spec| spec.full_name }
     assert_equal %W[a-2 a-1 b-2], released
 
     cache_dir = File.join Gem.spec_cache_dir, 'gems.example.com%80'
@@ -199,30 +196,30 @@ class TestGemSource < Gem::TestCase
     installed = Gem::Source::Installed.new
     local     = Gem::Source::Local.new
 
-    assert_equal(0, remote.   <=>(remote),    'remote    <=> remote')
+    assert_equal(0, remote.<=>(remote), 'remote <=> remote')
 
-    assert_equal(-1, remote.   <=>(specific),  'remote    <=> specific')
-    assert_equal(1, specific. <=>(remote),    'specific  <=> remote')
+    assert_equal(-1, remote.<=>(specific), 'remote <=> specific')
+    assert_equal(1, specific.<=>(remote), 'specific <=> remote')
 
-    assert_equal(-1, remote.   <=>(local),     'remote    <=> local')
-    assert_equal(1, local.    <=>(remote),    'local     <=> remote')
+    assert_equal(-1, remote.<=>(local), 'remote <=> local')
+    assert_equal(1, local.<=>(remote), 'local <=> remote')
 
-    assert_equal(-1, remote.   <=>(installed), 'remote    <=> installed')
-    assert_equal(1, installed.<=>(remote),    'installed <=> remote')
+    assert_equal(-1, remote.<=>(installed), 'remote <=> installed')
+    assert_equal(1, installed.<=>(remote), 'installed <=> remote')
 
     no_uri = @source.dup
     no_uri.instance_variable_set :@uri, nil
 
-    assert_equal(-1, remote.   <=>(no_uri),    'remote <=> no_uri')
+    assert_equal(-1, remote.<=>(no_uri), 'remote <=> no_uri')
   end
 
   def test_spaceship_order_is_preserved_when_uri_differs
     sourceA = Gem::Source.new "http://example.com/a"
     sourceB = Gem::Source.new "http://example.com/b"
 
-    assert_equal(0, sourceA. <=>(sourceA), 'sourceA <=> sourceA')
-    assert_equal(1, sourceA. <=>(sourceB), 'sourceA <=> sourceB')
-    assert_equal(1, sourceB. <=>(sourceA), 'sourceB <=> sourceA')
+    assert_equal(0, sourceA.<=>(sourceA), 'sourceA <=> sourceA')
+    assert_equal(1, sourceA.<=>(sourceB), 'sourceA <=> sourceB')
+    assert_equal(1, sourceB.<=>(sourceA), 'sourceB <=> sourceA')
   end
 
   def test_update_cache_eh
@@ -248,5 +245,4 @@ class TestGemSource < Gem::TestCase
     distance_threshold = 5
     assert rubygems_source.typo_squatting?("rubysertgems.org", distance_threshold)
   end
-
 end

data/test/rubygems/test_gem_source_fetch_problem.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemSourceFetchProblem < Gem::TestCase
-
   def test_exception
     source = Gem::Source.new @gem_repo
     error  = RuntimeError.new 'test'
@@ -24,5 +23,4 @@ class TestGemSourceFetchProblem < Gem::TestCase
 
     refute_match sf.wordy, 'secret'
   end
-
 end

data/test/rubygems/test_gem_source_git.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/source'
 
 class TestGemSourceGit < Gem::TestCase
-
   def setup
     super
 
@@ -69,8 +68,9 @@ class TestGemSourceGit < Gem::TestCase
     git_gem 'b'
 
     Dir.chdir 'git/a' do
-      Gem::Util.silent_system @git, 'submodule', '--quiet',
-                              'add', File.expand_path('../b'), 'b'
+      output, status = Open3.capture2e(@git, 'submodule', '--quiet', 'add', File.expand_path('../b'), 'b')
+      assert status.success?, output
+
       system @git, 'commit', '--quiet', '-m', 'add submodule b'
     end
 
@@ -187,7 +187,7 @@ class TestGemSourceGit < Gem::TestCase
     source.cache
 
     e = assert_raises Gem::Exception do
-      capture_subprocess_io {source.rev_parse}
+      capture_subprocess_io { source.rev_parse }
     end
 
     assert_equal "unable to find reference nonexistent in #{@repository}",
@@ -208,16 +208,16 @@ class TestGemSourceGit < Gem::TestCase
     installed = Gem::Source::Installed.new
     vendor    = Gem::Source::Vendor.new 'vendor/foo'
 
-    assert_equal(0, git.      <=>(git),       'git    <=> git')
+    assert_equal(0, git.<=>(git),       'git <=> git')
 
-    assert_equal(1, git.      <=>(remote),    'git    <=> remote')
-    assert_equal(-1, remote.   <=>(git),       'remote <=> git')
+    assert_equal(1, git.<=>(remote),    'git <=> remote')
+    assert_equal(-1, remote.<=>(git), 'remote <=> git')
 
-    assert_equal(1, git.      <=>(installed), 'git       <=> installed')
-    assert_equal(-1, installed.<=>(git),       'installed <=> git')
+    assert_equal(1, git.<=>(installed), 'git <=> installed')
+    assert_equal(-1, installed.<=>(git), 'installed <=> git')
 
-    assert_equal(-1, git.      <=>(vendor),    'git       <=> vendor')
-    assert_equal(1, vendor.   <=>(git),       'vendor    <=> git')
+    assert_equal(-1, git.<=>(vendor), 'git <=> vendor')
+    assert_equal(1, vendor.<=>(git), 'vendor <=> git')
   end
 
   def test_specs
@@ -244,7 +244,7 @@ class TestGemSourceGit < Gem::TestCase
       specs = source.specs
     end
 
-    assert_equal %w[a-1 b-1], specs.map { |spec| spec.full_name }
+    assert_equal %w[a-1 b-1], specs.map {|spec| spec.full_name }
 
     a_spec = specs.shift
 
@@ -299,5 +299,4 @@ class TestGemSourceGit < Gem::TestCase
     assert_equal '291c4caac7feba8bb64c297987028acb3dde6cfe',
                  source.uri_hash
   end
-
 end

data/test/rubygems/test_gem_source_installed.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/source'
 
 class TestGemSourceInstalled < Gem::TestCase
-
   def test_spaceship
     a1 = quick_gem 'a', '1'
     util_build_gem a1
@@ -17,20 +16,19 @@ class TestGemSourceInstalled < Gem::TestCase
 
     assert_equal(0, installed.<=>(installed), 'installed <=> installed')
 
-    assert_equal(-1, remote.   <=>(installed), 'remote    <=> installed')
+    assert_equal(-1, remote.<=>(installed), 'remote <=> installed')
     assert_equal(1, installed.<=>(remote),    'installed <=> remote')
 
     assert_equal(1, installed.<=>(local),     'installed <=> local')
-    assert_equal(-1, local.    <=>(installed), 'local     <=> installed')
+    assert_equal(-1, local.<=>(installed), 'local <=> installed')
 
-    assert_equal(-1, specific. <=>(installed), 'specific  <=> installed')
+    assert_equal(-1, specific.<=>(installed), 'specific <=> installed')
     assert_equal(1, installed.<=>(specific),  'installed <=> specific')
 
-    assert_equal(1, git.      <=>(installed), 'git       <=> installed')
-    assert_equal(-1, installed.<=>(git),       'installed <=> git')
+    assert_equal(1, git. <=>(installed), 'git <=> installed')
+    assert_equal(-1, installed.<=>(git), 'installed <=> git')
 
-    assert_equal(1, vendor.   <=>(installed), 'vendor    <=> installed')
-    assert_equal(-1, installed.<=>(vendor),    'installed <=> vendor')
+    assert_equal(1, vendor.<=>(installed), 'vendor <=> installed')
+    assert_equal(-1, installed.<=>(vendor), 'installed <=> vendor')
   end
-
 end