rubygems-update 3.4.19 → 3.4.20

data/test/rubygems/test_gem_package_tar_writer.rb

@@ -28,7 +28,7 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
   end
 
   def test_add_file
-    Time.stub :now, Time.at(1458518157) do
+    Time.stub :now, Time.at(1_458_518_157) do
       @tar_writer.add_file "x", 0644 do |f|
         f.write "a" * 10
       end
@@ -42,7 +42,7 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
 
   def test_add_file_source_date_epoch
     ENV["SOURCE_DATE_EPOCH"] = "123456789"
-    Time.stub :now, Time.at(1458518157) do
+    Time.stub :now, Time.at(1_458_518_157) do
       @tar_writer.mkdir "foo", 0644
 
       assert_headers_equal tar_dir_header("foo", "", 0644, Time.at(ENV["SOURCE_DATE_EPOCH"].to_i).utc),
@@ -51,7 +51,7 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
   end
 
   def test_add_symlink
-    Time.stub :now, Time.at(1458518157) do
+    Time.stub :now, Time.at(1_458_518_157) do
       @tar_writer.add_symlink "x", "y", 0644
 
       assert_headers_equal(tar_symlink_header("x", "", 0644, Time.now, "y"),
@@ -62,7 +62,7 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
 
   def test_add_symlink_source_date_epoch
     ENV["SOURCE_DATE_EPOCH"] = "123456789"
-    Time.stub :now, Time.at(1458518157) do
+    Time.stub :now, Time.at(1_458_518_157) do
       @tar_writer.add_symlink "x", "y", 0644
 
       assert_headers_equal(tar_symlink_header("x", "", 0644, Time.at(ENV["SOURCE_DATE_EPOCH"].to_i).utc, "y"),
@@ -73,7 +73,7 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
   def test_add_file_digest
     digest_algorithms = Digest::SHA1.new, Digest::SHA512.new
 
-    Time.stub :now, Time.at(1458518157) do
+    Time.stub :now, Time.at(1_458_518_157) do
       digests = @tar_writer.add_file_digest "x", 0644, digest_algorithms do |io|
         io.write "a" * 10
       end
@@ -96,7 +96,7 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
   def test_add_file_digest_multiple
     digest_algorithms = [Digest::SHA1.new, Digest::SHA512.new]
 
-    Time.stub :now, Time.at(1458518157) do
+    Time.stub :now, Time.at(1_458_518_157) do
       digests = @tar_writer.add_file_digest "x", 0644, digest_algorithms do |io|
         io.write "a" * 10
       end
@@ -121,7 +121,7 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
 
     signer = Gem::Security::Signer.new PRIVATE_KEY, [PUBLIC_CERT]
 
-    Time.stub :now, Time.at(1458518157) do
+    Time.stub :now, Time.at(1_458_518_157) do
       @tar_writer.add_file_signed "x", 0644, signer do |io|
         io.write "a" * 10
       end
@@ -149,7 +149,7 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
   def test_add_file_signer_empty
     signer = Gem::Security::Signer.new nil, nil
 
-    Time.stub :now, Time.at(1458518157) do
+    Time.stub :now, Time.at(1_458_518_157) do
       @tar_writer.add_file_signed "x", 0644, signer do |io|
         io.write "a" * 10
       end
@@ -163,7 +163,7 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
   end
 
   def test_add_file_simple
-    Time.stub :now, Time.at(1458518157) do
+    Time.stub :now, Time.at(1_458_518_157) do
       @tar_writer.add_file_simple "x", 0644, 10 do |io|
         io.write "a" * 10
       end
@@ -178,7 +178,7 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
 
   def test_add_file_simple_source_date_epoch
     ENV["SOURCE_DATE_EPOCH"] = "123456789"
-    Time.stub :now, Time.at(1458518157) do
+    Time.stub :now, Time.at(1_458_518_157) do
       @tar_writer.add_file_simple "x", 0644, 10 do |io|
         io.write "a" * 10
       end
@@ -189,7 +189,7 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
   end
 
   def test_add_file_simple_padding
-    Time.stub :now, Time.at(1458518157) do
+    Time.stub :now, Time.at(1_458_518_157) do
       @tar_writer.add_file_simple "x", 0, 100
 
       assert_headers_equal tar_file_header("x", "", 0, 100, Time.now),
@@ -247,7 +247,7 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
   end
 
   def test_mkdir
-    Time.stub :now, Time.at(1458518157) do
+    Time.stub :now, Time.at(1_458_518_157) do
       @tar_writer.mkdir "foo", 0644
 
       assert_headers_equal tar_dir_header("foo", "", 0644, Time.now),
@@ -259,7 +259,7 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
 
   def test_mkdir_source_date_epoch
     ENV["SOURCE_DATE_EPOCH"] = "123456789"
-    Time.stub :now, Time.at(1458518157) do
+    Time.stub :now, Time.at(1_458_518_157) do
       @tar_writer.mkdir "foo", 0644
 
       assert_headers_equal tar_dir_header("foo", "", 0644, Time.at(ENV["SOURCE_DATE_EPOCH"].to_i).utc),

data/test/rubygems/test_gem_remote_fetcher.rb

@@ -749,7 +749,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
       "my-bucket" => { :id => "testuser", :secret => "testpass" },
     }
     url = "s3://my-bucket/gems/specs.4.8.gz"
-    Time.stub :now, Time.at(1561353581) do
+    Time.stub :now, Time.at(1_561_353_581) do
       assert_fetch_s3 url, "20f974027db2f3cd6193565327a7c73457a138efb1a63ea248d185ce6827d41b"
     end
   ensure
@@ -761,7 +761,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
       "my-bucket" => { :id => "testuser", :secret => "testpass", :region => "us-west-2" },
     }
     url = "s3://my-bucket/gems/specs.4.8.gz"
