rubygems-update 3.3.26 → 3.4.18

data/test/rubygems/test_gem_request_set_lockfile_parser.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/request_set"
 require "rubygems/request_set/lockfile"
@@ -257,7 +258,7 @@ DEPENDENCIES
     write_lockfile <<-LOCKFILE
 GIT
   remote: git://example/a.git
-  revision: master
+  revision: abranch
   specs:
     a (2)
       b (>= 3)
@@ -275,7 +276,7 @@ DEPENDENCIES
       Gem::Resolver::LockSet === set
     end
 
-    refute lockfile_set, "fount a LockSet"
+    refute lockfile_set, "found a LockSet"
 
     git_set = @set.sets.find do |set|
       Gem::Resolver::GitSet === set
@@ -289,7 +290,7 @@ DEPENDENCIES
                  git_set.specs.values.first.dependencies
 
     expected = {
-      "a" => %w[git://example/a.git master],
+      "a" => %w[git://example/a.git abranch],
     }
 
     assert_equal expected, git_set.repositories
@@ -318,7 +319,7 @@ DEPENDENCIES
       Gem::Resolver::LockSet === set
     end
 
-    refute lockfile_set, "fount a LockSet"
+    refute lockfile_set, "found a LockSet"
 
     git_set = @set.sets.find do |set|
       Gem::Resolver::GitSet === set
@@ -355,7 +356,7 @@ DEPENDENCIES
       Gem::Resolver::LockSet === set
     end
 
-    refute lockfile_set, "fount a LockSet"
+    refute lockfile_set, "found a LockSet"
 
     git_set = @set.sets.find do |set|
       Gem::Resolver::GitSet === set
@@ -392,7 +393,7 @@ DEPENDENCIES
       Gem::Resolver::LockSet === set
     end
 
-    refute lockfile_set, "fount a LockSet"
+    refute lockfile_set, "found a LockSet"
 
     git_set = @set.sets.find do |set|
       Gem::Resolver::GitSet === set

data/test/rubygems/test_gem_request_set_lockfile_tokenizer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/request_set"
 require "rubygems/request_set/lockfile"

data/test/rubygems/test_gem_requirement.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/requirement"
 
@@ -83,7 +84,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.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 
 class TestGemResolver < Gem::TestCase

data/test/rubygems/test_gem_resolver_activation_request.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 
 class TestGemResolverActivationRequest < Gem::TestCase

data/test/rubygems/test_gem_resolver_api_set.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 
 class TestGemResolverAPISet < Gem::TestCase
@@ -36,9 +37,9 @@ class TestGemResolverAPISet < Gem::TestCase
     spec_fetcher
 
     data = [
-      { :name         => "a",
-        :number       => "1",
-        :platform     => "ruby",
+      { :name => "a",
+        :number => "1",
+        :platform => "ruby",
         :dependencies => [] },
     ]
 
@@ -59,13 +60,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 +89,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

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 
 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 +45,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 +72,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 +83,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 +94,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 +108,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 +127,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 +151,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_best_set.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 
 class TestGemResolverBestSet < Gem::TestCase

data/test/rubygems/test_gem_resolver_composed_set.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 
 class TestGemResolverComposedSet < Gem::TestCase

data/test/rubygems/test_gem_resolver_conflict.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 
 class TestGemResolverConflict < Gem::TestCase

data/test/rubygems/test_gem_resolver_dependency_request.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 
 class TestGemResolverDependencyRequest < Gem::TestCase

data/test/rubygems/test_gem_resolver_git_set.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 
 class TestGemResolverGitSet < Gem::TestCase
@@ -13,7 +14,7 @@ class TestGemResolverGitSet < Gem::TestCase
   def test_add_git_gem
     name, version, repository, = git_gem
 
-    @set.add_git_gem name, repository, "master", false
+    @set.add_git_gem name, repository, nil, false
 
     dependency = dep "a"
 
@@ -27,7 +28,7 @@ class TestGemResolverGitSet < Gem::TestCase
   def test_add_git_gem_submodules
     name, _, repository, = git_gem
 
-    @set.add_git_gem name, repository, "master", true
+    @set.add_git_gem name, repository, nil, true
 
     dependency = dep "a"
 
@@ -57,7 +58,7 @@ class TestGemResolverGitSet < Gem::TestCase
   def test_find_all
     name, _, repository, = git_gem
 
-    @set.add_git_gem name, repository, "master", false
+    @set.add_git_gem name, repository, nil, false
 
     dependency = dep "a", "~> 1.0"
     req = Gem::Resolver::DependencyRequest.new dependency, nil
@@ -73,7 +74,7 @@ class TestGemResolverGitSet < Gem::TestCase
   def test_find_all_local
     name, _, repository, = git_gem
 
-    @set.add_git_gem name, repository, "master", false
+    @set.add_git_gem name, repository, nil, false
     @set.remote = false
 
     dependency = dep "a", "~> 1.0"
@@ -88,7 +89,7 @@ class TestGemResolverGitSet < Gem::TestCase
   def test_find_all_prerelease
     name, _, repository, = git_gem "a", "1.a"
 
-    @set.add_git_gem name, repository, "master", false
+    @set.add_git_gem name, repository, nil, false
 
     dependency = dep "a", ">= 0"
     req = Gem::Resolver::DependencyRequest.new dependency, nil
@@ -122,7 +123,7 @@ class TestGemResolverGitSet < Gem::TestCase
   def test_prefetch
     name, _, repository, = git_gem
 
-    @set.add_git_gem name, repository, "master", false
+    @set.add_git_gem name, repository, nil, false
 
     dependency = dep name
     req = Gem::Resolver::DependencyRequest.new dependency, nil
@@ -136,7 +137,7 @@ class TestGemResolverGitSet < Gem::TestCase
   def test_prefetch_cache
     name, _, repository, = git_gem
 
-    @set.add_git_gem name, repository, "master", false
+    @set.add_git_gem name, repository, nil, false
 
     dependency = dep name
     req = Gem::Resolver::DependencyRequest.new dependency, nil
@@ -154,7 +155,7 @@ class TestGemResolverGitSet < Gem::TestCase
   def test_prefetch_filter
     name, _, repository, = git_gem
 
-    @set.add_git_gem name, repository, "master", false
+    @set.add_git_gem name, repository, nil, false
 
     dependency = dep "b"
     req = Gem::Resolver::DependencyRequest.new dependency, nil
@@ -168,7 +169,7 @@ class TestGemResolverGitSet < Gem::TestCase
   def test_prefetch_root_dir
     name, _, repository, = git_gem
 
-    @set.add_git_gem name, repository, "master", false
+    @set.add_git_gem name, repository, nil, false
 
     dependency = dep name
     req = Gem::Resolver::DependencyRequest.new dependency, nil

data/test/rubygems/test_gem_resolver_git_specification.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/installer"
 
@@ -63,7 +64,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 "terminates on mswin" if vc_windows? && ruby_repo?
     name, _, repository, = git_gem "a", 1 do |s|
       s.extensions << "ext/extconf.rb"
     end
@@ -84,7 +85,7 @@ class TestGemResolverGitSpecification < Gem::TestCase
       system @git, "commit", "--quiet", "-m", "Add extension files"
     end
 
-    source = Gem::Source::Git.new name, repository, "master", true
+    source = Gem::Source::Git.new name, repository, nil, true
 
     spec = source.specs.first
 

data/test/rubygems/test_gem_resolver_index_set.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 
 class TestGemResolverIndexSet < Gem::TestCase

data/test/rubygems/test_gem_resolver_index_specification.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/available_set"
 

data/test/rubygems/test_gem_resolver_installed_specification.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 
 class TestGemResolverInstalledSpecification < Gem::TestCase

data/test/rubygems/test_gem_resolver_installer_set.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 
 class TestGemResolverInstallerSet < Gem::TestCase

data/test/rubygems/test_gem_resolver_local_specification.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/available_set"
 

data/test/rubygems/test_gem_resolver_lock_set.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 
 class TestGemResolverLockSet < Gem::TestCase

data/test/rubygems/test_gem_resolver_lock_specification.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/installer"
 require "rubygems/resolver"

data/test/rubygems/test_gem_resolver_requirement_list.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 
 class TestGemResolverRequirementList < Gem::TestCase

data/test/rubygems/test_gem_resolver_specification.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 
 class TestGemResolverSpecification < Gem::TestCase

data/test/rubygems/test_gem_resolver_vendor_set.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 
 class TestGemResolverVendorSet < Gem::TestCase

data/test/rubygems/test_gem_resolver_vendor_specification.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 
 class TestGemResolverVendorSpecification < Gem::TestCase

data/test/rubygems/test_gem_security.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/security"
 

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_signer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 
 unless Gem::HAVE_OPENSSL

data/test/rubygems/test_gem_security_trust_dir.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 
 unless Gem::HAVE_OPENSSL
@@ -70,7 +71,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 +92,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_silent_ui.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/user_interaction"
 require "timeout"

data/test/rubygems/test_gem_source.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/source"
 require "rubygems/indexer"
@@ -30,7 +31,7 @@ class TestGemSource < Gem::TestCase
   def test_initialize_git
     repository = "git@example:a.git"
 
-    source = Gem::Source::Git.new "a", repository, "master", false
+    source = Gem::Source::Git.new "a", repository, nil, false
 
     assert_equal repository, source.uri
   end

data/test/rubygems/test_gem_source_fetch_problem.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 
 class TestGemSourceFetchProblem < Gem::TestCase

data/test/rubygems/test_gem_source_git.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/source"
 
@@ -10,7 +11,7 @@ class TestGemSourceGit < Gem::TestCase
 
     @hash = Digest::SHA1.hexdigest @repository
 
-    @source = Gem::Source::Git.new @name, @repository, "master", false
+    @source = Gem::Source::Git.new @name, @repository, nil, false
   end
 
   def test_base_dir
@@ -27,12 +28,13 @@ class TestGemSourceGit < Gem::TestCase
     assert_path_exist File.join @source.install_dir, "a.gemspec"
   end
 
-  def test_checkout_master
+  def test_checkout_default
     Dir.chdir @repository do
+      default_branch = Gem::Util.popen(@git, "branch", "--show-current").strip
       system @git, "checkout", "-q", "-b", "other"
       system @git, "mv",             "a.gemspec", "b.gemspec"
       system @git, "commit",   "-q", "-a", "-m", "rename gemspec"
-      system @git, "checkout", "-q", "master"
+      system @git, "checkout", "-q", default_branch
     end
 
     @source = Gem::Source::Git.new @name, @repository, "other", false
@@ -68,7 +70,7 @@ class TestGemSourceGit < Gem::TestCase
     # https://lore.kernel.org/lkml/xmqq4jw1uku5.fsf@gitster.g/
     system(@git, *%W[config --global protocol.file.allow always])
 
-    source = Gem::Source::Git.new @name, @repository, "master", true
+    source = Gem::Source::Git.new @name, @repository, nil, true
 
     git_gem "b"
 
@@ -92,7 +94,7 @@ class TestGemSourceGit < Gem::TestCase
     assert_path_exist @source.repo_cache_dir
 
     Dir.chdir @source.repo_cache_dir do
-      assert_equal @head, Gem::Util.popen(@git, "rev-parse", "master").strip
+      assert_equal @head, Gem::Util.popen(@git, "rev-parse", "HEAD").strip
     end
   end
 
@@ -178,7 +180,7 @@ class TestGemSourceGit < Gem::TestCase
       system @git, "checkout", "--quiet", "-b", "other"
     end
 
-    master_head = @head
+    default_head = @head
 
     git_gem "a", 2
 
@@ -186,7 +188,7 @@ class TestGemSourceGit < Gem::TestCase
 
     source.cache
 
-    refute_equal master_head, source.rev_parse
+    refute_equal default_head, source.rev_parse
 
     source = Gem::Source::Git.new @name, @repository, "nonexistent", false
 
@@ -209,7 +211,7 @@ class TestGemSourceGit < Gem::TestCase
   end
 
   def test_spaceship
-    git       = Gem::Source::Git.new "a", "git/a", "master", false
+    git       = Gem::Source::Git.new "a", "git/a", nil, false
     remote    = Gem::Source.new @gem_repo
     installed = Gem::Source::Installed.new
     vendor    = Gem::Source::Vendor.new "vendor/foo"
@@ -227,7 +229,7 @@ class TestGemSourceGit < Gem::TestCase
   end
 
   def test_specs
-    source = Gem::Source::Git.new @name, @repository, "master", true
+    source = Gem::Source::Git.new @name, @repository, nil, true
 
     Dir.chdir "git/a" do
       FileUtils.mkdir "b"
@@ -278,7 +280,7 @@ class TestGemSourceGit < Gem::TestCase
   end
 
   def test_specs_local
-    source = Gem::Source::Git.new @name, @repository, "master", true
+    source = Gem::Source::Git.new @name, @repository, nil, true
     source.remote = false
 
     capture_output do
@@ -294,13 +296,13 @@ class TestGemSourceGit < Gem::TestCase
     assert_equal @hash, @source.uri_hash
 
     source =
-      Gem::Source::Git.new "a", "http://git@example/repo.git", "master", false
+      Gem::Source::Git.new "a", "http://git@example/repo.git", nil, false
 
     assert_equal "291c4caac7feba8bb64c297987028acb3dde6cfe",
                  source.uri_hash
 
     source =
-      Gem::Source::Git.new "a", "HTTP://git@EXAMPLE/repo.git", "master", false
+      Gem::Source::Git.new "a", "HTTP://git@EXAMPLE/repo.git", nil, false
 
     assert_equal "291c4caac7feba8bb64c297987028acb3dde6cfe",
                  source.uri_hash