rubygems-update 3.3.18 → 3.3.22

data/test/rubygems/test_gem_util.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
-require_relative 'helper'
-require 'rubygems/util'
+require_relative "helper"
+require "rubygems/util"
 
 class TestGemUtil < Gem::TestCase
   def test_class_popen
     pend "popen with a block does not behave well on jruby" if Gem.java_platform?
-    assert_equal "0\n", Gem::Util.popen(*ruby_with_rubygems_in_load_path, '-e', 'p 0')
+    assert_equal "0\n", Gem::Util.popen(*ruby_with_rubygems_in_load_path, "-e", "p 0")
 
     assert_raise Errno::ECHILD do
       Process.wait(-1)
@@ -16,7 +16,7 @@ class TestGemUtil < Gem::TestCase
     pend if Gem.java_platform?
     Gem::Deprecate.skip_during do
       out, err = capture_output do
-        Gem::Util.silent_system(*ruby_with_rubygems_in_load_path, '-e', 'puts "hello"; warn "hello"')
+        Gem::Util.silent_system(*ruby_with_rubygems_in_load_path, "-e", 'puts "hello"; warn "hello"')
       end
       assert_empty out
       assert_empty err
@@ -24,35 +24,35 @@ class TestGemUtil < Gem::TestCase
   end
 
   def test_traverse_parents
-    FileUtils.mkdir_p 'a/b/c'
+    FileUtils.mkdir_p "a/b/c"
 
-    enum = Gem::Util.traverse_parents 'a/b/c'
+    enum = Gem::Util.traverse_parents "a/b/c"
 
-    assert_equal File.join(@tempdir, 'a/b/c'), enum.next
-    assert_equal File.join(@tempdir, 'a/b'),   enum.next
-    assert_equal File.join(@tempdir, 'a'),     enum.next
+    assert_equal File.join(@tempdir, "a/b/c"), enum.next
+    assert_equal File.join(@tempdir, "a/b"),   enum.next
+    assert_equal File.join(@tempdir, "a"),     enum.next
     loop { break if enum.next.nil? } # exhaust the enumerator
   end
 
   def test_traverse_parents_does_not_crash_on_permissions_error
-    pend 'skipped on MS Windows (chmod has no effect)' if win_platform? || java_platform?
+    pend "skipped on MS Windows (chmod has no effect)" if win_platform? || java_platform?
 
-    FileUtils.mkdir_p 'd/e/f'
+    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(0666, "d/e")
 
-    pend 'skipped in root privilege' if Process.uid.zero?
+    pend "skipped in root privilege" if Process.uid.zero?
 
-    paths = Gem::Util.traverse_parents('d/e/f').to_a
+    paths = Gem::Util.traverse_parents("d/e/f").to_a
 
-    assert_equal File.join(@tempdir, 'd'), paths[0]
+    assert_equal File.join(@tempdir, "d"), paths[0]
     assert_equal @tempdir, paths[1]
     assert_equal File.realpath("..", @tempdir), paths[2]
     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(0775, "d/e") unless win_platform? || java_platform?
   end
 
   def test_linked_list_find
@@ -64,19 +64,19 @@ class TestGemUtil < Gem::TestCase
   end
 
   def test_glob_files_in_dir
-    FileUtils.mkdir_p 'g'
-    FileUtils.touch File.join('g', 'h.rb')
-    FileUtils.touch File.join('g', 'i.rb')
+    FileUtils.mkdir_p "g"
+    FileUtils.touch File.join("g", "h.rb")
+    FileUtils.touch File.join("g", "i.rb")
 
     expected_paths = [
-      File.join(@tempdir, 'g/h.rb'),
-      File.join(@tempdir, 'g/i.rb'),
+      File.join(@tempdir, "g/h.rb"),
+      File.join(@tempdir, "g/i.rb"),
     ]
 