-    Time.stub :now, Time.at(1561353581) do
+    Time.stub :now, Time.at(1_561_353_581) do
       assert_fetch_s3 url, "4afc3010757f1fd143e769f1d1dabd406476a4fc7c120e9884fd02acbb8f26c9", nil, "us-west-2"
     end
   ensure
@@ -773,7 +773,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
       "my-bucket" => { :id => "testuser", :secret => "testpass", :security_token => "testtoken" },
     }
     url = "s3://my-bucket/gems/specs.4.8.gz"
-    Time.stub :now, Time.at(1561353581) do
+    Time.stub :now, Time.at(1_561_353_581) do
       assert_fetch_s3 url, "935160a427ef97e7630f799232b8f208c4a4e49aad07d0540572a2ad5fe9f93c", "testtoken"
     end
   ensure
@@ -788,7 +788,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
       "my-bucket" => { :provider => "env" },
     }
     url = "s3://my-bucket/gems/specs.4.8.gz"
-    Time.stub :now, Time.at(1561353581) do
+    Time.stub :now, Time.at(1_561_353_581) do
       assert_fetch_s3 url, "20f974027db2f3cd6193565327a7c73457a138efb1a63ea248d185ce6827d41b"
     end
   ensure
@@ -804,7 +804,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
       "my-bucket" => { :provider => "env", :region => "us-west-2" },
     }
     url = "s3://my-bucket/gems/specs.4.8.gz"
-    Time.stub :now, Time.at(1561353581) do
+    Time.stub :now, Time.at(1_561_353_581) do
       assert_fetch_s3 url, "4afc3010757f1fd143e769f1d1dabd406476a4fc7c120e9884fd02acbb8f26c9", nil, "us-west-2"
     end
   ensure
@@ -820,7 +820,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
       "my-bucket" => { :provider => "env" },
     }
     url = "s3://my-bucket/gems/specs.4.8.gz"
-    Time.stub :now, Time.at(1561353581) do
+    Time.stub :now, Time.at(1_561_353_581) do
       assert_fetch_s3 url, "935160a427ef97e7630f799232b8f208c4a4e49aad07d0540572a2ad5fe9f93c", "testtoken"
     end
   ensure
@@ -830,7 +830,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
 
   def test_fetch_s3_url_creds
     url = "s3://testuser:testpass@my-bucket/gems/specs.4.8.gz"
