rubygems-update 3.4.19 → 3.4.21

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"
@@ -1453,15 +1472,15 @@ dependencies: []
     end
 
     FileUtils.mkdir_p File.join @ext.base_dir, "extensions"
-    FileUtils.chmod 0555, @ext.base_dir
-    FileUtils.chmod 0555, File.join(@ext.base_dir, "extensions")
+    FileUtils.chmod 0o555, @ext.base_dir
+    FileUtils.chmod 0o555, File.join(@ext.base_dir, "extensions")
 
     @ext.build_extensions
     assert_path_not_exist @ext.extension_dir
   ensure
     unless ($DEBUG || win_platform? || Process.uid.zero? || Gem.java_platform?)
-      FileUtils.chmod 0755, File.join(@ext.base_dir, "extensions")
-      FileUtils.chmod 0755, @ext.base_dir
+      FileUtils.chmod 0o755, File.join(@ext.base_dir, "extensions")
+      FileUtils.chmod 0o755, @ext.base_dir
     end
   end
 
@@ -1486,14 +1505,14 @@ dependencies: []
     end
 
     FileUtils.rm_r File.join @gemhome, "extensions"
-    FileUtils.chmod 0555, @gemhome
+    FileUtils.chmod 0o555, @gemhome
 
     @ext.build_extensions
 
     gem_make_out = File.join @ext.extension_dir, "gem_make.out"
     assert_path_not_exist gem_make_out
   ensure
-    FileUtils.chmod 0755, @gemhome
+    FileUtils.chmod 0o755, @gemhome
   end
 
   def test_build_extensions_none
@@ -1601,12 +1620,12 @@ dependencies: []
 
   def test_date_tolerates_hour_sec_zulu
     @a1.date = "2012-01-12 11:22:33.4444444 Z"
-    assert_equal Time.utc(2012,01,12,0,0,0), @a1.date
+    assert_equal Time.utc(2012,0o1,12,0,0,0), @a1.date
   end
 
   def test_date_tolerates_hour_sec_and_timezone
     @a1.date = "2012-01-12 11:22:33.4444444 +02:33"
-    assert_equal Time.utc(2012,01,12,0,0,0), @a1.date
+    assert_equal Time.utc(2012,0o1,12,0,0,0), @a1.date
   end
 
   def test_date_use_env_source_date_epoch
@@ -1693,8 +1712,8 @@ dependencies: []
   end
 
   def test_extension_dir
-    enable_shared, RbConfig::CONFIG["ENABLE_SHARED"] =
-      RbConfig::CONFIG["ENABLE_SHARED"], "no"
+    enable_shared = RbConfig::CONFIG["ENABLE_SHARED"]
+    RbConfig::CONFIG["ENABLE_SHARED"] = "no"
 
     ext_spec
 
@@ -1710,8 +1729,8 @@ dependencies: []
   end
 
   def test_extension_dir_override
-    enable_shared, RbConfig::CONFIG["ENABLE_SHARED"] =
-      RbConfig::CONFIG["ENABLE_SHARED"], "no"
+    enable_shared = RbConfig::CONFIG["ENABLE_SHARED"]
+    RbConfig::CONFIG["ENABLE_SHARED"] = "no"
 
     class << Gem
       alias orig_default_ext_dir_for default_ext_dir_for
@@ -2272,7 +2291,7 @@ dependencies: []
 
 Gem::Specification.new do |s|
   s.name = "a".freeze
