rubygems-update 3.1.6 → 3.2.0

data/test/rubygems/test_gem_resolver_local_specification.rb

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/available_set'
 
 class TestGemResolverLocalSpecification < Gem::TestCase
-
   def setup
     super
 
@@ -41,5 +40,4 @@ class TestGemResolverLocalSpecification < Gem::TestCase
 
     assert b_spec.installable_platform?
   end
-
 end

data/test/rubygems/test_gem_resolver_lock_set.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemResolverLockSet < Gem::TestCase
-
   def setup
     super
 
@@ -16,7 +15,7 @@ class TestGemResolverLockSet < Gem::TestCase
     specs = @set.add 'a', '2', Gem::Platform::RUBY
     spec = specs.first
 
-    assert_equal %w[a-2], @set.specs.map { |t| t.full_name }
+    assert_equal %w[a-2], @set.specs.map {|t| t.full_name }
 
     assert_kind_of Gem::Resolver::LockSpecification, spec
 
@@ -34,11 +33,11 @@ class TestGemResolverLockSet < Gem::TestCase
 
     found = @set.find_all dep 'a'
 
-    assert_equal %w[a-2], found.map { |s| s.full_name }
+    assert_equal %w[a-2], found.map {|s| s.full_name }
 
     found = @set.find_all dep 'a', '>= 0.a'
 
-    assert_equal %w[a-1.a a-2], found.map { |s| s.full_name }
+    assert_equal %w[a-1.a a-2], found.map {|s| s.full_name }
   end
 
   def test_load_spec
@@ -59,5 +58,4 @@ class TestGemResolverLockSet < Gem::TestCase
   def test_prefetch
     assert_respond_to @set, :prefetch
   end
-
 end

data/test/rubygems/test_gem_resolver_lock_specification.rb

@@ -4,7 +4,6 @@ require 'rubygems/installer'
 require 'rubygems/resolver'
 
 class TestGemResolverLockSpecification < Gem::TestCase
-
   def setup
     super
 
@@ -95,5 +94,4 @@ class TestGemResolverLockSpecification < Gem::TestCase
 
     assert_same real_spec, l_spec.spec
   end
-
 end

data/test/rubygems/test_gem_resolver_requirement_list.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemResolverRequirementList < Gem::TestCase
-
   def setup
     super
 
@@ -16,5 +15,4 @@ class TestGemResolverRequirementList < Gem::TestCase
 
     assert_equal [req], @list.each.to_a
   end
-
 end

data/test/rubygems/test_gem_resolver_specification.rb

@@ -2,9 +2,7 @@
 require 'rubygems/test_case'
 
 class TestGemResolverSpecification < Gem::TestCase
-
   class TestSpec < Gem::Resolver::Specification
-
     attr_writer :source
     attr_reader :spec
 
@@ -13,7 +11,6 @@ class TestGemResolverSpecification < Gem::TestCase
 
       @spec = spec
     end
-
   end
 
   def test_install
@@ -62,5 +59,4 @@ class TestGemResolverSpecification < Gem::TestCase
 
     assert_equal source, a_spec.source
   end
-
 end

data/test/rubygems/test_gem_resolver_vendor_set.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemResolverVendorSet < Gem::TestCase
-
   def setup
     super
 
@@ -52,7 +51,7 @@ class TestGemResolverVendorSet < Gem::TestCase
     source = Gem::Source::Vendor.new directory
 
     expected = [
-      Gem::Resolver::VendorSpecification.new(@set, spec, source)
+      Gem::Resolver::VendorSpecification.new(@set, spec, source),
     ]
 
     assert_equal expected, found
@@ -79,5 +78,4 @@ class TestGemResolverVendorSet < Gem::TestCase
       @set.load_spec 'b', v(1), Gem::Platform::RUBY, nil
     end
   end
-
 end

data/test/rubygems/test_gem_resolver_vendor_specification.rb

@@ -2,7 +2,6 @@
 require 'rubygems/test_case'
 
 class TestGemResolverVendorSpecification < Gem::TestCase
-
   def setup
     super
 
