rubygems-update 3.0.3 → 3.4.7

data/test/rubygems/test_gem_security_signer.rb

@@ -1,19 +1,18 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
+require_relative "helper"
 
-unless defined?(OpenSSL::SSL)
-  warn 'Skipping Gem::Security::Signer tests.  openssl not found.'
+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"
 
-  ALTERNATE_KEY  = load_key 'alternate'
-  CHILD_KEY      = load_key 'child'
-  GRANDCHILD_KEY = load_key 'grandchild'
-
-  CHILD_CERT      = load_cert 'child'
-  GRANDCHILD_CERT = load_cert 'grandchild'
-  EXPIRED_CERT    = load_cert 'expired'
+  CHILD_CERT      = load_cert "child"
+  GRANDCHILD_CERT = load_cert "grandchild"
+  EXPIRED_CERT    = load_cert "expired"
 
   def setup
     super
@@ -37,36 +36,36 @@ 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
-    assert_raises OpenSSL::X509::CertificateError do
-      Gem::Security::Signer.new nil, ['garbage']
+    assert_raise OpenSSL::X509::CertificateError do
+      Gem::Security::Signer.new nil, ["garbage"]
     end
   end
 
   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
-    FileUtils.mkdir_p File.join(Gem.user_home, '.gem')
+    FileUtils.mkdir_p File.join(Gem.user_home, ".gem")
 
-    private_key_path = File.join Gem.user_home, '.gem', 'gem-private_key.pem'
+    private_key_path = File.join Gem.user_home, ".gem", "gem-private_key.pem"
     Gem::Security.write PRIVATE_KEY, private_key_path
 
-    public_cert_path = File.join Gem.user_home, '.gem', 'gem-public_cert.pem'
+    public_cert_path = File.join Gem.user_home, ".gem", "gem-public_cert.pem"
     Gem::Security.write PUBLIC_CERT, public_cert_path
 
     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
@@ -88,7 +87,7 @@ class TestGemSecuritySigner < Gem::TestCase
   def test_extract_name
     signer = Gem::Security::Signer.new nil, nil
 
-    assert_equal 'child@example', signer.extract_name(CHILD_CERT)
+    assert_equal "child@example", signer.extract_name(CHILD_CERT)
   end
 
   def test_load_cert_chain
@@ -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,48 +111,49 @@ 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
     signer = Gem::Security::Signer.new PRIVATE_KEY, [PUBLIC_CERT]
 
-    signature = signer.sign 'hello'
+    signature = signer.sign "hello"
 
     expected = <<-EXPECTED
-cHze2sEfRysoUMCfGVAx/7o8jxj5liJJ2ptNxe2jf3l+EZvyjdqpXo9Ndzxx
-6xLp2rxLG4K2//ip4aCH5Sh7hnia+F5u6iuLBETPlklPrmw5dnuKZxolz+vM
-0O1aOZsQHcVzQoESTGjkms3KZk+gn3lg0sSBbAV5/LyDYoHCEjxlcA5D+Olb
-rDmRyBMOnMS+q489OZ5Hr6B2YJJ3QbUwIZNhUeNmOxIBEYTrrKkZ92qkxbRN
-qhlqFP4jR6zXFeyBCOr0KpTiWBNuxBFXDsxmhGyt2BOIjD6qmKn7RSIfYg/U
-toqvglr0kdbknSRRjBVLK6tsgr07aLT9gNP7mTW2PA==
+FmrCYxEXW3dgYYNMxPdS16VrdXT+d5nyXTVlRm64ZHSgMxMAaPtQJsVYv73m
+DWHTzNnLhhINSpgBMLh5a4atM52yxVdkPUTgqIH+LeIPBXn8xaP5JLmfDcmI
+tBpc/9DhS3v9iKCX40igAArFu7Gg3swbgQ61SP+U22LvG5nDQZQz3sudtsw3
+qKPykFVaYjrRwzvBdSdJ1PwlAsanSwcwS/GKPtmE/ykZ6X5XOx7wvCDL/zGy
+B8khkB8hDKC6moCzebmUxCBmTmXD0Wjzon+bf4MOriVE3a0ySGRvpr1mKR2+
+9EaVo7pDJLEM487+xg1CAZHRhwshd6II00XEzG/jBQ==
     EXPECTED
 
-    assert_equal expected, [signature].pack('m')
+    assert_equal expected, [signature].pack("m")
   end
 
   def test_sign_expired
     signer = Gem::Security::Signer.new PRIVATE_KEY, [EXPIRED_CERT]
 
-    e = assert_raises Gem::Security::Exception do
-      signer.sign 'hello'
+    e = assert_raise Gem::Security::Exception do
+      signer.sign "hello"
     end
 
     assert_match "certificate /CN=nobody/DC=example not valid after 1970-01-01 00:00:00 UTC", e.message
   end
 
   def test_sign_expired_auto_update
-    FileUtils.mkdir_p File.join(Gem.user_home, '.gem'), :mode => 0700
+    pend if Gem.java_platform?
+    FileUtils.mkdir_p File.join(Gem.user_home, ".gem"), :mode => 0700
 