-    Time.stub :now, Time.at(1561353581) do
+    Time.stub :now, Time.at(1_561_353_581) do
       assert_fetch_s3 url, "20f974027db2f3cd6193565327a7c73457a138efb1a63ea248d185ce6827d41b"
     end
   end
@@ -841,7 +841,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
     }
 
     url = "s3://my-bucket/gems/specs.4.8.gz"
-    Time.stub :now, Time.at(1561353581) do
+    Time.stub :now, Time.at(1_561_353_581) do
       assert_fetch_s3 url, "20f974027db2f3cd6193565327a7c73457a138efb1a63ea248d185ce6827d41b", nil, "us-east-1",
                       '{"AccessKeyId": "testuser", "SecretAccessKey": "testpass"}'
     end
@@ -855,7 +855,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
     }
 
     url = "s3://my-bucket/gems/specs.4.8.gz"
-    Time.stub :now, Time.at(1561353581) do
+    Time.stub :now, Time.at(1_561_353_581) do
       assert_fetch_s3 url, "4afc3010757f1fd143e769f1d1dabd406476a4fc7c120e9884fd02acbb8f26c9", nil, "us-west-2",
                       '{"AccessKeyId": "testuser", "SecretAccessKey": "testpass"}'
     end
@@ -869,7 +869,7 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
     }
 
     url = "s3://my-bucket/gems/specs.4.8.gz"
-    Time.stub :now, Time.at(1561353581) do
+    Time.stub :now, Time.at(1_561_353_581) do
       assert_fetch_s3 url, "935160a427ef97e7630f799232b8f208c4a4e49aad07d0540572a2ad5fe9f93c", "testtoken", "us-east-1",
                       '{"AccessKeyId": "testuser", "SecretAccessKey": "testpass", "Token": "testtoken"}'
     end
@@ -1151,14 +1151,12 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
     end
     server.ssl_context.tmp_dh_callback = proc { TEST_KEY_DH2048 }
     t = Thread.new do
-      begin
-        server.start
-      rescue Exception => ex
-        puts "ERROR during server thread: #{ex.message}"
-        raise
-      ensure
-        server.shutdown
-      end
+      server.start
+    rescue Exception => ex
+      puts "ERROR during server thread: #{ex.message}"
+      raise
+    ensure
+      server.shutdown
     end
     while server.status != :Running
       sleep 0.1
@@ -1205,13 +1203,11 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
       end
     end
     th = Thread.new do
-      begin
-        s.start
-      rescue Exception => ex
-        abort "ERROR during server thread: #{ex.message}"
-      ensure
-        s.shutdown
-      end
+      s.start
+    rescue Exception => ex
+      abort "ERROR during server thread: #{ex.message}"
+    ensure
+      s.shutdown
     end
     th[:server] = s
     th

data/test/rubygems/test_gem_requirement.rb

@@ -84,7 +84,7 @@ class TestGemRequirement < Gem::TestCase
       Gem::Requirement.parse(Gem::Version.new("2"))
   end
 
-  if !(Gem.java_platform? && ENV["JRUBY_OPTS"].to_s.include?("--debug"))
+  unless (Gem.java_platform? && ENV["JRUBY_OPTS"].to_s.include?("--debug"))
     def test_parse_deduplication
       assert_same "~>", Gem::Requirement.parse("~> 1").first
     end

data/test/rubygems/test_gem_specification.rb

@@ -1092,6 +1092,25 @@ dependencies: []
     assert_equal(yaml_defined, Object.const_defined?("YAML"))
   end
 
+  def test_handles_dependencies_with_other_syck_requirements_argument_error
+    yaml_defined = Object.const_defined?("YAML")
+
+    data = Marshal.dump(Gem::Specification.new do |s|
+      v = Gem::Version.allocate
+      v.instance_variable_set :@version, "YAML::Syck::DefaultKey"
+      s.instance_variable_set :@version, v
+    end)
+
+    assert_raise(ArgumentError) { Marshal.load(data) }
+    out, err = capture_output do
+      assert_raise(ArgumentError) { Marshal.load(data) }
+    end
+    assert_empty out
+    assert_empty err
+
+    assert_equal(yaml_defined, Object.const_defined?("YAML"))
+  end
+
   def test_initialize
     spec = Gem::Specification.new do |s|
       s.name = "blah"
