rubygems-update 3.2.30 → 3.4.10

data/test/rubygems/test_gem_package_old.rb

@@ -1,19 +1,19 @@
 # frozen_string_literal: true
-require_relative 'helper'
+require_relative "helper"
 
 unless Gem.java_platform? # jruby can't require the simple_gem file
-  require 'rubygems/simple_gem'
+  require "rubygems/simple_gem"
 
   class TestGemPackageOld < Gem::TestCase
     def setup
       super
 
-      File.open 'old_format.gem', 'wb' do |io|
+      File.open "old_format.gem", "wb" do |io|
         io.write SIMPLE_GEM
       end
 
-      @package = Gem::Package::Old.new 'old_format.gem'
-      @destination = File.join @tempdir, 'extract'
+      @package = Gem::Package::Old.new "old_format.gem"
+      @destination = File.join @tempdir, "extract"
 
       FileUtils.mkdir_p @destination
     end
@@ -23,7 +23,7 @@ unless Gem.java_platform? # jruby can't require the simple_gem file
     end
 
     def test_contents_security_policy
-      pend 'openssl is missing' unless Gem::HAVE_OPENSSL
+      pend "openssl is missing" unless Gem::HAVE_OPENSSL
 
       @package.security_policy = Gem::Security::AlmostNoSecurity
 
@@ -35,7 +35,7 @@ unless Gem.java_platform? # jruby can't require the simple_gem file
     def test_extract_files
       @package.extract_files @destination
 
-      extracted = File.join @destination, 'lib/foo.rb'
+      extracted = File.join @destination, "lib/foo.rb"
       assert_path_exist extracted
 
       mask = 0100644 & (~File.umask)
@@ -44,7 +44,7 @@ unless Gem.java_platform? # jruby can't require the simple_gem file
     end
 
     def test_extract_files_security_policy
-      pend 'openssl is missing' unless Gem::HAVE_OPENSSL
+      pend "openssl is missing" unless Gem::HAVE_OPENSSL
 
       @package.security_policy = Gem::Security::AlmostNoSecurity
 
@@ -54,11 +54,11 @@ unless Gem.java_platform? # jruby can't require the simple_gem file
     end
 
     def test_spec
-      assert_equal 'testing', @package.spec.name
+      assert_equal "testing", @package.spec.name
     end
 
     def test_spec_security_policy
-      pend 'openssl is missing' unless Gem::HAVE_OPENSSL
+      pend "openssl is missing" unless Gem::HAVE_OPENSSL
 
       @package.security_policy = Gem::Security::AlmostNoSecurity
 
@@ -68,7 +68,7 @@ unless Gem.java_platform? # jruby can't require the simple_gem file
     end
 
     def test_verify
-      pend 'openssl is missing' unless Gem::HAVE_OPENSSL
+      pend "openssl is missing" unless Gem::HAVE_OPENSSL
 
       assert @package.verify
 
@@ -82,8 +82,8 @@ unless Gem.java_platform? # jruby can't require the simple_gem file
         @package.verify
       end
 
-      assert_equal 'old format gems do not contain signatures ' +
-                   'and cannot be verified',
+      assert_equal "old format gems do not contain signatures " +
+                   "and cannot be verified",
                    e.message
     end
   end

data/test/rubygems/test_gem_package_tar_header.rb

@@ -1,25 +1,25 @@
 # frozen_string_literal: true
-require_relative 'package/tar_test_case'
-require 'rubygems/package'
+require_relative "package/tar_test_case"
+require "rubygems/package"
 
 class TestGemPackageTarHeader < Gem::Package::TarTestCase
   def setup
     super
 
     header = {
-      :name     => 'x',
-      :mode     => 0644,
-      :uid      => 1000,
-      :gid      => 10000,
-      :size     => 100,
-      :mtime    => 12345,
-      :typeflag => '0',
-      :linkname => 'link',
-      :uname    => 'user',
-      :gname    => 'group',
+      :name => "x",
+      :mode => 0644,
+      :uid => 1000,
+      :gid => 10000,
+      :size => 100,
+      :mtime => 12345,
+      :typeflag => "0",
+      :linkname => "link",
+      :uname => "user",
+      :gname => "group",
       :devmajor => 1,
       :devminor => 2,
-      :prefix   => 'y',
+      :prefix => "y",
     }
 
     @tar_header = Gem::Package::TarHeader.new header
@@ -36,62 +36,62 @@ class TestGemPackageTarHeader < Gem::Package::TarTestCase
   end
 
   def test_initialize