@@ -79,5 +78,4 @@ class TestGemResolverVendorSpecification < Gem::TestCase
 
     assert_equal v(1), v_spec.version
   end
-
 end

data/test/rubygems/test_gem_security.rb

@@ -2,7 +2,7 @@
 require 'rubygems/test_case'
 require 'rubygems/security'
 
-unless defined?(OpenSSL::SSL)
+unless Gem::HAVE_OPENSSL
   warn 'Skipping Gem::Security tests.  openssl not found.'
 end
 
@@ -11,7 +11,6 @@ if Gem.java_platform?
 end
 
 class TestGemSecurity < Gem::TestCase
-
   CHILD_KEY = load_key 'child'
 
   ALTERNATE_CERT = load_cert 'child'
@@ -40,16 +39,16 @@ class TestGemSecurity < Gem::TestCase
     assert_equal    name.to_s,             cert.subject.to_s
 
     assert_equal 3, cert.extensions.length,
-                 cert.extensions.map { |e| e.to_a.first }
+                 cert.extensions.map {|e| e.to_a.first }
 
-    constraints = cert.extensions.find { |ext| ext.oid == 'basicConstraints' }
+    constraints = cert.extensions.find {|ext| ext.oid == 'basicConstraints' }
     assert_equal 'CA:FALSE', constraints.value
 
-    key_usage = cert.extensions.find { |ext| ext.oid == 'keyUsage' }
+    key_usage = cert.extensions.find {|ext| ext.oid == 'keyUsage' }
     assert_equal 'Digital Signature, Key Encipherment, Data Encipherment',
                  key_usage.value
 
-    key_ident = cert.extensions.find { |ext| ext.oid == 'subjectKeyIdentifier' }
+    key_ident = cert.extensions.find {|ext| ext.oid == 'subjectKeyIdentifier' }
     assert_equal 59, key_ident.value.length
     assert_equal '5F:43:6E:F6:9A:8E:45:25:E9:22:E3:7D:37:5E:A4:D5:36:02:85:1B',
                  key_ident.value
@@ -85,19 +84,19 @@ class TestGemSecurity < Gem::TestCase
     assert_equal    name.to_s,             cert.issuer.to_s
 
     assert_equal 5, cert.extensions.length,
-                 cert.extensions.map { |e| e.to_a.first }
+                 cert.extensions.map {|e| e.to_a.first }
 
-    constraints = cert.extensions.find { |ext| ext.oid == 'subjectAltName' }
+    constraints = cert.extensions.find {|ext| ext.oid == 'subjectAltName' }
     assert_equal 'email:nobody@example', constraints.value
 
-    constraints = cert.extensions.find { |ext| ext.oid == 'basicConstraints' }
+    constraints = cert.extensions.find {|ext| ext.oid == 'basicConstraints' }
     assert_equal 'CA:FALSE', constraints.value
 
-    key_usage = cert.extensions.find { |ext| ext.oid == 'keyUsage' }
+    key_usage = cert.extensions.find {|ext| ext.oid == 'keyUsage' }
     assert_equal 'Digital Signature, Key Encipherment, Data Encipherment',
                  key_usage.value
 
-    key_ident = cert.extensions.find { |ext| ext.oid == 'subjectKeyIdentifier' }
+    key_ident = cert.extensions.find {|ext| ext.oid == 'subjectKeyIdentifier' }
     assert_equal 59, key_ident.value.length
     assert_equal '5F:43:6E:F6:9A:8E:45:25:E9:22:E3:7D:37:5E:A4:D5:36:02:85:1B',
                  key_ident.value
@@ -188,20 +187,20 @@ class TestGemSecurity < Gem::TestCase
     assert_in_delta Time.now + 60,         signed.not_after, 10
 
     assert_equal 4, signed.extensions.length,
-                 signed.extensions.map { |e| e.to_a.first }
+                 signed.extensions.map {|e| e.to_a.first }
 
-    constraints = signed.extensions.find { |ext| ext.oid == 'issuerAltName' }
+    constraints = signed.extensions.find {|ext| ext.oid == 'issuerAltName' }
     assert_equal 'email:nobody@example', constraints.value, 'issuerAltName'
 