-  s.version = "2"
+  s.version = "2".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(\"> 0\".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze, "other".freeze]
@@ -2287,7 +2306,7 @@ Gem::Specification.new do |s|
 
   s.specification_version = #{Gem::Specification::CURRENT_SPECIFICATION_VERSION}
 
-  s.add_runtime_dependency(%q<b>.freeze, [\"= 1\"])
+  s.add_runtime_dependency(%q<b>.freeze, [\"= 1\".freeze])
 end
     SPEC
 
@@ -2312,7 +2331,7 @@ end
 
 Gem::Specification.new do |s|
   s.name = "a".freeze
-  s.version = "2"
+  s.version = "2".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -2345,7 +2364,7 @@ end
 
 Gem::Specification.new do |s|
   s.name = "a".freeze
-  s.version = "2"
+  s.version = "2".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(\"> 0\".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -2357,11 +2376,11 @@ Gem::Specification.new do |s|
   s.rubygems_version = "#{Gem::VERSION}".freeze
   s.summary = "this is a summary".freeze
 
-  s.installed_by_version = "#{Gem::VERSION}" if s.respond_to? :installed_by_version
+  s.installed_by_version = "#{Gem::VERSION}".freeze if s.respond_to? :installed_by_version
 
   s.specification_version = #{Gem::Specification::CURRENT_SPECIFICATION_VERSION}
 
-  s.add_runtime_dependency(%q<b>.freeze, [\"= 1\"])
+  s.add_runtime_dependency(%q<b>.freeze, ["= 1".freeze])
 end
     SPEC
 
@@ -2381,7 +2400,7 @@ end
     ruby_code = @c1.to_ruby
 
     local = Gem::Platform.local
-    expected_platform = "[#{local.cpu.inspect}, #{local.os.inspect}, #{local.version.inspect}]"
+    expected_platform = "[#{local.cpu.inspect}.freeze, #{local.os.inspect}.freeze, #{local.version.inspect}.freeze]"
     stub_require_paths =
       @c1.instance_variable_get(:@require_paths).join "\u0000"
     extensions = @c1.extensions.join "\u0000"
@@ -2393,7 +2412,7 @@ end
 
 Gem::Specification.new do |s|
   s.name = "a".freeze
-  s.version = "1"
+  s.version = "1".freeze
   s.platform = Gem::Platform.new(#{expected_platform})
 
   s.required_rubygems_version = Gem::Requirement.new(\">= 0\".freeze) if s.respond_to? :required_rubygems_version=
@@ -2414,9 +2433,9 @@ Gem::Specification.new do |s|
 
   s.specification_version = 4
 
-  s.add_runtime_dependency(%q<rake>.freeze, [\"> 0.4\"])
-  s.add_runtime_dependency(%q<jabber4r>.freeze, [\"> 0.0.0\"])
-  s.add_runtime_dependency(%q<pqa>.freeze, [\"> 0.4\", \"<= 0.6\"])
+  s.add_runtime_dependency(%q<rake>.freeze, [\"> 0.4\".freeze])
+  s.add_runtime_dependency(%q<jabber4r>.freeze, [\"> 0.0.0\".freeze])
+  s.add_runtime_dependency(%q<pqa>.freeze, [\"> 0.4\".freeze, \"<= 0.6\".freeze])
 end
     SPEC
 
@@ -2432,7 +2451,7 @@ end
       s.add_dependency "b", ["~> 1.0", ">= 1.0.0"]
     end
 
-    assert_includes spec.to_ruby, '"~> 1.0", ">= 1.0.0"'
+    assert_includes spec.to_ruby, '"~> 1.0".freeze, ">= 1.0.0".freeze'
   end
 
   def test_to_ruby_legacy
@@ -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
@@ -3314,8 +3350,8 @@ Did you mean 'Ruby'?
     util_setup_validate
 
     Dir.chdir @tempdir do
-      File.chmod 0640, File.join("lib", "code.rb")
-      File.chmod 0640, File.join("bin", "exec")
+      File.chmod 0o640, File.join("lib", "code.rb")
+      File.chmod 0o640, File.join("bin", "exec")
 
       use_ui @ui do
         @a1.validate
@@ -3463,7 +3499,7 @@ Did you mean 'Ruby'?
       capture_output do
         Gem::Specification.load(specfile.path)
       end
-    rescue => e
+    rescue StandardError => e
       name_rexp = Regexp.new(Regexp.escape(specfile.path))
       assert e.backtrace.grep(name_rexp).any?
     end
@@ -3618,7 +3654,7 @@ Did you mean 'Ruby'?
 
 Gem::Specification.new do |s|
   s.name = "m".freeze
-  s.version = "1"
+  s.version = "1".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.metadata = { "one" => "two", "two" => "three" } if s.respond_to? :metadata=
@@ -3809,7 +3845,7 @@ end
         FileUtils.touch File.join("lib", "code.rb")
         FileUtils.touch File.join("test", "suite.rb")
 
-        File.open "bin/exec", "w", 0755 do |fp|
+        File.open "bin/exec", "w", 0o755 do |fp|
           fp.puts "#!#{Gem.ruby}"
         end
       ensure

data/test/rubygems/test_gem_update_suggestion.rb

@@ -29,9 +29,12 @@ class TestUpdateSuggestion < Gem::TestCase
     reset_last_update_check: true,
     cmd:
   )
-    original_config, Gem.configuration[:prevent_update_suggestion] = Gem.configuration[:prevent_update_suggestion], nil
-    original_env, ENV["RUBYGEMS_PREVENT_UPDATE_SUGGESTION"] = ENV["RUBYGEMS_PREVENT_UPDATE_SUGGESTION"], nil
-    original_disable, Gem.disable_system_update_message = Gem.disable_system_update_message, nil
+    original_config = Gem.configuration[:prevent_update_suggestion]
+    Gem.configuration[:prevent_update_suggestion] = nil
+    original_env = ENV["RUBYGEMS_PREVENT_UPDATE_SUGGESTION"]
+    ENV["RUBYGEMS_PREVENT_UPDATE_SUGGESTION"] = nil
+    original_disable = Gem.disable_system_update_message
+    Gem.disable_system_update_message = nil
     Gem.configuration.last_update_check = 0 if reset_last_update_check
 
     Gem.ui.stub :tty?, tty do
@@ -64,9 +67,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 +146,21 @@ 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 +178,11 @@ 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_gem_util.rb

@@ -41,7 +41,7 @@ class TestGemUtil < Gem::TestCase
     FileUtils.mkdir_p "d/e/f"
     # remove 'execute' permission from "e" directory and make it
     # impossible to cd into it and its children
-    FileUtils.chmod(0666, "d/e")
+    FileUtils.chmod(0o666, "d/e")
 
     pend "skipped in root privilege" if Process.uid.zero?
 
@@ -53,7 +53,7 @@ class TestGemUtil < Gem::TestCase
     assert_equal File.realpath("../..", @tempdir), paths[3]
   ensure
     # restore default permissions, allow the directory to be removed
-    FileUtils.chmod(0775, "d/e") unless win_platform? || java_platform?
+    FileUtils.chmod(0o775, "d/e") unless win_platform? || java_platform?
   end
 
   def test_linked_list_find

data/test/rubygems/test_gem_version.rb

@@ -269,7 +269,8 @@ class TestGemVersion < Gem::TestCase
   # Assert that two versions are eql?. Checks both directions.
 
   def assert_version_eql(first, second)
-    first, second = v(first), v(second)
+    first = v(first)
+    second = v(second)
     assert first.eql?(second), "#{first} is eql? #{second}"
     assert second.eql?(first), "#{second} is eql? #{first}"
   end
@@ -290,7 +291,8 @@ class TestGemVersion < Gem::TestCase
   # directions.
 
   def refute_version_eql(first, second)
-    first, second = v(first), v(second)
+    first = v(first)
+    second = v(second)
     refute first.eql?(second), "#{first} is NOT eql? #{second}"
     refute second.eql?(first), "#{second} is NOT eql? #{first}"
   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
@@ -366,7 +366,8 @@ class Gem::TestCase::SpecFetcherSetup
     Gem::Specification.reset
 
     begin
-      gem_repo, @test.gem_repo = @test.gem_repo, @repository
+      gem_repo = @test.gem_repo
+      @test.gem_repo = @repository
       @test.uri = URI @repository
 
       @test.util_setup_spec_fetcher(*@downloaded)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-update
 version: !ruby/object:Gem::Version
-  version: 3.4.19
+  version: 3.4.21
 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-10-17 00:00:00.000000000 Z
 dependencies: []
 description: |-
   A package (also known as a library) contains a set of functionality
@@ -627,6 +627,7 @@ files:
 - lib/rubygems/validator.rb
 - lib/rubygems/version.rb
 - lib/rubygems/version_option.rb
+- lib/rubygems/yaml_serializer.rb
 - rubygems-update.gemspec
 - setup.rb
 - test/rubygems/alternate_cert.pem
@@ -872,7 +873,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.4.21
 signing_key:
 specification_version: 4
 summary: RubyGems is a package management framework for Ruby. This gem is downloaded