-    private_key_path = File.join(Gem.user_home, '.gem', 'gem-private_key.pem')
+    private_key_path = File.join(Gem.user_home, ".gem", "gem-private_key.pem")
     Gem::Security.write PRIVATE_KEY, private_key_path
 
-    cert_path = File.join Gem.user_home, '.gem', 'gem-public_cert.pem'
+    cert_path = File.join Gem.user_home, ".gem", "gem-public_cert.pem"
     Gem::Security.write EXPIRED_CERT, cert_path
 
     signer = Gem::Security::Signer.new PRIVATE_KEY, [EXPIRED_CERT]
 
-    signer.sign 'hello'
+    signer.sign "hello"
 
     cert = OpenSSL::X509::Certificate.new File.read cert_path
 
@@ -163,14 +163,14 @@ toqvglr0kdbknSRRjBVLK6tsgr07aLT9gNP7mTW2PA==
     expiry = EXPIRED_CERT.not_after.strftime "%Y%m%d%H%M%S"
 
     expired_path =
-      File.join Gem.user_home, '.gem', "gem-public_cert.pem.expired.#{expiry}"
+      File.join Gem.user_home, ".gem", "gem-public_cert.pem.expired.#{expiry}"
 
-    assert_path_exists expired_path
+    assert_path_exist expired_path
     assert_equal EXPIRED_CERT.to_pem, File.read(expired_path)
   end
 
   def test_sign_expired_auto_update_exists
-    FileUtils.mkdir_p File.join(Gem.user_home, '.gem'), :mode => 0700
+    FileUtils.mkdir_p File.join(Gem.user_home, ".gem"), :mode => 0700
 
     expiry = EXPIRED_CERT.not_after.strftime "%Y%m%d%H%M%S"
     expired_path =
@@ -178,41 +178,40 @@ toqvglr0kdbknSRRjBVLK6tsgr07aLT9gNP7mTW2PA==
 
     Gem::Security.write EXPIRED_CERT, expired_path
 
-    private_key_path = File.join(Gem.user_home, 'gem-private_key.pem')
+    private_key_path = File.join(Gem.user_home, "gem-private_key.pem")
     Gem::Security.write PRIVATE_KEY, private_key_path
 
-    cert_path = File.join Gem.user_home, 'gem-public_cert.pem'
+    cert_path = File.join Gem.user_home, "gem-public_cert.pem"
     Gem::Security.write EXPIRED_CERT, cert_path
 
     signer = Gem::Security::Signer.new PRIVATE_KEY, [EXPIRED_CERT]
 
-    e = assert_raises Gem::Security::Exception do
-      signer.sign 'hello'
+    e = assert_raise Gem::Security::Exception do
+      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
     signer = Gem::Security::Signer.new nil, nil
 
-    assert_nil signer.sign 'stuff'
+    assert_nil signer.sign "stuff"
   end
 
   def test_sign_wrong_key
     signer = Gem::Security::Signer.new ALTERNATE_KEY, [PUBLIC_CERT]
 
-    assert_raises Gem::Security::Exception do
-      signer.sign 'hello'
+    assert_raise Gem::Security::Exception do
+      signer.sign "hello"
     end
   end
 
   def test_sign_no_certs
     signer = Gem::Security::Signer.new ALTERNATE_KEY, []
 
-    assert_raises Gem::Security::Exception do
-      signer.sign 'hello'
+    assert_raise Gem::Security::Exception do
+      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,24 +1,23 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
+require_relative "helper"
 
-unless defined?(OpenSSL::SSL)
-  warn 'Skipping Gem::Security::TrustDir tests.  openssl not found.'
+unless Gem::HAVE_OPENSSL
+  warn "Skipping Gem::Security::TrustDir tests.  openssl not found."
 end
 
 class TestGemSecurityTrustDir < Gem::TestCase
-
-  CHILD_CERT = load_cert 'child'
+  CHILD_CERT = load_cert "child"
 
   def setup
     super
 
-    @dest_dir = File.join @tempdir, 'trust'
+    @dest_dir = File.join @tempdir, "trust"
 
     @trust_dir = Gem::Security::TrustDir.new @dest_dir
   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"
 
@@ -54,7 +53,7 @@ class TestGemSecurityTrustDir < Gem::TestCase
 
     trusted = @trust_dir.cert_path PUBLIC_CERT
 
-    assert_path_exists trusted
+    assert_path_exist trusted
 
     mask = 0100600 & (~File.umask)
 
@@ -64,14 +63,14 @@ class TestGemSecurityTrustDir < Gem::TestCase
   end
 
   def test_verify
-    refute_path_exists @dest_dir
+    assert_path_not_exist @dest_dir
 
     @trust_dir.verify
 
-    assert_path_exists @dest_dir
+    assert_path_exist @dest_dir
 
     mask = 040700 & (~File.umask)
-    mask |= 0200000 if /aix/ =~ RUBY_PLATFORM
+    mask |= 0200000 if RUBY_PLATFORM.include?("aix")
 
     assert_equal mask, File.stat(@dest_dir).mode unless win_platform?
   end