-    constraints = signed.extensions.find { |ext| ext.oid == 'basicConstraints' }
+    constraints = signed.extensions.find {|ext| ext.oid == 'basicConstraints' }
     assert_equal 'CA:FALSE', constraints.value
 
-    key_usage = signed.extensions.find { |ext| ext.oid == 'keyUsage' }
+    key_usage = signed.extensions.find {|ext| ext.oid == 'keyUsage' }
     assert_equal 'Digital Signature, Key Encipherment, Data Encipherment',
                  key_usage.value
 
     key_ident =
-      signed.extensions.find { |ext| ext.oid == 'subjectKeyIdentifier' }
+      signed.extensions.find {|ext| ext.oid == 'subjectKeyIdentifier' }
     assert_equal 59, key_ident.value.length
     assert_equal '5F:43:6E:F6:9A:8E:45:25:E9:22:E3:7D:37:5E:A4:D5:36:02:85:1B',
                  key_ident.value
@@ -227,23 +226,23 @@ class TestGemSecurity < Gem::TestCase
     assert_equal "sha256WithRSAEncryption", signed.signature_algorithm
 
     assert_equal 5, signed.extensions.length,
-                 signed.extensions.map { |e| e.to_a.first }
+                 signed.extensions.map {|e| e.to_a.first }
 
-    constraints = signed.extensions.find { |ext| ext.oid == 'issuerAltName' }
+    constraints = signed.extensions.find {|ext| ext.oid == 'issuerAltName' }
     assert_equal 'email:nobody@example', constraints.value, 'issuerAltName'
 
-    constraints = signed.extensions.find { |ext| ext.oid == 'subjectAltName' }
+    constraints = signed.extensions.find {|ext| ext.oid == 'subjectAltName' }
     assert_equal 'email:signee@example', constraints.value, 'subjectAltName'
 
-    constraints = signed.extensions.find { |ext| ext.oid == 'basicConstraints' }
+    constraints = signed.extensions.find {|ext| ext.oid == 'basicConstraints' }
     assert_equal 'CA:FALSE', constraints.value
 
-    key_usage = signed.extensions.find { |ext| ext.oid == 'keyUsage' }
+    key_usage = signed.extensions.find {|ext| ext.oid == 'keyUsage' }
     assert_equal 'Digital Signature, Key Encipherment, Data Encipherment',
                  key_usage.value
 
     key_ident =
-      signed.extensions.find { |ext| ext.oid == 'subjectKeyIdentifier' }
+      signed.extensions.find {|ext| ext.oid == 'subjectKeyIdentifier' }
     assert_equal 59, key_ident.value.length
     assert_equal '5F:43:6E:F6:9A:8E:45:25:E9:22:E3:7D:37:5E:A4:D5:36:02:85:1B',
                  key_ident.value
@@ -310,5 +309,4 @@ class TestGemSecurity < Gem::TestCase
 
     assert_equal key.to_pem, key_from_file.to_pem
   end
-
-end if defined?(OpenSSL::SSL) && !Gem.java_platform?
+end if Gem::HAVE_OPENSSL && !Gem.java_platform?

data/test/rubygems/test_gem_security_policy.rb

@@ -1,14 +1,12 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 require 'rubygems/test_case'
 
-unless defined?(OpenSSL::SSL)
+unless Gem::HAVE_OPENSSL
   warn 'Skipping Gem::Security::Policy tests.  openssl not found.'
 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)
+end if Gem::HAVE_OPENSSL

data/test/rubygems/test_gem_security_signer.rb

@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 require 'rubygems/test_case'
 
-unless defined?(OpenSSL::SSL)
+unless Gem::HAVE_OPENSSL
   warn 'Skipping Gem::Security::Signer tests.  openssl not found.'
 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)
+end if Gem::HAVE_OPENSSL

data/test/rubygems/test_gem_security_trust_dir.rb

@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 require 'rubygems/test_case'
 
-unless defined?(OpenSSL::SSL)
+unless Gem::HAVE_OPENSSL
   warn 'Skipping Gem::Security::TrustDir tests.  openssl not found.'
 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)
+end if Gem::HAVE_OPENSSL

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