rubygems-update 3.0.3 → 3.4.7

data/test/rubygems/test_gem_package_tar_writer.rb

@@ -1,14 +1,17 @@
 # frozen_string_literal: true
-require 'rubygems/package/tar_test_case'
-require 'rubygems/package/tar_writer'
-require 'minitest/mock'
+require_relative "package/tar_test_case"
+require "rubygems/package/tar_writer"
 
 class TestGemPackageTarWriter < Gem::Package::TarTestCase
-
   def setup
     super
 
-    @data = 'abcde12345'
+    # Setting `@default_source_date_epoch` to `nil` effectively resets the
+    # value used for `Gem.source_date_epoch` whenever `$SOURCE_DATE_EPOCH`
+    # is not set.
+    Gem.instance_variable_set(:'@default_source_date_epoch', nil)
+
+    @data = "abcde12345"
     @io = TempIO.new
     @tar_writer = Gem::Package::TarWriter.new @io
     @epoch = ENV["SOURCE_DATE_EPOCH"]
@@ -25,9 +28,11 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
 
   def test_add_file
     Time.stub :now, Time.at(1458518157) do
-      @tar_writer.add_file 'x', 0644 do |f| f.write 'a' * 10 end
+      @tar_writer.add_file "x", 0644 do |f|
+        f.write "a" * 10
+      end
 
