rubygems-update 3.3.26 → 3.4.18

data/test/rubygems/package/tar_test_case.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../helper"
 require "rubygems/package"
 
@@ -67,7 +68,7 @@ class Gem::Package::TarTestCase < Gem::TestCase
   end
 
   def calc_checksum(header)
-    sum = header.unpack("C*").inject {|s,a| s + a }
+    sum = header.sum(0)
     SP(Z(to_oct(sum, 6)))
   end
 
@@ -90,31 +91,36 @@ class Gem::Package::TarTestCase < Gem::TestCase
       ASCIIZ("wheel", 32),   # char gname[32];     ASCIIZ
       Z(to_oct(0, 7)),       # char devmajor[8];   0 padded, octal, null
       Z(to_oct(0, 7)),       # char devminor[8];   0 padded, octal, null
-      ASCIIZ(dname, 155), # char prefix[155];   ASCII + (Z unless filled)
+      ASCIIZ(dname, 155),    # char prefix[155];   ASCII + (Z unless filled)
     ]
 
     h = arr.join
-    ret = h + "\0" * (512 - h.size)
+    ret = ASCIIZ(h, 512)
     assert_equal(512, ret.size)
     ret
   end
 
-  def tar_dir_header(name, prefix, mode, mtime)
-    h = header("5", name, prefix, 0, mode, mtime)
+  def header_with_checksum(type, fname, dname, length, mode, mtime, linkname = "")
+    h = header(type, fname, dname, length, mode, mtime, nil, linkname)
     checksum = calc_checksum(h)
-    header("5", name, prefix, 0, mode, mtime, checksum)
+    header(type, fname, dname, length, mode, mtime, checksum, linkname)
+  end
+
+  def tar_dir_header(name, prefix, mode, mtime)
+    header_with_checksum("5", name, prefix, 0, mode, mtime)
   end
 
   def tar_file_header(fname, dname, mode, length, mtime)
-    h = header("0", fname, dname, length, mode, mtime)
-    checksum = calc_checksum(h)
-    header("0", fname, dname, length, mode, mtime, checksum)
+    header_with_checksum("0", fname, dname, length, mode, mtime)
   end
 
-  def tar_symlink_header(fname, prefix, mode, mtime, linkname)
-    h = header("2", fname, prefix, 0, mode, mtime, nil, linkname)
-    checksum = calc_checksum(h)
-    header("2", fname, prefix, 0, mode, mtime, checksum, linkname)
+  def tar_symlink_header(fname, dname, mode, mtime, linkname)
+    header_with_checksum("2", fname, dname, 0, mode, mtime, linkname)
+  end
+
+  def tar_file_contents(content)
+    pad = (512 - (content.size % 512)) % 512
+    content + "\0" * pad
   end
 
   def to_oct(n, pad_size)
@@ -122,11 +128,15 @@ class Gem::Package::TarTestCase < Gem::TestCase
   end
 
   def util_entry(tar)
-    io = TempIO.new tar
+    io = tar.respond_to?(:read) ? tar : TempIO.new(tar)
 
     header = Gem::Package::TarHeader.from io
 
-    Gem::Package::TarReader::Entry.new header, io
+    Gem::Package::TarReader::Entry.open header, io
+  end
+
+  def close_util_entry(entry)
+    entry.instance_variable_get(:@io).close!
   end
 
   def util_dir_entry
@@ -136,4 +146,30 @@ class Gem::Package::TarTestCase < Gem::TestCase
   def util_symlink_entry
     util_entry tar_symlink_header("foo", "bar", 0, Time.now, "link")
   end
