rubygems-update 3.3.25 → 3.4.0

data/test/rubygems/test_gem_platform.rb

@@ -85,66 +85,65 @@ class TestGemPlatform < Gem::TestCase
 
   def test_initialize
     test_cases = {
-      "amd64-freebsd6"         => ["amd64",     "freebsd",   "6"],
-      "hppa2.0w-hpux11.31"     => ["hppa2.0w",  "hpux",      "11"],
-      "java"                   => [nil,         "java",      nil],
-      "jruby"                  => [nil,         "java",      nil],
-      "universal-dotnet"       => ["universal", "dotnet",    nil],
-      "universal-dotnet2.0"    => ["universal", "dotnet",  "2.0"],
-      "universal-dotnet4.0"    => ["universal", "dotnet",  "4.0"],
-      "powerpc-aix5.3.0.0"     => ["powerpc",   "aix",       "5"],
-      "powerpc-darwin7"        => ["powerpc",   "darwin",    "7"],
-      "powerpc-darwin8"        => ["powerpc",   "darwin",    "8"],
-      "powerpc-linux"          => ["powerpc",   "linux",     nil],
-      "powerpc64-linux"        => ["powerpc64", "linux",     nil],
-      "sparc-solaris2.10"      => ["sparc",     "solaris",   "2.10"],
-      "sparc-solaris2.8"       => ["sparc",     "solaris",   "2.8"],
-      "sparc-solaris2.9"       => ["sparc",     "solaris",   "2.9"],
-      "universal-darwin8"      => ["universal", "darwin",    "8"],
-      "universal-darwin9"      => ["universal", "darwin",    "9"],
-      "universal-macruby"      => ["universal", "macruby",   nil],
-      "i386-cygwin"            => ["x86",       "cygwin",    nil],
-      "i686-darwin"            => ["x86",       "darwin",    nil],
-      "i686-darwin8.4.1"       => ["x86",       "darwin",    "8"],
-      "i386-freebsd4.11"       => ["x86",       "freebsd",   "4"],
-      "i386-freebsd5"          => ["x86",       "freebsd",   "5"],
-      "i386-freebsd6"          => ["x86",       "freebsd",   "6"],
-      "i386-freebsd7"          => ["x86",       "freebsd",   "7"],
-      "i386-freebsd"           => ["x86",       "freebsd",   nil],
-      "universal-freebsd"      => ["universal", "freebsd",   nil],
-      "i386-java1.5"           => ["x86",       "java",      "1.5"],
-      "x86-java1.6"            => ["x86",       "java",      "1.6"],
-      "i386-java1.6"           => ["x86",       "java",      "1.6"],
-      "i686-linux"             => ["x86",       "linux",     nil],
-      "i586-linux"             => ["x86",       "linux",     nil],
-      "i486-linux"             => ["x86",       "linux",     nil],
-      "i386-linux"             => ["x86",       "linux",     nil],
-      "i586-linux-gnu"         => ["x86",       "linux",     "gnu"],
-      "i386-linux-gnu"         => ["x86",       "linux",     "gnu"],
-      "i386-mingw32"           => ["x86",       "mingw32",   nil],
-      "x64-mingw-ucrt"         => ["x64",       "mingw",     "ucrt"],
-      "i386-mswin32"           => ["x86",       "mswin32",   nil],
-      "i386-mswin32_80"        => ["x86",       "mswin32",   "80"],
-      "i386-mswin32-80"        => ["x86",       "mswin32",   "80"],
-      "x86-mswin32"            => ["x86",       "mswin32",   nil],
-      "x86-mswin32_60"         => ["x86",       "mswin32",   "60"],
-      "x86-mswin32-60"         => ["x86",       "mswin32",   "60"],
-      "i386-netbsdelf"         => ["x86",       "netbsdelf", nil],
-      "i386-openbsd4.0"        => ["x86",       "openbsd",   "4.0"],
-      "i386-solaris2.10"       => ["x86",       "solaris",   "2.10"],
-      "i386-solaris2.8"        => ["x86",       "solaris",   "2.8"],
-      "mswin32"                => ["x86",       "mswin32",   nil],
-      "x86_64-linux"           => ["x86_64",    "linux",     nil],
-      "x86_64-linux-gnu"       => ["x86_64",    "linux",     "gnu"],
-      "x86_64-linux-musl"      => ["x86_64",    "linux",     "musl"],
-      "x86_64-linux-uclibc"    => ["x86_64",    "linux",     "uclibc"],
-      "arm-linux-eabi"         => ["arm",       "linux",     "eabi"],
-      "arm-linux-gnueabi"      => ["arm",       "linux",     "gnueabi"],
-      "arm-linux-musleabi"     => ["arm",       "linux",     "musleabi"],
-      "arm-linux-uclibceabi"   => ["arm",       "linux",     "uclibceabi"],
-      "x86_64-openbsd3.9"      => ["x86_64",    "openbsd",   "3.9"],
-      "x86_64-openbsd4.0"      => ["x86_64",    "openbsd",   "4.0"],
-      "x86_64-openbsd"         => ["x86_64",    "openbsd",   nil],
+      "amd64-freebsd6" => ["amd64", "freebsd", "6"],
+      "java" => [nil, "java", nil],
+      "jruby" => [nil, "java", nil],
+      "universal-dotnet" => ["universal", "dotnet", nil],
+      "universal-dotnet2.0" => ["universal", "dotnet",  "2.0"],
+      "universal-dotnet4.0" => ["universal", "dotnet",  "4.0"],
+      "powerpc-aix5.3.0.0" => ["powerpc", "aix", "5"],
+      "powerpc-darwin7" => ["powerpc",   "darwin",    "7"],
+      "powerpc-darwin8" => ["powerpc",   "darwin",    "8"],
+      "powerpc-linux" => ["powerpc", "linux", nil],
+      "powerpc64-linux" => ["powerpc64", "linux", nil],
+      "sparc-solaris2.10" => ["sparc", "solaris", "2.10"],
+      "sparc-solaris2.8" => ["sparc",     "solaris",   "2.8"],
+      "sparc-solaris2.9" => ["sparc",     "solaris",   "2.9"],
+      "universal-darwin8" => ["universal", "darwin",    "8"],
+      "universal-darwin9" => ["universal", "darwin",    "9"],
+      "universal-macruby" => ["universal", "macruby",   nil],
+      "i386-cygwin" => ["x86",       "cygwin",    nil],
+      "i686-darwin" => ["x86",       "darwin",    nil],
+      "i686-darwin8.4.1" => ["x86",       "darwin",    "8"],
+      "i386-freebsd4.11" => ["x86",       "freebsd",   "4"],
+      "i386-freebsd5" => ["x86",       "freebsd",   "5"],
+      "i386-freebsd6" => ["x86",       "freebsd",   "6"],
+      "i386-freebsd7" => ["x86",       "freebsd",   "7"],
+      "i386-freebsd" => ["x86", "freebsd", nil],
+      "universal-freebsd" => ["universal", "freebsd", nil],
+      "i386-java1.5" => ["x86", "java", "1.5"],
+      "x86-java1.6" => ["x86", "java", "1.6"],
+      "i386-java1.6" => ["x86", "java", "1.6"],
+      "i686-linux" => ["x86",       "linux",     nil],
+      "i586-linux" => ["x86",       "linux",     nil],
+      "i486-linux" => ["x86",       "linux",     nil],
+      "i386-linux" => ["x86",       "linux",     nil],
+      "i586-linux-gnu" => ["x86",       "linux",     "gnu"],
+      "i386-linux-gnu" => ["x86",       "linux",     "gnu"],
+      "i386-mingw32" => ["x86", "mingw32", nil],
+      "x64-mingw-ucrt" => ["x64", "mingw", "ucrt"],
+      "i386-mswin32" => ["x86", "mswin32", nil],
+      "i386-mswin32_80" => ["x86",       "mswin32",   "80"],
+      "i386-mswin32-80" => ["x86",       "mswin32",   "80"],
+      "x86-mswin32" => ["x86", "mswin32", nil],
+      "x86-mswin32_60" => ["x86",       "mswin32",   "60"],
+      "x86-mswin32-60" => ["x86",       "mswin32",   "60"],
+      "i386-netbsdelf" => ["x86",       "netbsdelf", nil],
+      "i386-openbsd4.0" => ["x86", "openbsd", "4.0"],
+      "i386-solaris2.10" => ["x86", "solaris", "2.10"],
+      "i386-solaris2.8" => ["x86", "solaris", "2.8"],
+      "mswin32" => ["x86", "mswin32", nil],
+      "x86_64-linux" => ["x86_64", "linux", nil],
+      "x86_64-linux-gnu" => ["x86_64", "linux", "gnu"],
+      "x86_64-linux-musl" => ["x86_64", "linux", "musl"],
+      "x86_64-linux-uclibc" => ["x86_64", "linux", "uclibc"],
+      "arm-linux-eabi" => ["arm", "linux", "eabi"],
+      "arm-linux-gnueabi" => ["arm", "linux", "gnueabi"],
+      "arm-linux-musleabi" => ["arm", "linux", "musleabi"],
+      "arm-linux-uclibceabi" => ["arm", "linux", "uclibceabi"],
+      "x86_64-openbsd3.9" => ["x86_64",    "openbsd",   "3.9"],
+      "x86_64-openbsd4.0" => ["x86_64",    "openbsd",   "4.0"],
+      "x86_64-openbsd" => ["x86_64", "openbsd", nil],
     }
 
     test_cases.each do |arch, expected|