-    files_with_absolute_base = Gem::Util.glob_files_in_dir('*.rb', File.join(@tempdir, 'g'))
+    files_with_absolute_base = Gem::Util.glob_files_in_dir("*.rb", File.join(@tempdir, "g"))
     assert_equal expected_paths.sort, files_with_absolute_base.sort
 
-    files_with_relative_base = Gem::Util.glob_files_in_dir('*.rb', 'g')
+    files_with_relative_base = Gem::Util.glob_files_in_dir("*.rb", "g")
     assert_equal expected_paths.sort, files_with_relative_base.sort
   end
 

data/test/rubygems/test_gem_validator.rb

@@ -11,21 +11,21 @@ class TestGemValidator < Gem::TestCase
   end
 
   def test_alien
-    @spec = quick_gem 'a' do |s|
+    @spec = quick_gem "a" do |s|
       s.files = %w[lib/a.rb lib/b.rb]
     end
 
     util_build_gem @spec
 
-    FileUtils.rm    File.join(@spec.gem_dir, 'lib/b.rb')
-    FileUtils.touch File.join(@spec.gem_dir, 'lib/c.rb')
+    FileUtils.rm    File.join(@spec.gem_dir, "lib/b.rb")
+    FileUtils.touch File.join(@spec.gem_dir, "lib/c.rb")
 
-    alien = @validator.alien 'a'
+    alien = @validator.alien "a"
 
     expected = {
       @spec.file_name => [
-        Gem::Validator::ErrorData.new('lib/b.rb', 'Missing file'),
-        Gem::Validator::ErrorData.new('lib/c.rb', 'Extra file'),
+        Gem::Validator::ErrorData.new("lib/b.rb", "Missing file"),
+        Gem::Validator::ErrorData.new("lib/c.rb", "Extra file"),
       ],
     }
 
@@ -33,9 +33,9 @@ class TestGemValidator < Gem::TestCase
   end
 
   def test_alien_default
-    new_default_spec 'c', 1, nil, 'lib/c.rb'
+    new_default_spec "c", 1, nil, "lib/c.rb"
 
-    alien = @validator.alien 'c'
+    alien = @validator.alien "c"
 
     assert_empty alien
   end

data/test/rubygems/test_gem_version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require_relative 'helper'
+require_relative "helper"
 require "rubygems/version"
 
 class TestGemVersion < Gem::TestCase
@@ -32,12 +32,19 @@ class TestGemVersion < Gem::TestCase
   def test_class_create
     real = Gem::Version.new(1.0)
 
-    assert_same  real, Gem::Version.create(real)
-    assert_nil   Gem::Version.create(nil)
+    assert_same real, Gem::Version.create(real)
+
+    expected = "nil versions are discouraged and will be deprecated in Rubygems 4\n"
+    actual_stdout, actual_stderr = capture_output do
+      assert_nil Gem::Version.create(nil)
+    end
+    assert_empty actual_stdout
+    assert_equal(expected, actual_stderr)
+
     assert_equal v("5.1"), Gem::Version.create("5.1")
 
-    ver = '1.1'.freeze
-    assert_equal v('1.1'), Gem::Version.create(ver)
+    ver = "1.1".freeze
+    assert_equal v("1.1"), Gem::Version.create(ver)
   end
 
   def test_class_correct
@@ -53,8 +60,8 @@ class TestGemVersion < Gem::TestCase
   end
 
   def test_class_new_subclass
-    v1 = Gem::Version.new '1'
-    v2 = V.new '1'
+    v1 = Gem::Version.new "1"
+    v2 = V.new "1"
 
     refute_same v1, v2
   end
@@ -120,10 +127,10 @@ class TestGemVersion < Gem::TestCase
     assert_prerelease "22.1.50.0.d"
     assert_prerelease "1.2.d.42"
 
-    assert_prerelease '1.A'
+    assert_prerelease "1.A"
 
-    assert_prerelease '1-1'
-    assert_prerelease '1-a'
+    assert_prerelease "1-1"
+    assert_prerelease "1-a"
 
     refute_prerelease "1.2.0"
     refute_prerelease "2.9"