-    assert_equal '',      @tar_header.checksum, 'checksum'
-    assert_equal 1,       @tar_header.devmajor, 'devmajor'
-    assert_equal 2,       @tar_header.devminor, 'devminor'
-    assert_equal 10000,   @tar_header.gid,      'gid'
-    assert_equal 'group', @tar_header.gname,    'gname'
-    assert_equal 'link',  @tar_header.linkname, 'linkname'
-    assert_equal 'ustar', @tar_header.magic,    'magic'
-    assert_equal 0644,    @tar_header.mode,     'mode'
-    assert_equal 12345,   @tar_header.mtime,    'mtime'
-    assert_equal 'x',     @tar_header.name,     'name'
-    assert_equal 'y',     @tar_header.prefix,   'prefix'
-    assert_equal 100,     @tar_header.size,     'size'
-    assert_equal '0',     @tar_header.typeflag, 'typeflag'
-    assert_equal 1000,    @tar_header.uid,      'uid'
-    assert_equal 'user',  @tar_header.uname,    'uname'
-    assert_equal '00',    @tar_header.version,  'version'
-
-    refute_empty @tar_header, 'empty'
+    assert_equal "",      @tar_header.checksum, "checksum"
+    assert_equal 1,       @tar_header.devmajor, "devmajor"
+    assert_equal 2,       @tar_header.devminor, "devminor"
+    assert_equal 10000,   @tar_header.gid,      "gid"
+    assert_equal "group", @tar_header.gname,    "gname"
+    assert_equal "link",  @tar_header.linkname, "linkname"
+    assert_equal "ustar", @tar_header.magic,    "magic"
+    assert_equal 0644,    @tar_header.mode,     "mode"
+    assert_equal 12345,   @tar_header.mtime,    "mtime"
+    assert_equal "x",     @tar_header.name,     "name"
+    assert_equal "y",     @tar_header.prefix,   "prefix"
+    assert_equal 100,     @tar_header.size,     "size"
+    assert_equal "0",     @tar_header.typeflag, "typeflag"
+    assert_equal 1000,    @tar_header.uid,      "uid"
+    assert_equal "user",  @tar_header.uname,    "uname"
+    assert_equal "00",    @tar_header.version,  "version"
+
+    refute_empty @tar_header, "empty"
   end
 
   def test_initialize_bad
     assert_raise ArgumentError do
-      Gem::Package::TarHeader.new :name => '', :size => '', :mode => ''
+      Gem::Package::TarHeader.new :name => "", :size => "", :mode => ""
     end
 
     assert_raise ArgumentError do
-      Gem::Package::TarHeader.new :name => '', :size => '', :prefix => ''
+      Gem::Package::TarHeader.new :name => "", :size => "", :prefix => ""
     end
 
     assert_raise ArgumentError do
-      Gem::Package::TarHeader.new :name => '', :prefix => '', :mode => ''
+      Gem::Package::TarHeader.new :name => "", :prefix => "", :mode => ""
     end
 
     assert_raise ArgumentError do
-      Gem::Package::TarHeader.new :prefix => '', :size => '', :mode => ''
+      Gem::Package::TarHeader.new :prefix => "", :size => "", :mode => ""
     end
   end
 
   def test_initialize_typeflag
     header = {
-      :mode     => '',
-      :name     => '',
-      :prefix   => '',
-      :size     => '',
-      :typeflag => '',
+      :mode => "",
+      :name => "",
+      :prefix => "",
+      :size => "",
+      :typeflag => "",
     }
 
     tar_header = Gem::Package::TarHeader.new header
 
-    assert_equal '0', tar_header.typeflag
+    assert_equal "0", tar_header.typeflag
   end
 
   def test_empty_eh
     refute_empty @tar_header
 
-    @tar_header = Gem::Package::TarHeader.new :name => 'x', :prefix => '',
+    @tar_header = Gem::Package::TarHeader.new :name => "x", :prefix => "",
                                               :mode => 0, :size => 0,
                                               :empty => true
 
@@ -135,11 +135,11 @@ group\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000
   end
 
   def test_update_checksum
-    assert_equal '', @tar_header.checksum
+    assert_equal "", @tar_header.checksum
 
     @tar_header.update_checksum
 
-    assert_equal '012467', @tar_header.checksum
+    assert_equal "012467", @tar_header.checksum
   end
 
   def test_from_bad_octal