@@ -3075,10 +3094,22 @@ Please report a bug if this causes problems.
 
     assert_match <<-WARNING, @ui.error
 WARNING:  licenses is empty, but is recommended.  Use a license identifier from
-http://spdx.org/licenses or 'Nonstandard' for a nonstandard license.
+http://spdx.org/licenses or 'Nonstandard' for a nonstandard license,
+or set it to nil if you don't want to specify a license.
     WARNING
   end
 
+  def test_validate_nil_license
+    util_setup_validate
+
+    use_ui @ui do
+      @a1.license = nil
+      @a1.validate
+    end
+
+    assert_empty @ui.error
+  end
+
   def test_validate_license_in_a_non_packaging_context
     util_setup_validate
 
@@ -3115,7 +3146,8 @@ http://spdx.org/licenses or 'Nonstandard' for a nonstandard license.
 
     assert_match <<-WARNING, @ui.error
 WARNING:  license value 'BSD' is invalid.  Use a license identifier from
-http://spdx.org/licenses or 'Nonstandard' for a nonstandard license.
+http://spdx.org/licenses or 'Nonstandard' for a nonstandard license,
+or set it to nil if you don't want to specify a license.
     WARNING
   end
 
@@ -3173,11 +3205,13 @@ http://spdx.org/licenses or 'Nonstandard' for a nonstandard license.
 
     assert_match <<-WARNING, @ui.error
 WARNING:  license value 'GPL-2.0+ FOO' is invalid.  Use a license identifier from
-http://spdx.org/licenses or 'Nonstandard' for a nonstandard license.
+http://spdx.org/licenses or 'Nonstandard' for a nonstandard license,
+or set it to nil if you don't want to specify a license.
     WARNING
     assert_match <<-WARNING, @ui.error
 WARNING:  license value 'GPL-2.0 FOO' is invalid.  Use a license identifier from
-http://spdx.org/licenses or 'Nonstandard' for a nonstandard license.
+http://spdx.org/licenses or 'Nonstandard' for a nonstandard license,
+or set it to nil if you don't want to specify a license.
     WARNING
   end
 
@@ -3191,7 +3225,8 @@ http://spdx.org/licenses or 'Nonstandard' for a nonstandard license.
 
     assert_match <<-WARNING, @ui.error
 WARNING:  license value 'GPL-2.0+ WITH Autocofn-exception-2.0' is invalid.  Use a license identifier from
-http://spdx.org/licenses or 'Nonstandard' for a nonstandard license.
+http://spdx.org/licenses or 'Nonstandard' for a nonstandard license,
+or set it to nil if you don't want to specify a license.
     WARNING
   end
 
@@ -3205,7 +3240,8 @@ http://spdx.org/licenses or 'Nonstandard' for a nonstandard license.
 
     assert_match <<-WARNING, @ui.error
 WARNING:  license value 'ruby' is invalid.  Use a license identifier from
-http://spdx.org/licenses or 'Nonstandard' for a nonstandard license.
+http://spdx.org/licenses or 'Nonstandard' for a nonstandard license,
+or set it to nil if you don't want to specify a license.
 Did you mean 'Ruby'?
     WARNING
   end

data/test/rubygems/test_gem_update_suggestion.rb

@@ -64,9 +64,9 @@ class TestUpdateSuggestion < Gem::TestCase
 
   def test_eglible_for_update
     with_eglible_environment(cmd: @cmd) do
-      Time.stub :now, 123456789 do
+      Time.stub :now, 123_456_789 do
         assert @cmd.eglible_for_update?
-        assert_equal Gem.configuration.last_update_check, 123456789
+        assert_equal Gem.configuration.last_update_check, 123_456_789
 
         # test last check is written to config file
         assert File.read(Gem.configuration.state_file_name).match("123456789")