@@ -199,7 +206,7 @@ class TestGemVersion < Gem::TestCase
 
   # modifying the segments of a version should not affect the segments of the cached version object
   def test_segments
-    v('9.8.7').segments[2] += 1
+    v("9.8.7").segments[2] += 1
 
     refute_version_equal "9.8.8", "9.8.7"
     assert_equal         [9,8,7], v("9.8.7").segments
@@ -212,10 +219,10 @@ class TestGemVersion < Gem::TestCase
   end
 
   def test_frozen_version
-    v = v('1.freeze.test').freeze
-    assert_less_than v, v('1')
-    assert_version_equal v('1'), v.release
-    assert_version_equal v('2'), v.bump
+    v = v("1.freeze.test").freeze
+    assert_less_than v, v("1")
+    assert_version_equal v("1"), v.release
+    assert_version_equal v("2"), v.bump
   end
 
   # Asserts that +version+ is a prerelease.

data/test/rubygems/test_gem_version_option.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
-require_relative 'helper'
-require 'rubygems/command'
-require 'rubygems/version_option'
+require_relative "helper"
+require "rubygems/command"
+require "rubygems/version_option"
 
 class TestGemVersionOption < Gem::TestCase
   def setup
     super
 
-    @cmd = Gem::Command.new 'dummy', 'dummy'
+    @cmd = Gem::Command.new "dummy", "dummy"
     @cmd.extend Gem::VersionOption
   end
 
@@ -43,8 +43,8 @@ class TestGemVersionOption < Gem::TestCase
 
     expected = [
       Gem::Platform::RUBY,
-      Gem::Platform.new('x86-freebsd6'),
-      Gem::Platform.new('x86-freebsd7'),
+      Gem::Platform.new("x86-freebsd6"),
+      Gem::Platform.new("x86-freebsd7"),
     ]
 
     assert_equal expected, Gem.platforms
@@ -69,7 +69,7 @@ class TestGemVersionOption < Gem::TestCase
 
     expected = [
       Gem::Platform::RUBY,
-      Gem::Platform.new('x86-freebsd6'),
+      Gem::Platform.new("x86-freebsd6"),
     ]
 
     assert_equal expected, Gem.platforms
@@ -84,7 +84,7 @@ class TestGemVersionOption < Gem::TestCase
       :args => [],
       :explicit_prerelease => false,
       :prerelease => false,
-      :version => Gem::Requirement.new('> 1'),
+      :version => Gem::Requirement.new("> 1"),
     }
 
     assert_equal expected, @cmd.options
@@ -93,13 +93,13 @@ class TestGemVersionOption < Gem::TestCase
   def test_version_option_compound
     @cmd.add_version_option
 
-    @cmd.handle_options ['--version', '< 1, > 0.9']
+    @cmd.handle_options ["--version", "< 1, > 0.9"]
 
     expected = {
       :args => [],
       :explicit_prerelease => false,
       :prerelease => false,
-      :version => Gem::Requirement.new('< 1', '> 0.9'),
+      :version => Gem::Requirement.new("< 1", "> 0.9"),
     }
 
     assert_equal expected, @cmd.options
@@ -108,13 +108,13 @@ class TestGemVersionOption < Gem::TestCase
   def test_multiple_version_operator_option_compound
     @cmd.add_version_option
 
-    @cmd.handle_options ['--version', '< 1', '--version', '> 0.9']
+    @cmd.handle_options ["--version", "< 1", "--version", "> 0.9"]
 
     expected = {
       :args => [],
       :explicit_prerelease => false,
       :prerelease => false,
-      :version => Gem::Requirement.new('< 1', '> 0.9'),
+      :version => Gem::Requirement.new("< 1", "> 0.9"),
     }
 
     assert_equal expected, @cmd.options