@@ -79,7 +78,7 @@ class TestGemSecurityTrustDir < Gem::TestCase
   def test_verify_file
     FileUtils.touch @dest_dir
 
-    e = assert_raises Gem::Security::Exception do
+    e = assert_raise Gem::Security::Exception do
       @trust_dir.verify
     end
 
@@ -92,9 +91,8 @@ class TestGemSecurityTrustDir < Gem::TestCase
     @trust_dir.verify
 
     mask = 040700 & (~File.umask)
-    mask |= 0200000 if /aix/ =~ RUBY_PLATFORM
+    mask |= 0200000 if RUBY_PLATFORM.include?("aix")
 
     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_silent_ui.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
-require 'rubygems/user_interaction'
-require 'timeout'
+require_relative "helper"
+require "rubygems/user_interaction"
+require "timeout"
 
 class TestGemSilentUI < Gem::TestCase
-
   def setup
     super
     @sui = Gem::SilentUI.new
@@ -17,101 +16,107 @@ class TestGemSilentUI < Gem::TestCase
 
   def test_ask
     value = nil
-    out, err = capture_io do
+    out, err = capture_output do
       use_ui @sui do
-        value = @sui.ask 'Problem?'
+        value = @sui.ask "Problem?"
       end
     end
 
-    assert_empty out, 'No output'
-    assert_empty err, 'No output'
+    assert_empty out, "No output"
+    assert_empty err, "No output"
 
-    assert_nil value, 'No value'
+    assert_nil value, "No value"
   end
 
   def test_ask_for_password
     value = nil
-    out, err = capture_io do
+    out, err = capture_output do
       use_ui @sui do
-        value = @sui.ask_for_password 'Problem?'
+        value = @sui.ask_for_password "Problem?"
       end
     end
 
-    assert_empty out, 'No output'
-    assert_empty err, 'No output'
+    assert_empty out, "No output"
+    assert_empty err, "No output"
 
-    assert_nil value, 'No value'
+    assert_nil value, "No value"
   end
 
   def test_ask_yes_no
     value = nil
-    out, err = capture_io do
+    out, err = capture_output do
       use_ui @sui do
-        assert_raises(Gem::OperationNotSupportedError) do
-          @sui.ask_yes_no 'Problem?'
+        assert_raise(Gem::OperationNotSupportedError) do
+          @sui.ask_yes_no "Problem?"
         end
       end
     end
 
-    assert_empty out, 'No output'
-    assert_empty err, 'No output'
+    assert_empty out, "No output"
+    assert_empty err, "No output"
 
-    out, err = capture_io do
+    out, err = capture_output do
       use_ui @sui do
-        value = @sui.ask_yes_no 'Problem?', true
+        value = @sui.ask_yes_no "Problem?", true
       end
     end
 
-    assert_empty out, 'No output'
-    assert_empty err, 'No output'
+    assert_empty out, "No output"
+    assert_empty err, "No output"
 
-    assert value, 'Value is true'
+    assert value, "Value is true"
 
-    out, err = capture_io do
+    out, err = capture_output do
       use_ui @sui do
-        value = @sui.ask_yes_no 'Problem?', false
+        value = @sui.ask_yes_no "Problem?", false
       end
     end
 
-    assert_empty out, 'No output'
-    assert_empty err, 'No output'
+    assert_empty out, "No output"
+    assert_empty err, "No output"
 
-    assert_equal value, false, 'Value is false'
+    assert_equal value, false, "Value is false"
   end
 
   def test_choose_from_list
     value = nil
-    out, err = capture_io do
+    out, err = capture_output do
       use_ui @sui do
-        value = @sui.choose_from_list 'Problem?', %w[yes no]
+        value = @sui.choose_from_list "Problem?", %w[yes no]
       end
     end
 
-    assert_empty out, 'No output'
-    assert_empty err, 'No output'
+    assert_empty out, "No output"
+    assert_empty err, "No output"
 
-    assert_equal [nil, nil], value, 'Value is nil!'
+    assert_equal [nil, nil], value, "Value is nil!"
   end
 
   def test_progress_reporter
-    out, err = capture_io do
+    out, err = capture_output do
       use_ui @sui do
-        @sui.progress_reporter 10, 'hi'
+        @sui.progress_reporter 10, "hi"
       end
     end
 
-    assert_empty out, 'No output'
-    assert_empty err, 'No output'
+    assert_empty out, "No output"
+    assert_empty err, "No output"
   end
 
   def test_download_reporter
-    out, err = capture_io do
+    out, err = capture_output do
       use_ui @sui do
-        @sui.download_reporter.fetch 'a.gem', 1024
+        @sui.download_reporter.fetch "a.gem", 1024
       end
     end
 
-    assert_empty out, 'No output'
-    assert_empty err, 'No output'
+    assert_empty out, "No output"
+    assert_empty err, "No output"
+  end
+
+  def test_new_without_dev_null
+    File.stub(:open, ->(path, mode) { raise Errno::ENOTCAPABLE if path == IO::NULL }) do
+      Gem::SilentUI.new
+    end
   end
 end