@@ -143,23 +143,19 @@ class TestUpdateSuggestion < Gem::TestCase
 
   def test_eglible_for_update_prevent_config
     with_eglible_environment(cmd: @cmd) do
-      begin
-        original_config, Gem.configuration[:prevent_update_suggestion] = Gem.configuration[:prevent_update_suggestion], true
-        refute @cmd.eglible_for_update?
-      ensure
-        Gem.configuration[:prevent_update_suggestion] = original_config
-      end
+      original_config, Gem.configuration[:prevent_update_suggestion] = Gem.configuration[:prevent_update_suggestion], true
+      refute @cmd.eglible_for_update?
+    ensure
+      Gem.configuration[:prevent_update_suggestion] = original_config
     end
   end
 
   def test_eglible_for_update_prevent_env
     with_eglible_environment(cmd: @cmd) do
-      begin
-        original_env, ENV["RUBYGEMS_PREVENT_UPDATE_SUGGESTION"] = ENV["RUBYGEMS_PREVENT_UPDATE_SUGGESTION"], "yes"
-        refute @cmd.eglible_for_update?
-      ensure
-        ENV["RUBYGEMS_PREVENT_UPDATE_SUGGESTION"] = original_env
-      end
+      original_env, ENV["RUBYGEMS_PREVENT_UPDATE_SUGGESTION"] = ENV["RUBYGEMS_PREVENT_UPDATE_SUGGESTION"], "yes"
+      refute @cmd.eglible_for_update?
+    ensure
+      ENV["RUBYGEMS_PREVENT_UPDATE_SUGGESTION"] = original_env
     end
   end
 
@@ -177,12 +173,10 @@ class TestUpdateSuggestion < Gem::TestCase
 
   def test_eglible_for_update_disabled_update
     with_eglible_environment(cmd: @cmd) do
-      begin
-        original_disable, Gem.disable_system_update_message = Gem.disable_system_update_message, "disabled"
-        refute @cmd.eglible_for_update?
-      ensure
-        Gem.disable_system_update_message = original_disable
-      end
+      original_disable, Gem.disable_system_update_message = Gem.disable_system_update_message, "disabled"
+      refute @cmd.eglible_for_update?
+    ensure
+      Gem.disable_system_update_message = original_disable
     end
   end
 

data/test/rubygems/test_require.rb

@@ -92,12 +92,10 @@ class TestGemRequire < Gem::TestCase
 
   def create_sync_thread
     Thread.new do
-      begin
-        yield
-      ensure
-        FILE_ENTERED_LATCH.release
-        FILE_EXIT_LATCH.await
-      end
+      yield
+    ensure
+      FILE_ENTERED_LATCH.release
+      FILE_EXIT_LATCH.await
     end
   end
 

data/test/rubygems/utilities.rb

@@ -55,7 +55,7 @@ class Gem::FakeFetcher
       raise Gem::RemoteFetcher::FetchError.new("no data for #{path}", path)
     end
 
-    if @data[path].kind_of?(Array)
+    if @data[path].is_a?(Array)
       @data[path].shift
     else
       @data[path]
@@ -65,7 +65,7 @@ class Gem::FakeFetcher
   def create_response(uri)
     data = find_data(uri)
     response = data.respond_to?(:call) ? data.call : data
-    raise TypeError, "#{response.class} is not a type of Net::HTTPResponse" unless response.kind_of?(Net::HTTPResponse)
+    raise TypeError, "#{response.class} is not a type of Net::HTTPResponse" unless response.is_a?(Net::HTTPResponse)
 
     response
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-update
 version: !ruby/object:Gem::Version
-  version: 3.4.19
+  version: 3.4.20
 platform: ruby
 authors:
 - Jim Weirich
@@ -16,7 +16,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-17 00:00:00.000000000 Z
+date: 2023-09-27 00:00:00.000000000 Z
 dependencies: []
 description: |-
   A package (also known as a library) contains a set of functionality
@@ -872,7 +872,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: RubyGems is a package management framework for Ruby. This gem is downloaded