@@ -130,7 +130,7 @@ class TestGemVersionOption < Gem::TestCase
       :args => [],
       :explicit_prerelease => true,
       :prerelease => true,
-      :version => Gem::Requirement.new('> 1'),
+      :version => Gem::Requirement.new("> 1"),
     }
 
     assert_equal expected, @cmd.options
@@ -145,7 +145,7 @@ class TestGemVersionOption < Gem::TestCase
       :args => [],
       :explicit_prerelease => false,
       :prerelease => true,
-      :version => Gem::Requirement.new('> 1.a'),
+      :version => Gem::Requirement.new("> 1.a"),
     }
 
     assert_equal expected, @cmd.options
@@ -156,7 +156,7 @@ class TestGemVersionOption < Gem::TestCase
       :args => [],
       :explicit_prerelease => false,
       :prerelease => false,
-      :version => Gem::Requirement.new('> 1'),
+      :version => Gem::Requirement.new("> 1"),
     }
 
     assert_equal expected, @cmd.options

data/test/rubygems/test_kernel.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require_relative 'helper'
+require_relative "helper"
 
 class TestKernel < Gem::TestCase
   def setup
@@ -19,76 +19,76 @@ class TestKernel < Gem::TestCase
   end
 
   def test_gem
-    assert gem('a', '= 1'), "Should load"
+    assert gem("a", "= 1"), "Should load"
     assert $:.any? {|p| %r{a-1/lib} =~ p }
   end
 
   def test_gem_default
-    assert gem('a', '>= 0')
+    assert gem("a", ">= 0")
 
-    assert_equal @a2, Gem.loaded_specs['a']
+    assert_equal @a2, Gem.loaded_specs["a"]
   end
 
   def test_gem_default_re_gem
-    assert gem('a', '=1')
+    assert gem("a", "=1")
 
-    refute gem('a', '>= 0')
+    refute gem("a", ">= 0")
 
-    assert_equal @a1, Gem.loaded_specs['a']
+    assert_equal @a1, Gem.loaded_specs["a"]
   end
 
   def test_gem_re_gem_mismatch
-    assert gem('a', '=1')
+    assert gem("a", "=1")
 
     assert_raise Gem::LoadError do
-      gem('a', '= 2')
+      gem("a", "= 2")
     end
 
-    assert_equal @a1, Gem.loaded_specs['a']
+    assert_equal @a1, Gem.loaded_specs["a"]
   end
 
   def test_gem_redundant
-    assert gem('a', '= 1'), "Should load"
-    refute gem('a', '= 1'), "Should not load"
+    assert gem("a", "= 1"), "Should load"
+    refute gem("a", "= 1"), "Should not load"
     assert_equal 1, $:.select {|p| %r{a-1/lib} =~ p }.size
   end
 
   def test_gem_overlapping
-    assert gem('a', '= 1'), "Should load"
-    refute gem('a', '>= 1'), "Should not load"
+    assert gem("a", "= 1"), "Should load"
+    refute gem("a", ">= 1"), "Should not load"
     assert_equal 1, $:.select {|p| %r{a-1/lib} =~ p }.size
   end
 
   def test_gem_prerelease
-    quick_gem 'd', '1.1.a'
-    refute gem('d', '>= 1'),   'release requirement must not load prerelease'
-    assert gem('d', '>= 1.a'), 'prerelease requirement may load prerelease'
+    quick_gem "d", "1.1.a"
+    refute gem("d", ">= 1"),   "release requirement must not load prerelease"
+    assert gem("d", ">= 1.a"), "prerelease requirement may load prerelease"
   end
 
   def test_gem_env_req
-    ENV["GEM_REQUIREMENT_A"] = '~> 2.0'
-    assert_raise(Gem::MissingSpecVersionError) { gem('a', '= 1') }
-    assert gem('a', '> 1')
-    assert_equal @a2, Gem.loaded_specs['a']
+    ENV["GEM_REQUIREMENT_A"] = "~> 2.0"
+    assert_raise(Gem::MissingSpecVersionError) { gem("a", "= 1") }
+    assert gem("a", "> 1")
+    assert_equal @a2, Gem.loaded_specs["a"]
   end
 
   def test_gem_conflicting
