rubygems-update 3.0.6 → 3.2.14

data/test/rubygems/test_gem_package_tar_header.rb

@@ -3,7 +3,6 @@ require 'rubygems/package/tar_test_case'
 require 'rubygems/package'
 
 class TestGemPackageTarHeader < Gem::Package::TarTestCase
-
   def setup
     super
 
@@ -205,4 +204,22 @@ tjmather\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00
     assert_equal 6932, tar_header.checksum
   end
 
+  def test_spaces_in_headers
+    stream = StringIO.new(
+      <<-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
+\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\x00100777 \x00     0 \x00     0 \x00       4357 13545040367  104501
+\x000
+      EOF
+    )
+
+    tar_header = Gem::Package::TarHeader.from stream
+
+    assert_equal 0, tar_header.uid
+    assert_equal 0, tar_header.gid
+  end
 end

data/test/rubygems/test_gem_package_tar_reader.rb

@@ -3,7 +3,6 @@ require 'rubygems/package/tar_test_case'
 require 'rubygems/package'
 
 class TestGemPackageTarReader < Gem::Package::TarTestCase
-
   def test_each_entry
     tar = tar_dir_header "foo", "bar", 0, Time.now
     tar << tar_file_header("bar", "baz", 0, 0, Time.now)
@@ -85,5 +84,4 @@ class TestGemPackageTarReader < Gem::Package::TarTestCase
   ensure
     io.close!
   end
-
 end

data/test/rubygems/test_gem_package_tar_reader_entry.rb

@@ -3,7 +3,6 @@ require 'rubygems/package/tar_test_case'
 require 'rubygems/package'
 
 class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase
-
   def setup
     super
 
@@ -43,19 +42,19 @@ class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase
 
     assert @entry.bytes_read
 
-    e = assert_raises IOError do @entry.eof? end
+    e = assert_raises(IOError) { @entry.eof? }
     assert_equal 'closed Gem::Package::TarReader::Entry', e.message
 
-    e = assert_raises IOError do @entry.getc end
+    e = assert_raises(IOError) { @entry.getc }
     assert_equal 'closed Gem::Package::TarReader::Entry', e.message
 
-    e = assert_raises IOError do @entry.pos end
+    e = assert_raises(IOError) { @entry.pos }
     assert_equal 'closed Gem::Package::TarReader::Entry', e.message
 
-    e = assert_raises IOError do @entry.read end
+    e = assert_raises(IOError) { @entry.read }
     assert_equal 'closed Gem::Package::TarReader::Entry', e.message
 
-    e = assert_raises IOError do @entry.rewind end
+    e = assert_raises(IOError) { @entry.rewind }
     assert_equal 'closed Gem::Package::TarReader::Entry', e.message
   end
 
@@ -76,6 +75,7 @@ class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase
   end
 
   def test_full_name_null
+    skip "jruby strips the null byte and does not think it's corrupt" if Gem.java_platform?
     @entry.header.prefix << "\000"
 
     e = assert_raises Gem::Package::TarInvalidError do
@@ -149,5 +149,4 @@ class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase
 
     assert_equal char, @entry.getc
   end
-
 end

data/test/rubygems/test_gem_package_tar_writer.rb

@@ -4,10 +4,14 @@ require 'rubygems/package/tar_writer'
 require 'minitest/mock'
 
 class TestGemPackageTarWriter < Gem::Package::TarTestCase
-
   def setup
     super
 
+    # 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
@@ -25,7 +29,9 @@ 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),
                          @io.string[0, 512])
@@ -65,7 +71,7 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
   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|
@@ -88,7 +94,7 @@ 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|
@@ -111,7 +117,7 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
   end
 
   def test_add_file_signer
-    skip 'openssl is missing' unless defined?(OpenSSL::SSL)
+    skip 'openssl is missing' unless Gem::HAVE_OPENSSL
 
     signer = Gem::Security::Signer.new PRIVATE_KEY, [PUBLIC_CERT]
 
@@ -123,7 +129,6 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
       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
@@ -160,7 +165,9 @@ 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])
@@ -173,7 +180,9 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
   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])
@@ -192,10 +201,10 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
   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
 
@@ -295,7 +304,7 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
 
     # 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
+    name = '/' + 'a' * 100
     exception = assert_raises Gem::Package::TooLongFileName do
       @tar_writer.split_name name
     end
@@ -320,5 +329,4 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
     end
     assert_includes exception.message, name
   end
-
 end

data/test/rubygems/test_gem_package_task.rb

@@ -1,22 +1,22 @@
 # frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems'
-require 'bundler/errors'
+
 begin
   require 'rubygems/package_task'
-rescue LoadError, Bundler::GemfileNotFound
+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"
@@ -26,7 +26,9 @@ class TestGemPackageTask < Gem::TestCase
       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
 
@@ -40,6 +42,38 @@ class TestGemPackageTask < Gem::TestCase
 
       assert_path_exists '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_io do
+      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'
+
+        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
@@ -80,5 +114,4 @@ class TestGemPackageTask < Gem::TestCase
 
     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

@@ -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
@@ -89,13 +91,15 @@ class TestGemPathSupport < Gem::TestCase
   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
+      assert_equal File.join(@tempdir, "foo"), ps.home
 
-    expected = [File.join(@tempdir, 'foo'), File.join(@tempdir, 'bar')]
-    assert_equal expected, ps.path
+      expected = [File.join(@tempdir, 'foo'), File.join(@tempdir, 'bar')]
+      assert_equal expected, ps.path
+    end
   end
 
   def util_path

data/test/rubygems/test_gem_platform.rb

@@ -4,7 +4,6 @@ require 'rubygems/platform'
 require 'rbconfig'
 
 class TestGemPlatform < Gem::TestCase