data/test/rubygems/test_gem_remote_fetcher.rb

@@ -1174,10 +1174,10 @@ PeIQQkFng2VVot/WAQbv3ePqWq07g1BBcwIBAg==
   def start_server(data)
     null_logger = NilLog.new
     s = WEBrick::HTTPServer.new(
-      :Port            => 0,
-      :DocumentRoot    => nil,
-      :Logger          => null_logger,
-      :AccessLog       => null_logger
+      :Port => 0,
+      :DocumentRoot => nil,
+      :Logger => null_logger,
+      :AccessLog => null_logger
     )
     s.mount_proc("/kill") {|req, res| s.shutdown }
     s.mount_proc("/yaml") do |req, res|

data/test/rubygems/test_gem_request_set.rb

@@ -110,7 +110,7 @@ Gems to install:
     end
 
     options = {
-      :gemdeps     => "gem.deps.rb",
+      :gemdeps => "gem.deps.rb",
       :install_dir => "#{@gemhome}2",
     }
 
@@ -575,7 +575,7 @@ ruby "0"
     rs.resolve
 
     options = {
-      :development         => true,
+      :development => true,
       :development_shallow => true,
     }
 

data/test/rubygems/test_gem_requirement.rb

@@ -83,7 +83,7 @@ class TestGemRequirement < Gem::TestCase
       Gem::Requirement.parse(Gem::Version.new("2"))
   end
 