+
+  def util_tar(&block)
+    tar_io = StringIO.new
+    Gem::Package::TarWriter.new(tar_io, &block)
+    tar_io.rewind
+    tar_io
+  end
+
+  def util_tar_gz(&block)
+    tar_io = util_tar(&block)
+    StringIO.new util_gzip(tar_io.string)
+  end
+
+  def util_gem_data_tar(spec = nil, &block)
+    data_tgz = util_tar_gz(&block)
+    util_tar do |tar|
+      if spec
+        tar.add_file "metadata.gz", 0444 do |io|
+          io.write util_gzip(spec.to_yaml)
+        end
+      end
+      tar.add_file "data.tar.gz", 0644 do |io|
+        io.write data_tgz.string
+      end
+    end
+  end
 end

data/test/rubygems/plugin/exception/rubygems_plugin.rb

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
+
 TestGem::TEST_PLUGIN_EXCEPTION = :loaded
 raise Exception.new("boom")

data/test/rubygems/plugin/load/rubygems_plugin.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class TestGem
   TEST_PLUGIN_LOAD = :loaded
 end

data/test/rubygems/plugin/standarderror/rubygems_plugin.rb

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
+
 TestGem::TEST_PLUGIN_STANDARDERROR = :loaded
 raise StandardError.new("boom")

data/test/rubygems/rubygems/commands/crash_command.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Gem::Commands::CrashCommand < Gem::Command
   raise "crash"
 end

data/test/rubygems/rubygems_plugin.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "rubygems/command_manager"
 
 ##

data/test/rubygems/simple_gem.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
-SIMPLE_GEM = <<-GEMDATA.freeze
+
+SIMPLE_GEM = <<-GEMDATA
         MD5SUM = "989bf34a1cbecd52e0ea66b662b3a405"
         if $0 == __FILE__
           require 'optparse'

data/test/rubygems/specifications/bar-0.0.2.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Gem::Specification.new do |s|
   s.name          = "bar"
   s.version       = "0.0.2"

data/test/rubygems/specifications/rubyforge-0.0.1.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Gem::Specification.new do |s|
   s.name              = "rubyforge"
   s.version           = "0.0.1"

data/test/rubygems/test_bundled_ca.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "net/http"
 require "rubygems/openssl"
@@ -14,7 +15,7 @@ require "rubygems/request"
 # The tested hosts are explained in detail here: https://github.com/rubygems/rubygems/commit/5e16a5428f973667cabfa07e94ff939e7a83ebd9
 #
 
-class TestBundledCA < Gem::TestCase
+class TestGemBundledCA < Gem::TestCase
   def bundled_certificate_store
     store = OpenSSL::X509::Store.new
 
@@ -36,7 +37,7 @@ class TestBundledCA < Gem::TestCase
     pend "#{host} seems offline, I can't tell whether ssl would work."
   rescue OpenSSL::SSL::SSLError => e
     # Only fail for certificate verification errors
-    if e.message =~ /certificate verify failed/
+    if e.message.include?("certificate verify failed")
       flunk "#{host} is not verifiable using the included certificates. Error was: #{e.message}"
     end
     raise

data/test/rubygems/test_config.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems"
 require "shellwords"
 
-class TestConfig < Gem::TestCase
+class TestGemConfig < Gem::TestCase
   def test_datadir
     util_make_gems
     spec = Gem::Specification.find_by_name("a")

data/test/rubygems/test_deprecate.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
+
 require_relative "helper"
 require "rubygems/deprecate"
 
-class TestDeprecate < Gem::TestCase
+class TestGemDeprecate < Gem::TestCase
   def setup
     super
 

data/test/rubygems/test_exit.rb

@@ -3,9 +3,15 @@
 require_relative "helper"
 require "rubygems"
 
-class TestExit < Gem::TestCase
+class TestGemExit < Gem::TestCase
   def test_exit
     system(*ruby_with_rubygems_in_load_path, "-e", "raise Gem::SystemExitException.new(2)")
     assert_equal 2, $?.exitstatus
   end
+
+  def test_status
+    exc = Gem::SystemExitException.new(42)
+    assert_equal 42, exc.status
+    assert_equal 42, exc.exit_code
+  end
 end