-
   def test_self_local
     util_set_arch 'i686-darwin8.10.1'
 
@@ -12,10 +11,69 @@ class TestGemPlatform < Gem::TestCase
   end
 
   def test_self_match
-    assert Gem::Platform.match(nil), 'nil == ruby'
-    assert Gem::Platform.match(Gem::Platform.local), 'exact match'
-    assert Gem::Platform.match(Gem::Platform.local.to_s), '=~ match'
-    assert Gem::Platform.match(Gem::Platform::RUBY), 'ruby'
+    Gem::Deprecate.skip_during do
+      assert Gem::Platform.match(nil), 'nil == ruby'
+      assert Gem::Platform.match(Gem::Platform.local), 'exact match'
+      assert Gem::Platform.match(Gem::Platform.local.to_s), '=~ match'
+      assert Gem::Platform.match(Gem::Platform::RUBY), 'ruby'
+    end
+  end
+
+  def test_self_match_gem?
+    assert Gem::Platform.match_gem?(nil, 'json'), 'nil == ruby'
+    assert Gem::Platform.match_gem?(Gem::Platform.local, 'json'), 'exact match'
+    assert Gem::Platform.match_gem?(Gem::Platform.local.to_s, 'json'), '=~ match'
+    assert Gem::Platform.match_gem?(Gem::Platform::RUBY, 'json'), 'ruby'
+  end
+
+  def test_self_match_spec?
+    make_spec = -> platform do
+      util_spec 'mygem-for-platform-match_spec', '1' do |s|
+        s.platform = platform
+      end
+    end
+
+    assert Gem::Platform.match_spec?(make_spec.call(nil)), 'nil == ruby'
+    assert Gem::Platform.match_spec?(make_spec.call(Gem::Platform.local)), 'exact match'
+    assert Gem::Platform.match_spec?(make_spec.call(Gem::Platform.local.to_s)), '=~ match'
+    assert Gem::Platform.match_spec?(make_spec.call(Gem::Platform::RUBY)), 'ruby'
+  end
+
+  def test_self_match_spec_with_match_gem_override
+    make_spec = -> name, platform do
+      util_spec name, '1' do |s|
+        s.platform = platform
+      end
+    end
+
+    class << Gem::Platform
+      alias_method :original_match_gem?, :match_gem?
+      def match_gem?(platform, gem_name)
+        # e.g., sassc and libv8 are such gems, their native extensions do not use the Ruby C API
+        if gem_name == 'gem-with-ruby-impl-independent-precompiled-ext'
+          match_platforms?(platform, [Gem::Platform::RUBY, Gem::Platform.local])
+        else
+          match_platforms?(platform, Gem.platforms)
+        end
+      end
+    end
+
+    platforms = Gem.platforms
+    Gem.platforms = [Gem::Platform::RUBY]
+    begin
+      assert_equal true,  Gem::Platform.match_spec?(make_spec.call('mygem', Gem::Platform::RUBY))
+      assert_equal false, Gem::Platform.match_spec?(make_spec.call('mygem', Gem::Platform.local))
+
+      name = 'gem-with-ruby-impl-independent-precompiled-ext'
+      assert_equal true, Gem::Platform.match_spec?(make_spec.call(name, Gem::Platform.local))
+    ensure
+      Gem.platforms = platforms
+      class << Gem::Platform
+        remove_method :match_gem?
+        alias_method :match_gem?, :original_match_gem? # rubocop:disable Lint/DuplicateMethods
+        remove_method :original_match_gem?
+      end
+    end
   end
 
   def test_self_new
@@ -76,6 +134,7 @@ class TestGemPlatform < Gem::TestCase
       'i386-solaris2.8'        => ['x86',       'solaris',   '2.8'],
       'mswin32'                => ['x86',       'mswin32',   nil],
       'x86_64-linux'           => ['x86_64',    'linux',     nil],
+      'x86_64-linux-musl'      => ['x86_64',    'linux',     'musl'],
       'x86_64-openbsd3.9'      => ['x86_64',    'openbsd',   '3.9'],
       'x86_64-openbsd4.0'      => ['x86_64',    'openbsd',   '4.0'],
       'x86_64-openbsd'         => ['x86_64',    'openbsd',   nil],
@@ -211,13 +270,13 @@ class TestGemPlatform < Gem::TestCase
     assert((arm   === Gem::Platform.local), 'arm   === armv5')
     assert((armv5 === Gem::Platform.local), 'armv5 === armv5')
     refute((armv7 === Gem::Platform.local), 'armv7 === armv5')
-    refute((Gem::Platform.local ===   arm), 'armv5 === arm')
+    refute((Gem::Platform.local === arm), 'armv5 === arm')
 
     util_set_arch 'armv7-linux'
     assert((arm   === Gem::Platform.local), 'arm   === armv7')
     refute((armv5 === Gem::Platform.local), 'armv5 === armv7')
     assert((armv7 === Gem::Platform.local), 'armv7 === armv7')
-    refute((Gem::Platform.local ===   arm), 'armv7 === arm')
+    refute((Gem::Platform.local === arm), 'armv7 === arm')
   end
 
   def test_equals3_version
@@ -297,6 +356,14 @@ class TestGemPlatform < Gem::TestCase
     assert_local_match 'sparc-solaris2.8-mq5.3'
   end
 
+  def test_inspect
+    result = Gem::Platform.new("universal-java11").inspect
+
+    assert_equal 1, result.scan(/@cpu=/).size
+    assert_equal 1, result.scan(/@os=/).size
+    assert_equal 1, result.scan(/@version=/).size
+  end
+
   def assert_local_match(name)
     assert_match Gem::Platform.local, name
   end