-    assert gem('a', '= 1'), "Should load"
+    assert gem("a", "= 1"), "Should load"
 
     ex = assert_raise Gem::LoadError do
-      gem 'a', '= 2'
+      gem "a", "= 2"
     end
 
     assert_equal "can't activate a-2, already activated a-1", ex.message
     assert_match(/activated a-1/, ex.message)
-    assert_equal 'a', ex.name
+    assert_equal "a", ex.name
 
     assert $:.any? {|p| %r{a-1/lib} =~ p }
     refute $:.any? {|p| %r{a-2/lib} =~ p }
   end
 
   def test_gem_not_adding_bin
-    assert gem('a', '= 1'), "Should load"
+    assert gem("a", "= 1"), "Should load"
     refute $:.any? {|p| %r{a-1/bin} =~ p }
   end
 
@@ -110,19 +110,19 @@ class TestKernel < Gem::TestCase
   end
 
   def test_gem_bundler
-    quick_gem 'bundler', '1'
-    quick_gem 'bundler', '2.a'
+    quick_gem "bundler", "1"
+    quick_gem "bundler", "2.a"
 
-    assert gem('bundler')
+    assert gem("bundler")
     assert $:.any? {|p| %r{bundler-1/lib} =~ p }
   end
 
   def test_gem_bundler_inferred_bundler_version
     Gem::BundlerVersionFinder.stub(:bundler_version, Gem::Version.new("1")) do
-      quick_gem 'bundler', '1'
-      quick_gem 'bundler', '2.a'
+      quick_gem "bundler", "1"
+      quick_gem "bundler", "2.a"
 
-      assert gem('bundler', '>= 0.a')
+      assert gem("bundler", ">= 0.a")
       assert $:.any? {|p| %r{bundler-1/lib} =~ p }
     end
   end

data/test/rubygems/test_project_sanity.rb

@@ -5,7 +5,7 @@ require "open3"
 
 class TestProjectSanity < Gem::TestCase
   def test_manifest_is_up_to_date
-    pend unless File.exist?(File.expand_path('../../Rakefile', __dir__))
+    pend unless File.exist?(File.expand_path("../../Rakefile", __dir__))
 
     _, status = Open3.capture2e("rake check_manifest")
 

data/test/rubygems/test_remote_fetch_error.rb

@@ -1,19 +1,19 @@
 # frozen_string_literal: true
-require_relative 'helper'
+require_relative "helper"
 
 class TestRemoteFetchError < Gem::TestCase
   def test_password_redacted
-    error = Gem::RemoteFetcher::FetchError.new('There was an error fetching', 'https://user:secret@gemsource.org')
+    error = Gem::RemoteFetcher::FetchError.new("There was an error fetching", "https://user:secret@gemsource.org")
     refute_match %r{secret}, error.to_s
   end
 
   def test_invalid_url
-    error = Gem::RemoteFetcher::FetchError.new('There was an error fetching', 'https://::gemsource.org')
-    assert_equal error.to_s, 'There was an error fetching (https://::gemsource.org)'
+    error = Gem::RemoteFetcher::FetchError.new("There was an error fetching", "https://::gemsource.org")
+    assert_equal error.to_s, "There was an error fetching (https://::gemsource.org)"
   end
 
   def test_to_s
-    error = Gem::RemoteFetcher::FetchError.new('There was an error fetching', 'https://gemsource.org')
-    assert_equal error.to_s, 'There was an error fetching (https://gemsource.org)'
+    error = Gem::RemoteFetcher::FetchError.new("There was an error fetching", "https://gemsource.org")
+    assert_equal error.to_s, "There was an error fetching (https://gemsource.org)"
   end
 end