-  if RUBY_VERSION >= "2.5" && !(Gem.java_platform? && ENV["JRUBY_OPTS"] =~ /--debug/)
+  if !(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_resolver_api_set.rb

@@ -36,9 +36,9 @@ class TestGemResolverAPISet < Gem::TestCase
     spec_fetcher
 
     data = [
-      { :name         => "a",
-        :number       => "1",
-        :platform     => "ruby",
+      { :name => "a",
+        :number => "1",
+        :platform => "ruby",
         :dependencies => [] },
     ]
 
@@ -59,13 +59,13 @@ class TestGemResolverAPISet < Gem::TestCase
     spec_fetcher
 
     data = [
-      { :name         => "a",
-        :number       => "1",
-        :platform     => "ruby",
+      { :name => "a",
+        :number => "1",
+        :platform => "ruby",
         :dependencies => [] },
-      { :name         => "a",
-        :number       => "2.a",
-        :platform     => "ruby",
+      { :name => "a",
+        :number => "2.a",
+        :platform => "ruby",
         :dependencies => [] },
     ]
 
@@ -88,9 +88,9 @@ class TestGemResolverAPISet < Gem::TestCase
     spec_fetcher
 
     data = [
-      { :name         => "a",
-        :number       => "1",
-        :platform     => "ruby",
+      { :name => "a",
+        :number => "1",
+        :platform => "ruby",
         :dependencies => [] },
     ]
 

data/test/rubygems/test_gem_resolver_api_specification.rb

@@ -5,8 +5,8 @@ class TestGemResolverAPISpecification < Gem::TestCase
   def test_initialize
     set = Gem::Resolver::APISet.new
     data = {
-      :name     => "rails",
-      :number   => "3.0.3",
+      :name => "rails",
+      :number => "3.0.3",
       :platform => Gem::Platform.local.to_s,
       :dependencies => [
         ["bundler",  "~> 1.0"],
@@ -44,8 +44,8 @@ class TestGemResolverAPISpecification < Gem::TestCase
     set = Gem::Resolver::APISet.new repo
 
     data = {
-      :name     => "rails",
-      :number   => "3.0.3",
+      :name => "rails",
+      :number => "3.0.3",
       :platform => "ruby",
       :dependencies => [
         ["bundler",  "~> 1.0"],
@@ -71,8 +71,8 @@ class TestGemResolverAPISpecification < Gem::TestCase
   def test_installable_platform_eh
     set = Gem::Resolver::APISet.new
     data = {
-      :name     => "a",
-      :number   => "1",
+      :name => "a",
+      :number => "1",
       :platform => "ruby",
       :dependencies => [],
     }
@@ -82,8 +82,8 @@ class TestGemResolverAPISpecification < Gem::TestCase
     assert a_spec.installable_platform?
 
     data = {
-      :name     => "b",
-      :number   => "1",
+      :name => "b",
+      :number => "1",
       :platform => "cpu-other_platform-1",
       :dependencies => [],
     }
@@ -93,8 +93,8 @@ class TestGemResolverAPISpecification < Gem::TestCase
     refute b_spec.installable_platform?
 
     data = {
-      :name     => "c",
-      :number   => "1",
+      :name => "c",
+      :number => "1",
       :platform => Gem::Platform.local.to_s,
       :dependencies => [],
     }
@@ -107,9 +107,9 @@ class TestGemResolverAPISpecification < Gem::TestCase
   def test_source
     set = Gem::Resolver::APISet.new
     data = {
-      :name         => "a",
-      :number       => "1",
-      :platform     => "ruby",
+      :name => "a",
+      :number => "1",
+      :platform => "ruby",
       :dependencies => [],
     }
 
@@ -126,9 +126,9 @@ class TestGemResolverAPISpecification < Gem::TestCase
     dep_uri = URI(@gem_repo) + "info"
     set = Gem::Resolver::APISet.new dep_uri
     data = {
-      :name         => "a",
-      :number       => "1",
-      :platform     => "ruby",
+      :name => "a",
+      :number => "1",
+      :platform => "ruby",
       :dependencies => [],
     }
 
@@ -150,9 +150,9 @@ class TestGemResolverAPISpecification < Gem::TestCase
     dep_uri = URI(@gem_repo) + "info"
     set = Gem::Resolver::APISet.new dep_uri
     data = {
-      :name         => "j",
-      :number       => "1",
-      :platform     => "jruby",
+      :name => "j",
+      :number => "1",
+      :platform => "jruby",
       :dependencies => [],
     }
 

data/test/rubygems/test_gem_resolver_git_specification.rb

@@ -63,7 +63,7 @@ class TestGemResolverGitSpecification < Gem::TestCase
 
   def test_install_extension
     pend if Gem.java_platform?
-    pend if /mswin/ =~ RUBY_PLATFORM && ENV.key?("GITHUB_ACTIONS") # not working from the beginning
+    pend if RUBY_PLATFORM.include?("mswin") && ENV.key?("GITHUB_ACTIONS") # not working from the beginning
     name, _, repository, = git_gem "a", 1 do |s|
       s.extensions << "ext/extconf.rb"
     end

data/test/rubygems/test_gem_security_policy.rb

@@ -43,22 +43,22 @@ class TestGemSecurityPolicy < Gem::TestCase
 
     @chain = Gem::Security::Policy.new(
       "Chain",
-      :verify_data   => true,
+      :verify_data => true,
       :verify_signer => true,
-      :verify_chain  => true,
-      :verify_root   => false,
-      :only_trusted  => false,
-      :only_signed   => false
+      :verify_chain => true,
+      :verify_root => false,
+      :only_trusted => false,
+      :only_signed => false
     )
 
     @root = Gem::Security::Policy.new(
       "Root",
-      :verify_data   => true,
+      :verify_data => true,
       :verify_signer => true,
-      :verify_chain  => true,
-      :verify_root   => true,
-      :only_trusted  => false,
-      :only_signed   => false
+      :verify_chain => true,
+      :verify_root => true,
+      :only_trusted => false,
+      :only_signed => false
     )
   end
 

data/test/rubygems/test_gem_security_trust_dir.rb

@@ -70,7 +70,7 @@ class TestGemSecurityTrustDir < Gem::TestCase
     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
@@ -91,7 +91,7 @@ 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

data/test/rubygems/test_gem_specification.rb

@@ -1866,9 +1866,9 @@ dependencies: []
 
   def test_full_name_windows
     test_cases = {
-      "i386-mswin32"      => "a-1-x86-mswin32-60",
-      "i386-mswin32_80"   => "a-1-x86-mswin32-80",
-      "i386-mingw32"      => "a-1-x86-mingw32",
+      "i386-mswin32" => "a-1-x86-mswin32-60",
+      "i386-mswin32_80" => "a-1-x86-mswin32-80",
+      "i386-mingw32" => "a-1-x86-mingw32",
     }
 
     test_cases.each do |arch, expected|
@@ -1969,10 +1969,10 @@ dependencies: []
     assert_equal Gem::Platform::RUBY, @a1.platform
 
     test_cases = {
-      "i386-mswin32"    => ["x86", "mswin32", "60"],
+      "i386-mswin32" => ["x86", "mswin32", "60"],
       "i386-mswin32_80" => ["x86", "mswin32", "80"],
-      "i386-mingw32"    => ["x86", "mingw32", nil ],
-      "x86-darwin8"     => ["x86", "darwin",  "8" ],
+      "i386-mingw32" => ["x86", "mingw32", nil ],
+      "x86-darwin8" => ["x86", "darwin", "8" ],
     }
 
     test_cases.each do |arch, expected|
@@ -2276,15 +2276,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = "#{Gem::VERSION}".freeze
   s.summary = "this is a summary".freeze
 
-  if s.respond_to? :specification_version then
-    s.specification_version = #{Gem::Specification::CURRENT_SPECIFICATION_VERSION}
-  end
+  s.specification_version = #{Gem::Specification::CURRENT_SPECIFICATION_VERSION}
 
-  if s.respond_to? :add_runtime_dependency then
-    s.add_runtime_dependency(%q<b>.freeze, [\"= 1\"])
-  else
-    s.add_dependency(%q<b>.freeze, [\"= 1\"])
-  end
+  s.add_runtime_dependency(%q<b>.freeze, [\"= 1\"])
 end
     SPEC
 
@@ -2356,15 +2350,9 @@ Gem::Specification.new do |s|
 
   s.installed_by_version = "#{Gem::VERSION}" if s.respond_to? :installed_by_version
 
-  if s.respond_to? :specification_version then
-    s.specification_version = #{Gem::Specification::CURRENT_SPECIFICATION_VERSION}
-  end
+  s.specification_version = #{Gem::Specification::CURRENT_SPECIFICATION_VERSION}
 
-  if s.respond_to? :add_runtime_dependency then
-    s.add_runtime_dependency(%q<b>.freeze, [\"= 1\"])
-  else
-    s.add_dependency(%q<b>.freeze, [\"= 1\"])
-  end
+  s.add_runtime_dependency(%q<b>.freeze, [\"= 1\"])
 end
     SPEC
 
@@ -2415,19 +2403,11 @@ Gem::Specification.new do |s|
   s.summary = "this is a summary".freeze
   s.test_files = ["test/suite.rb".freeze]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
-  end
+  s.specification_version = 4
 
-  if s.respond_to? :add_runtime_dependency then
-    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\"])
-  else
-    s.add_dependency(%q<rake>.freeze, [\"> 0.4\"])
-    s.add_dependency(%q<jabber4r>.freeze, [\"> 0.0.0\"])
-    s.add_dependency(%q<pqa>.freeze, [\"> 0.4\", \"<= 0.6\"])
-  end
+  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\"])
 end
     SPEC
 
@@ -2728,6 +2708,39 @@ duplicate dependency on c (>= 1.2.3, development), (~> 1.2) use:
     end
   end
 
+  def test_validate_rust_extension_have_missing_cargo_toml_error
+    util_setup_validate
+
+    Dir.chdir @tempdir do
+      @a1.extensions = ["Cargo.toml"]
+      File.write File.join(@tempdir, "Cargo.toml"), ""
+
+      e = assert_raise Gem::InvalidSpecificationException do
+        use_ui @ui do
+          @a1.validate
+        end
+      end
+
+      assert_match(/but Cargo.lock is not part of the gem files/, e.message)
+    end
+  end
+
+  def test_validate_rust_extension_have_no_missing_cargo_toml_error
+    util_setup_validate
+
+    Dir.chdir @tempdir do
+      @a1.extensions = ["Cargo.toml"]
+      @a1.files << "Cargo.toml"
+      @a1.files << "Cargo.lock"
+      File.write File.join(@tempdir, "Cargo.toml"), ""
+      File.write File.join(@tempdir, "Cargo.lock"), ""
+
+      use_ui @ui do
+        @a1.validate
+      end
+    end
+  end
+
   def test_validate_description
     util_setup_validate
 
@@ -3469,10 +3482,10 @@ Did you mean 'Ruby'?
       @m1 = quick_gem "m", "1" do |s|
         s.files = %w[lib/code.rb]
         s.metadata = {
-          "one"          => "two",
-          "home"         => "three",
+          "one" => "two",
+          "home" => "three",
           "homepage_uri" => "https://example.com/user/repo",
-          "funding_uri"  => "https://example.com/donate",
+          "funding_uri" => "https://example.com/donate",
         }
       end
 

data/test/rubygems/test_gem_uninstaller.rb

@@ -372,7 +372,7 @@ create_makefile '#{@spec.name}'
     @user_spec = Gem::Specification.find_by_name "b"
 
     uninstaller = Gem::Uninstaller.new(@user_spec.name,
-                                       :executables  => true,
+                                       :executables => true,
                                        :user_install => true)
 
     gem_dir = File.join @user_spec.gem_dir