@@ -165,7 +165,7 @@ group\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000
 
   def test_big_uid_gid
     stream = StringIO.new(
-      <<-EOF.dup.force_encoding('binary').split("\n").join
+      <<-EOF.dup.force_encoding("binary").split("\n").join
 GeoIP2-City_20190528/
 \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
 \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
@@ -197,7 +197,7 @@ tjmather\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
     assert_equal 1991400094, tar_header.uid
     assert_equal 1991400094, tar_header.gid
 
-    assert_equal 'GeoIP2-City_20190528/', tar_header.name
+    assert_equal "GeoIP2-City_20190528/", tar_header.name
     assert_equal 0755, tar_header.mode
     assert_equal 0, tar_header.size
     assert_equal 1559064640, tar_header.mtime
@@ -206,7 +206,7 @@ tjmather\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
 
   def test_spaces_in_headers
     stream = StringIO.new(
-      <<-EOF.dup.force_encoding('binary').split("\n").join
+      <<-EOF.dup.force_encoding("binary").split("\n").join
 Access_Points_09202018.csv
 \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
 \x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00

data/test/rubygems/test_gem_package_tar_reader.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-require_relative 'package/tar_test_case'
-require 'rubygems/package'
+require_relative "package/tar_test_case"
+require "rubygems/package"
 
 class TestGemPackageTarReader < Gem::Package::TarTestCase
   def test_each_entry
@@ -25,11 +25,11 @@ class TestGemPackageTarReader < Gem::Package::TarTestCase
   end
 
   def test_rewind
-    content = ('a'..'z').to_a.join(" ")
+    content = ("a".."z").to_a.join(" ")
 
     str =
       tar_file_header("lib/foo", "", 010644, content.size, Time.now) +
-        content + "\0" * (512 - content.size)
+      content + "\0" * (512 - content.size)
     str << "\0" * 1024
 
     io = TempIO.new(str)
@@ -56,12 +56,14 @@ class TestGemPackageTarReader < Gem::Package::TarTestCase
     io = TempIO.new tar
 
     Gem::Package::TarReader.new io do |tar_reader|
-      tar_reader.seek 'baz/bar' do |entry|
+      retval = tar_reader.seek "baz/bar" do |entry|
         assert_kind_of Gem::Package::TarReader::Entry, entry
 
-        assert_equal 'baz/bar', entry.full_name
+        assert_equal "baz/bar", entry.full_name
+        entry.read
       end
 
+      assert_equal "", retval
       assert_equal 0, io.pos
     end
   ensure
@@ -75,8 +77,8 @@ class TestGemPackageTarReader < Gem::Package::TarTestCase
     io = TempIO.new tar
 
     Gem::Package::TarReader.new io do |tar_reader|
-      tar_reader.seek 'nonexistent' do |entry|
-        flunk 'entry missing but entry-found block was run'
+      tar_reader.seek "nonexistent" do |entry|
+        flunk "entry missing but entry-found block was run"
       end
 
       assert_equal 0, io.pos
@@ -84,4 +86,49 @@ class TestGemPackageTarReader < Gem::Package::TarTestCase
   ensure
     io.close!
   end
+
+  def test_read_in_gem_data
+    gem_tar = util_gem_data_tar do |tar|
+      tar.add_file "lib/code.rb", 0444 do |io|
+        io.write "# lib/code.rb"
+      end
+    end
+
+    count = 0
+    Gem::Package::TarReader.new(gem_tar).each do |entry|
+      next unless entry.full_name == "data.tar.gz"
+
+      Zlib::GzipReader.wrap entry do |gzio|
+        Gem::Package::TarReader.new(gzio).each do |contents_entry|
+          assert_equal "# lib/code.rb", contents_entry.read
+          count += 1
+        end
+      end
+    end
+
+    assert_equal 1, count, "should have found one file"
+  end
+
+  def test_seek_in_gem_data
+    gem_tar = util_gem_data_tar do |tar|
+      tar.add_file "lib/code.rb", 0444 do |io|
+        io.write "# lib/code.rb"
+      end
+      tar.add_file "lib/foo.rb", 0444 do |io|
+        io.write "# lib/foo.rb"
+      end
+    end
+
+    count = 0
+    Gem::Package::TarReader.new(gem_tar).seek("data.tar.gz") do |entry|
+      Zlib::GzipReader.wrap entry do |gzio|
+        Gem::Package::TarReader.new(gzio).seek("lib/foo.rb") do |contents_entry|
+          assert_equal "# lib/foo.rb", contents_entry.read
+          count += 1
+        end
+      end
+    end
+
+    assert_equal 1, count, "should have found one file"
+  end
 end

data/test/rubygems/test_gem_package_tar_reader_entry.rb

@@ -1,17 +1,16 @@
 # frozen_string_literal: true
-require_relative 'package/tar_test_case'
-require 'rubygems/package'
+require_relative "package/tar_test_case"
+require "rubygems/package"
 
 class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase
   def setup
     super
 
-    @contents = ('a'..'z').to_a.join * 100
+    @contents = ("a".."z").to_a.join * 100
 
     @tar = String.new
     @tar << tar_file_header("lib/foo", "", 0, @contents.size, Time.now)
-    @tar << @contents
-    @tar << "\0" * (512 - (@tar.size % 512))
+    @tar << tar_file_contents(@contents)
 
     @entry = util_entry @tar
   end
@@ -21,8 +20,35 @@ class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase
     super
   end
 
-  def close_util_entry(entry)
-    entry.instance_variable_get(:@io).close!
+  def test_open
+    io = TempIO.new @tar
+    header = Gem::Package::TarHeader.from io
+    retval = Gem::Package::TarReader::Entry.open header, io do |entry|
+      entry.getc
+    end
+    assert_equal "a", retval
+    assert_equal @tar.size, io.pos, "should have read to end of entry"
+  end
+
+  def test_open_closes_entry
+    io = TempIO.new @tar
+    header = Gem::Package::TarHeader.from io
+    entry = nil
+    Gem::Package::TarReader::Entry.open header, io do |e|
+      entry = e
+    end
+    assert entry.closed?
+    assert_raise(IOError) { entry.getc }
+  end
+
+  def test_open_returns_entry
+    io = TempIO.new @tar
+    header = Gem::Package::TarHeader.from io
+    entry = Gem::Package::TarReader::Entry.open header, io
+    refute entry.closed?
+    assert_equal ?a, entry.getc
+    assert_nil entry.close
+    assert entry.closed?
   end
 
   def test_bytes_read
@@ -43,19 +69,19 @@ class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase
     assert @entry.bytes_read
 
     e = assert_raise(IOError) { @entry.eof? }
-    assert_equal 'closed Gem::Package::TarReader::Entry', e.message
+    assert_equal "closed Gem::Package::TarReader::Entry", e.message
 
     e = assert_raise(IOError) { @entry.getc }
-    assert_equal 'closed Gem::Package::TarReader::Entry', e.message
+    assert_equal "closed Gem::Package::TarReader::Entry", e.message
 
     e = assert_raise(IOError) { @entry.pos }
-    assert_equal 'closed Gem::Package::TarReader::Entry', e.message
+    assert_equal "closed Gem::Package::TarReader::Entry", e.message
 
     e = assert_raise(IOError) { @entry.read }
-    assert_equal 'closed Gem::Package::TarReader::Entry', e.message
+    assert_equal "closed Gem::Package::TarReader::Entry", e.message
 
     e = assert_raise(IOError) { @entry.rewind }
-    assert_equal 'closed Gem::Package::TarReader::Entry', e.message
+    assert_equal "closed Gem::Package::TarReader::Entry", e.message
   end
 
   def test_closed_eh
@@ -71,7 +97,7 @@ class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase
   end
 
   def test_full_name
-    assert_equal 'lib/foo', @entry.full_name
+    assert_equal "lib/foo", @entry.full_name
   end
 
   def test_full_name_null
@@ -82,7 +108,7 @@ class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase
       @entry.full_name
     end
 
-    assert_equal 'tar is corrupt, name contains null byte', e.message
+    assert_equal "tar is corrupt, name contains null byte", e.message
   end
 
   def test_getc
@@ -125,6 +151,18 @@ class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase
     assert_equal @contents, @entry.read
   end
 
+  def test_consecutive_read
+    expected = StringIO.new(@contents)
+    assert_equal expected.read, @entry.read
+    assert_equal expected.read, @entry.read
+  end
+
+  def test_consecutive_read_bytes_past_eof
+    expected = StringIO.new(@contents)
+    assert_equal expected.read, @entry.read
+    assert_equal expected.read(1), @entry.read(1)
+  end
+
   def test_read_big
     assert_equal @contents, @entry.read(@contents.size * 2)
   end
@@ -133,9 +171,24 @@ class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase
     assert_equal @contents[0...100], @entry.read(100)
   end
 
-  def test_readpartial
+  def test_read_remaining
+    @entry.read(100)
+    assert_equal @contents[100..-1], @entry.read
+  end
+
+  def test_read_partial
+    assert_equal @contents[0...100], @entry.readpartial(100)
+  end
+
+  def test_read_partial_buffer
+    buffer = "".b
+    @entry.readpartial(100, buffer)
+    assert_equal @contents[0...100], buffer
+  end
+
+  def test_readpartial_past_eof
+    @entry.readpartial(@contents.size)
     assert_raise(EOFError) do
-      @entry.read(@contents.size)
       @entry.readpartial(1)
     end
   end
@@ -149,4 +202,96 @@ class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase
 
     assert_equal char, @entry.getc
   end
+
+  def test_seek
+    @entry.seek(50)
+    assert_equal 50, @entry.pos
+    assert_equal @contents[50..-1], @entry.read, "read remaining after seek"
+    @entry.seek(-50, IO::SEEK_CUR)
+    assert_equal @contents.size - 50, @entry.pos
+    assert_equal @contents[-50..-1], @entry.read, "read after stepping back 50 from the end"
+    @entry.seek(0, IO::SEEK_SET)
+    assert_equal 0, @entry.pos
+    assert_equal @contents, @entry.read, "read from beginning"
+    @entry.seek(-10, IO::SEEK_END)
+    assert_equal @contents.size - 10, @entry.pos
+    assert_equal @contents[-10..-1], @entry.read, "read from end"
+  end
+
+  def test_read_zero
+    expected = StringIO.new("")
+    assert_equal expected.read(0), @entry.read(0)
+  end
+
+  def test_readpartial_zero
+    expected = StringIO.new("")
+    assert_equal expected.readpartial(0), @entry.readpartial(0)
+  end
+
+  def test_zero_byte_file_read
+    zero_entry = util_entry(tar_file_header("foo", "", 0, 0, Time.now))
+    expected = StringIO.new("")
+    assert_equal expected.read, zero_entry.read
+  end
+
+  def test_zero_byte_file_readpartial
+    zero_entry = util_entry(tar_file_header("foo", "", 0, 0, Time.now))
+    expected = StringIO.new("")
+    assert_equal expected.readpartial(0), zero_entry.readpartial(0)
+  end
+
+  def test_read_from_gzip_io
+    tgz = util_gzip(@tar)
+
+    Zlib::GzipReader.wrap StringIO.new(tgz) do |gzio|
+      entry = util_entry(gzio)
+      assert_equal @contents, entry.read
+      entry.rewind
+      assert_equal @contents, entry.read, "second read after rewind should read same contents"
+    end
+  end
+
+  def test_read_from_gzip_io_with_non_zero_offset
+    contents2 = ("0".."9").to_a.join * 100
+    @tar << tar_file_header("lib/bar", "", 0, contents2.size, Time.now)
+    @tar << tar_file_contents(contents2)
+
+    tgz = util_gzip(@tar)
+
+    Zlib::GzipReader.wrap StringIO.new(tgz) do |gzio|
+      util_entry(gzio).close # skip the first entry so io.pos is not 0, preventing easy rewind
+      entry = util_entry(gzio)
+
+      assert_equal contents2, entry.read
+      entry.rewind
+      assert_equal contents2, entry.read, "second read after rewind should read same contents"
+    end
+  end
+
+  def test_seek_in_gzip_io_with_non_zero_offset
+    contents2 = ("0".."9").to_a.join * 100
+    @tar << tar_file_header("lib/bar", "", 0, contents2.size, Time.now)
+    @tar << tar_file_contents(contents2)
+
+    tgz = util_gzip(@tar)
+
+    Zlib::GzipReader.wrap StringIO.new(tgz) do |gzio|
+      util_entry(gzio).close # skip the first entry so io.pos is not 0
+      entry = util_entry(gzio)
+
+      entry.seek(50)
+      assert_equal 50, entry.pos
+      assert_equal contents2[50..-1], entry.read, "read remaining after seek"
+      entry.seek(-50, IO::SEEK_CUR)
+      assert_equal contents2.size - 50, entry.pos
+      assert_equal contents2[-50..-1], entry.read, "read after stepping back 50 from the end"
+      entry.seek(0, IO::SEEK_SET)
+      assert_equal 0, entry.pos
+      assert_equal contents2, entry.read, "read from beginning"
+      entry.seek(-10, IO::SEEK_END)
+      assert_equal contents2.size - 10, entry.pos
+      assert_equal contents2[-10..-1], entry.read, "read from end"
+      assert_equal contents2.size, entry.pos
+    end
+  end
 end