-      assert_headers_equal(tar_file_header('x', '', 0644, 10, Time.now),
+      assert_headers_equal(tar_file_header("x", "", 0644, 10, Time.now),
                          @io.string[0, 512])
     end
     assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
@@ -37,18 +42,18 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
   def test_add_file_source_date_epoch
     ENV["SOURCE_DATE_EPOCH"] = "123456789"
     Time.stub :now, Time.at(1458518157) do
-      @tar_writer.mkdir 'foo', 0644
+      @tar_writer.mkdir "foo", 0644
 
-      assert_headers_equal tar_dir_header('foo', '', 0644, Time.at(ENV["SOURCE_DATE_EPOCH"].to_i).utc),
+      assert_headers_equal tar_dir_header("foo", "", 0644, Time.at(ENV["SOURCE_DATE_EPOCH"].to_i).utc),
                            @io.string[0, 512]
     end
   end
 
   def test_add_symlink
     Time.stub :now, Time.at(1458518157) do
-      @tar_writer.add_symlink 'x', 'y', 0644
+      @tar_writer.add_symlink "x", "y", 0644
 
-      assert_headers_equal(tar_symlink_header('x', '', 0644, Time.now, 'y'),
+      assert_headers_equal(tar_symlink_header("x", "", 0644, Time.now, "y"),
                          @io.string[0, 512])
     end
     assert_equal 512, @io.pos
@@ -57,30 +62,30 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
   def test_add_symlink_source_date_epoch
     ENV["SOURCE_DATE_EPOCH"] = "123456789"
     Time.stub :now, Time.at(1458518157) do
-      @tar_writer.add_symlink 'x', 'y', 0644
+      @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'),
+      assert_headers_equal(tar_symlink_header("x", "", 0644, Time.at(ENV["SOURCE_DATE_EPOCH"].to_i).utc, "y"),
                          @io.string[0, 512])
     end
   end
 
   def test_add_file_digest
-    digest_algorithms = Digest::SHA1, Digest::SHA512
+    digest_algorithms = Digest::SHA1.new, Digest::SHA512.new
 
     Time.stub :now, Time.at(1458518157) do
-      digests = @tar_writer.add_file_digest 'x', 0644, digest_algorithms do |io|
-        io.write 'a' * 10
+      digests = @tar_writer.add_file_digest "x", 0644, digest_algorithms do |io|
+        io.write "a" * 10
       end
 
-      assert_equal '3495ff69d34671d1e15b33a63c1379fdedd3a32a',
-                   digests['SHA1'].hexdigest
-      assert_equal '4714870aff6c97ca09d135834fdb58a6389a50c1' \
-                   '1fef8ec4afef466fb60a23ac6b7a9c92658f14df' \
-                   '4993d6b40a4e4d8424196afc347e97640d68de61' \
-                   'e1cf14b0',
-                   digests['SHA512'].hexdigest
+      assert_equal "3495ff69d34671d1e15b33a63c1379fdedd3a32a",
+                   digests["SHA1"].hexdigest
+      assert_equal "4714870aff6c97ca09d135834fdb58a6389a50c1" \
+                   "1fef8ec4afef466fb60a23ac6b7a9c92658f14df" \
+                   "4993d6b40a4e4d8424196afc347e97640d68de61" \
+                   "e1cf14b0",
+                   digests["SHA512"].hexdigest
 
-      assert_headers_equal(tar_file_header('x', '', 0644, 10, Time.now),
+      assert_headers_equal(tar_file_header("x", "", 0644, 10, Time.now),
                          @io.string[0, 512])
     end
     assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
@@ -88,22 +93,22 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
   end
 
   def test_add_file_digest_multiple
-    digest_algorithms = [Digest::SHA1, Digest::SHA512]
+    digest_algorithms = [Digest::SHA1.new, Digest::SHA512.new]
 
     Time.stub :now, Time.at(1458518157) do
-      digests = @tar_writer.add_file_digest 'x', 0644, digest_algorithms do |io|
-        io.write 'a' * 10
+      digests = @tar_writer.add_file_digest "x", 0644, digest_algorithms do |io|
+        io.write "a" * 10
       end
 
-      assert_equal '3495ff69d34671d1e15b33a63c1379fdedd3a32a',
-                   digests['SHA1'].hexdigest
-      assert_equal '4714870aff6c97ca09d135834fdb58a6389a50c1' \
-                   '1fef8ec4afef466fb60a23ac6b7a9c92658f14df' \
-                   '4993d6b40a4e4d8424196afc347e97640d68de61' \
-                   'e1cf14b0',
-                   digests['SHA512'].hexdigest
+      assert_equal "3495ff69d34671d1e15b33a63c1379fdedd3a32a",
+                   digests["SHA1"].hexdigest
+      assert_equal "4714870aff6c97ca09d135834fdb58a6389a50c1" \
+                   "1fef8ec4afef466fb60a23ac6b7a9c92658f14df" \
+                   "4993d6b40a4e4d8424196afc347e97640d68de61" \
+                   "e1cf14b0",
+                   digests["SHA512"].hexdigest
 
-      assert_headers_equal(tar_file_header('x', '', 0644, 10, Time.now),
+      assert_headers_equal(tar_file_header("x", "", 0644, 10, Time.now),
                            @io.string[0, 512])
     end
     assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
@@ -111,27 +116,26 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
   end
 
   def test_add_file_signer
-    skip 'openssl is missing' unless defined?(OpenSSL::SSL)
+    pend "openssl is missing" unless Gem::HAVE_OPENSSL
 
     signer = Gem::Security::Signer.new PRIVATE_KEY, [PUBLIC_CERT]
 
     Time.stub :now, Time.at(1458518157) do
-      @tar_writer.add_file_signed 'x', 0644, signer do |io|
-        io.write 'a' * 10
+      @tar_writer.add_file_signed "x", 0644, signer do |io|
+        io.write "a" * 10
       end
 
-      assert_headers_equal(tar_file_header('x', '', 0644, 10, Time.now),
+      assert_headers_equal(tar_file_header("x", "", 0644, 10, Time.now),
                            @io.string[0, 512])
 
-
       assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
 
       digest = signer.digest_algorithm.new
-      digest.update 'a' * 10
+      digest.update "a" * 10
 
       signature = signer.sign digest.digest
 
-      assert_headers_equal(tar_file_header('x.sig', '', 0444, signature.length,
+      assert_headers_equal(tar_file_header("x.sig", "", 0444, signature.length,
                                            Time.now),
                            @io.string[1024, 512])
       assert_equal "#{signature}#{"\0" * (512 - signature.length)}",
@@ -145,13 +149,12 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
     signer = Gem::Security::Signer.new nil, nil
 
     Time.stub :now, Time.at(1458518157) do
-
-      @tar_writer.add_file_signed 'x', 0644, signer do |io|
-        io.write 'a' * 10
+      @tar_writer.add_file_signed "x", 0644, signer do |io|
+        io.write "a" * 10
       end
 
-      assert_headers_equal(tar_file_header('x', '', 0644, 10, Time.now),
-                         @io.string[0, 512])
+      assert_headers_equal(tar_file_header("x", "", 0644, 10, Time.now),
+                           @io.string[0, 512])
     end
     assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
 
@@ -160,47 +163,51 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
 
   def test_add_file_simple
     Time.stub :now, Time.at(1458518157) do
-      @tar_writer.add_file_simple 'x', 0644, 10 do |io| io.write "a" * 10 end
+      @tar_writer.add_file_simple "x", 0644, 10 do |io|
+        io.write "a" * 10
+      end
 
-      assert_headers_equal(tar_file_header('x', '', 0644, 10, Time.now),
-                         @io.string[0, 512])
-    end
+      assert_headers_equal(tar_file_header("x", "", 0644, 10, Time.now),
+                           @io.string[0, 512])
 
-    assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
-    assert_equal 1024, @io.pos
+      assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
+      assert_equal 1024, @io.pos
+    end
   end
 
   def test_add_file_simple_source_date_epoch
     ENV["SOURCE_DATE_EPOCH"] = "123456789"
     Time.stub :now, Time.at(1458518157) do
-      @tar_writer.add_file_simple 'x', 0644, 10 do |io| io.write "a" * 10 end
+      @tar_writer.add_file_simple "x", 0644, 10 do |io|
+        io.write "a" * 10
+      end
 
-      assert_headers_equal(tar_file_header('x', '', 0644, 10, Time.at(ENV["SOURCE_DATE_EPOCH"].to_i).utc),
-                         @io.string[0, 512])
+      assert_headers_equal(tar_file_header("x", "", 0644, 10, Time.at(ENV["SOURCE_DATE_EPOCH"].to_i).utc),
+                           @io.string[0, 512])
     end
   end
 
   def test_add_file_simple_padding
     Time.stub :now, Time.at(1458518157) do
-      @tar_writer.add_file_simple 'x', 0, 100
+      @tar_writer.add_file_simple "x", 0, 100
 
-      assert_headers_equal tar_file_header('x', '', 0, 100, Time.now),
-                         @io.string[0, 512]
+      assert_headers_equal tar_file_header("x", "", 0, 100, Time.now),
+        @io.string[0, 512]
     end
 
     assert_equal "\0" * 512, @io.string[512, 512]
   end
 
   def test_add_file_simple_data
-    @tar_writer.add_file_simple("lib/foo/bar", 0, 10) { |f| f.write @data }
+    @tar_writer.add_file_simple("lib/foo/bar", 0, 10) {|f| f.write @data }
     @tar_writer.flush
 
-    assert_equal @data + ("\0" * (512-@data.size)),
+    assert_equal @data + ("\0" * (512 - @data.size)),
                  @io.string[512, 512]
   end
 
   def test_add_file_simple_size
-    assert_raises Gem::Package::TarWriter::FileOverflow do
+    assert_raise Gem::Package::TarWriter::FileOverflow do
       @tar_writer.add_file_simple("lib/foo/bar", 0, 10) do |io|
         io.write "1" * 11
       end
@@ -212,37 +219,37 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
 
     assert_equal "\0" * 1024, @io.string
 
-    e = assert_raises IOError do
+    e = assert_raise IOError do
       @tar_writer.close
     end
-    assert_equal 'closed Gem::Package::TarWriter', e.message
+    assert_equal "closed Gem::Package::TarWriter", e.message
 
-    e = assert_raises IOError do
+    e = assert_raise IOError do
       @tar_writer.flush
     end
-    assert_equal 'closed Gem::Package::TarWriter', e.message
+    assert_equal "closed Gem::Package::TarWriter", e.message
 
-    e = assert_raises IOError do
-      @tar_writer.add_file 'x', 0
+    e = assert_raise IOError do
+      @tar_writer.add_file "x", 0
     end
-    assert_equal 'closed Gem::Package::TarWriter', e.message
+    assert_equal "closed Gem::Package::TarWriter", e.message
 
-    e = assert_raises IOError do
-      @tar_writer.add_file_simple 'x', 0, 0
+    e = assert_raise IOError do
+      @tar_writer.add_file_simple "x", 0, 0
     end
-    assert_equal 'closed Gem::Package::TarWriter', e.message
+    assert_equal "closed Gem::Package::TarWriter", e.message
 
-    e = assert_raises IOError do
-      @tar_writer.mkdir 'x', 0
+    e = assert_raise IOError do
+      @tar_writer.mkdir "x", 0
     end
-    assert_equal 'closed Gem::Package::TarWriter', e.message
+    assert_equal "closed Gem::Package::TarWriter", e.message
   end
 
   def test_mkdir
     Time.stub :now, Time.at(1458518157) do
-      @tar_writer.mkdir 'foo', 0644
+      @tar_writer.mkdir "foo", 0644
 
-      assert_headers_equal tar_dir_header('foo', '', 0644, Time.now),
+      assert_headers_equal tar_dir_header("foo", "", 0644, Time.now),
                            @io.string[0, 512]
 
       assert_equal 512, @io.pos
@@ -252,73 +259,72 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
   def test_mkdir_source_date_epoch
     ENV["SOURCE_DATE_EPOCH"] = "123456789"
     Time.stub :now, Time.at(1458518157) do
-      @tar_writer.mkdir 'foo', 0644
+      @tar_writer.mkdir "foo", 0644
 
-      assert_headers_equal tar_dir_header('foo', '', 0644, Time.at(ENV["SOURCE_DATE_EPOCH"].to_i).utc),
+      assert_headers_equal tar_dir_header("foo", "", 0644, Time.at(ENV["SOURCE_DATE_EPOCH"].to_i).utc),
                            @io.string[0, 512]
     end
   end
 
   def test_split_name
-    assert_equal ['b' * 100, 'a' * 155],
+    assert_equal ["b" * 100, "a" * 155],
                  @tar_writer.split_name("#{'a' * 155}/#{'b' * 100}")
 
-    assert_equal ["#{'qwer/' * 19}bla", 'a' * 151],
+    assert_equal ["#{'qwer/' * 19}bla", "a" * 151],
                  @tar_writer.split_name("#{'a' * 151}/#{'qwer/' * 19}bla")
     names = [
-      ([''] + ['123456789'] * 9 + ['1234567890']).join('/'),  # 101 bytes (several pieces)
-      (['123456789'] * 9 + ['1234567890'] + ['']).join('/'),  # 101 bytes (several pieces)
-      '/' * 99,
-      '/' * 100,
-      '/' * 101,
-      '/' * 102,
+      ([""] + ["123456789"] * 9 + ["1234567890"]).join("/"),  # 101 bytes (several pieces)
+      (["123456789"] * 9 + ["1234567890"] + [""]).join("/"),  # 101 bytes (several pieces)
+      "/" * 99,
+      "/" * 100,
+      "/" * 101,
+      "/" * 102,
     ]
     names.each do |name|
       newname, prefix = @tar_writer.split_name(name)
       assert(!(newname.empty?), "split_name() returned empty name")
       assert(newname.bytesize <= 100, "split_name() returned name longer than 100 bytes: '#{newname}' for '#{name}'")
       assert(prefix.bytesize <= 155, "split_name() returned prefix longer than 155 bytes: '#{prefix}' for '#{name}'")
-      newname = [prefix, newname].join('/') unless prefix.empty?
+      newname = [prefix, newname].join("/") unless prefix.empty?
       assert_equal name, newname
     end
   end
 
   def test_split_name_too_long_name
-    name = File.join 'a', 'b' * 100
-    assert_equal ['b' * 100, 'a'], @tar_writer.split_name(name)
+    name = File.join "a", "b" * 100
+    assert_equal ["b" * 100, "a"], @tar_writer.split_name(name)
 
-    name = File.join 'a', 'b' * 101
-    exception = assert_raises Gem::Package::TooLongFileName do
+    name = File.join "a", "b" * 101
+    exception = assert_raise Gem::Package::TooLongFileName do
       @tar_writer.split_name name
     end
     assert_includes exception.message, name
 
     # note, GNU tar 1.28 is unable to handle this case too,
     # tested with "tar --format=ustar -cPf /tmp/foo.tartar -- /aaaaaa....a"
-    name = '/'  + 'a' * 100
-    exception = assert_raises Gem::Package::TooLongFileName do
+    name = "/" + "a" * 100
+    exception = assert_raise Gem::Package::TooLongFileName do
       @tar_writer.split_name name
     end
     assert_includes exception.message, name
   end
 
   def test_split_name_too_long_prefix
-    name = File.join 'a' * 155, 'b'
-    assert_equal ['b', 'a' * 155], @tar_writer.split_name(name)
+    name = File.join "a" * 155, "b"
+    assert_equal ["b", "a" * 155], @tar_writer.split_name(name)
 
-    name = File.join 'a' * 156, 'b'
-    exception = assert_raises Gem::Package::TooLongFileName do
+    name = File.join "a" * 156, "b"
+    exception = assert_raise Gem::Package::TooLongFileName do
       @tar_writer.split_name name
     end
     assert_includes exception.message, name
   end
 
   def test_split_name_too_long_total
-    name = 'a' * 257
-    exception = assert_raises Gem::Package::TooLongFileName do
+    name = "a" * 257
+    exception = assert_raise Gem::Package::TooLongFileName do
       @tar_writer.split_name name
     end
     assert_includes exception.message, name
   end
-
 end

data/test/rubygems/test_gem_package_task.rb

@@ -1,45 +1,79 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
-require 'rubygems'
-require 'bundler/errors'
+require_relative "helper"
+require "rubygems"
+
 begin
-  require 'rubygems/package_task'
-rescue LoadError, Bundler::GemfileNotFound
+  require "rubygems/package_task"
+rescue LoadError => e
+  raise unless e.path == "rake/packagetask"
 end
 
-class TestGemPackageTask < Gem::TestCase
-
-  def setup
-    super
+unless defined?(Rake::PackageTask)
+  warn "Skipping Gem::PackageTask tests.  rake not found."
+end
 
-    Rake.application = Rake::Application.new
+class TestGemPackageTask < Gem::TestCase
+  def test_gem_package
+    original_rake_fileutils_verbosity = RakeFileUtils.verbose_flag
     RakeFileUtils.verbose_flag = false
-  end
 
-  def test_gem_package
     gem = Gem::Specification.new do |g|
       g.name = "pkgr"
       g.version = "1.2.3"
 
       g.authors = %w[author]
       g.files = %w[x]
-      g.summary = 'summary'
+      g.summary = "summary"
     end
 
-    pkg = Gem::PackageTask.new(gem)  do |p|
+    Rake.application = Rake::Application.new
+
+    pkg = Gem::PackageTask.new(gem) do |p|
       p.package_files << "y"
     end
 
     assert_equal %w[x y], pkg.package_files
 
     Dir.chdir @tempdir do
-      FileUtils.touch 'x'
-      FileUtils.touch 'y'
+      FileUtils.touch "x"
+      FileUtils.touch "y"
+
+      Rake.application["package"].invoke
+
+      assert_path_exist "pkg/pkgr-1.2.3.gem"
+    end
+  ensure
+    RakeFileUtils.verbose_flag = original_rake_fileutils_verbosity
+  end
+
+  def test_gem_package_prints_to_stdout_by_default
+    gem = Gem::Specification.new do |g|
+      g.name = "pkgr"
+      g.version = "1.2.3"
+
+      g.authors = %w[author]
+      g.files = %w[x]
+      g.summary = "summary"
+    end
+
+    _, err = capture_output do
+      Rake.application = Rake::Application.new
+
+      pkg = Gem::PackageTask.new(gem) do |p|
+        p.package_files << "y"
+      end
 
-      Rake.application['package'].invoke
+      assert_equal %w[x y], pkg.package_files
 
-      assert_path_exists 'pkg/pkgr-1.2.3.gem'
+      Dir.chdir @tempdir do
+        FileUtils.touch "x"
+        FileUtils.touch "y"
+
+        Rake.application["package"].invoke
+      end
     end
+
+    assert_empty err
   end
 
   def test_gem_package_with_current_platform
@@ -49,7 +83,7 @@ class TestGemPackageTask < Gem::TestCase
       g.files = Rake::FileList["x"].resolve
       g.platform = Gem::Platform::CURRENT
     end
-    pkg = Gem::PackageTask.new(gem)  do |p|
+    pkg = Gem::PackageTask.new(gem) do |p|
       p.package_files << "y"
     end
     assert_equal ["x", "y"], pkg.package_files
@@ -62,7 +96,7 @@ class TestGemPackageTask < Gem::TestCase
       g.files = Rake::FileList["x"].resolve
       g.platform = Gem::Platform::RUBY
     end
-    pkg = Gem::PackageTask.new(gem)  do |p|
+    pkg = Gem::PackageTask.new(gem) do |p|
       p.package_files << "y"
     end
     assert_equal ["x", "y"], pkg.package_files
@@ -70,15 +104,14 @@ class TestGemPackageTask < Gem::TestCase
 
   def test_package_dir_path
     gem = Gem::Specification.new do |g|
-      g.name = 'nokogiri'
-      g.version = '1.5.0'
-      g.platform = 'java'
+      g.name = "nokogiri"
+      g.version = "1.5.0"
+      g.platform = "java"
     end
 
     pkg = Gem::PackageTask.new gem
     pkg.define
 
-    assert_equal 'pkg/nokogiri-1.5.0-java', pkg.package_dir_path
+    assert_equal "pkg/nokogiri-1.5.0-java", pkg.package_dir_path
   end
-
 end if defined?(Rake::PackageTask)

data/test/rubygems/test_gem_path_support.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
-require 'rubygems/test_case'
-require 'rubygems'
-require 'fileutils'
+require_relative "helper"
+require "rubygems"
+require "fileutils"
 
 class TestGemPathSupport < Gem::TestCase
   def setup
@@ -16,7 +16,7 @@ class TestGemPathSupport < Gem::TestCase
 
     assert_equal ENV["GEM_HOME"], ps.home
 
-    expected = util_path
+    expected = ENV["GEM_PATH"].split(File::PATH_SEPARATOR)
     assert_equal expected, ps.path, "defaults to GEM_PATH"
   end
 
@@ -25,7 +25,7 @@ class TestGemPathSupport < Gem::TestCase
 
     assert_equal File.join(@tempdir, "foo"), ps.home
 
-    expected = util_path + [File.join(@tempdir, 'foo')]
+    expected = ENV["GEM_PATH"].split(File::PATH_SEPARATOR) + [File.join(@tempdir, "foo")]
     assert_equal expected, ps.path
   end
 
@@ -39,17 +39,19 @@ class TestGemPathSupport < Gem::TestCase
   end
 
   def test_initialize_path
-    ps = Gem::PathSupport.new ENV.to_hash.merge("GEM_PATH" => %W[#{@tempdir}/foo #{@tempdir}/bar].join(Gem.path_separator))
+    Gem.stub(:path_separator, File::PATH_SEPARATOR) do
+      ps = Gem::PathSupport.new ENV.to_hash.merge("GEM_PATH" => %W[#{@tempdir}/foo #{@tempdir}/bar].join(Gem.path_separator))
 
-    assert_equal ENV["GEM_HOME"], ps.home
+      assert_equal ENV["GEM_HOME"], ps.home
 
-    expected = [
-      File.join(@tempdir, 'foo'),
-      File.join(@tempdir, 'bar'),
-      ENV["GEM_HOME"],
-    ]
+      expected = [
+        File.join(@tempdir, "foo"),
+        File.join(@tempdir, "bar"),
+        ENV["GEM_HOME"],
+      ]
 
-    assert_equal expected, ps.path
+      assert_equal expected, ps.path
+    end
   end
 
   def test_initialize_regexp_path_separator
@@ -63,8 +65,8 @@ class TestGemPathSupport < Gem::TestCase
       assert_equal ENV["GEM_HOME"], ps.home
 
       expected = [
-        File.join(@tempdir, 'foo'),
-        File.join(@tempdir, 'bar'),
+        File.join(@tempdir, "foo"),
+        File.join(@tempdir, "bar"),
       ] + Gem.default_path << ENV["GEM_HOME"]
 
       assert_equal expected, ps.path
@@ -81,25 +83,23 @@ class TestGemPathSupport < Gem::TestCase
     assert_equal ENV["GEM_HOME"], ps.home
 
     expected = [
-      File.join(@tempdir, 'foo'),
-      File.join(@tempdir, 'bar'),
+      File.join(@tempdir, "foo"),
+      File.join(@tempdir, "bar"),
     ] + Gem.default_path << ENV["GEM_HOME"]
 
     assert_equal expected, ps.path
   end
 
   def test_initialize_home_path
-    ps = Gem::PathSupport.new("GEM_HOME" => "#{@tempdir}/foo",
-                              "GEM_PATH" => %W[#{@tempdir}/foo #{@tempdir}/bar].join(Gem.path_separator))
+    Gem.stub(:path_separator, File::PATH_SEPARATOR) do
+      ps = Gem::PathSupport.new("GEM_HOME" => "#{@tempdir}/foo",
+                                "GEM_PATH" => %W[#{@tempdir}/foo #{@tempdir}/bar].join(Gem.path_separator))
 
-    assert_equal File.join(@tempdir, "foo"), ps.home
-
-    expected = [File.join(@tempdir, 'foo'), File.join(@tempdir, 'bar')]
-    assert_equal expected, ps.path
-  end
+      assert_equal File.join(@tempdir, "foo"), ps.home
 
-  def util_path
-    ENV["GEM_PATH"].split(File::PATH_SEPARATOR)
+      expected = [File.join(@tempdir, "foo"), File.join(@tempdir, "bar")]
+      assert_equal expected, ps.path
+    end
   end
 
   def test_initialize_spec
@@ -108,12 +108,12 @@ class TestGemPathSupport < Gem::TestCase
     ps = Gem::PathSupport.new ENV
     assert_equal Gem.default_spec_cache_dir, ps.spec_cache_dir
 
-    ENV["GEM_SPEC_CACHE"] = 'bar'
+    ENV["GEM_SPEC_CACHE"] = "bar"
 
     ps = Gem::PathSupport.new ENV
     assert_equal ENV["GEM_SPEC_CACHE"], ps.spec_cache_dir
 
-    ENV["GEM_SPEC_CACHE"] = File.join @tempdir, 'spec_cache'
+    ENV["GEM_SPEC_CACHE"] = File.join @tempdir, "spec_cache"
 
     ps = Gem::PathSupport.new "GEM_SPEC_CACHE" => "foo"
     assert_equal "foo", ps.spec_cache_dir
@@ -126,7 +126,7 @@ class TestGemPathSupport < Gem::TestCase
     begin
       File.symlink(dir, symlink)
     rescue NotImplementedError, SystemCallError
-      skip 'symlinks not supported'
+      pend "symlinks not supported"
     end
     not_existing = "#{@tempdir}/does_not_exist"
     path = "#{symlink}#{File::PATH_SEPARATOR}#{not_existing}"