rubygems-update 3.0.9 → 3.1.0.pre1

data/test/rubygems/test_gem_package.rb

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 require 'rubygems/package/tar_test_case'
-require 'rubygems/simple_gem'
+require 'digest'
 
 class TestGemPackage < Gem::Package::TarTestCase
 
@@ -24,6 +24,8 @@ class TestGemPackage < Gem::Package::TarTestCase
   end
 
   def test_class_new_old_format
+    skip "jruby can't require the simple_gem file" if Gem.java_platform?
+    require_relative "simple_gem"
     File.open 'old_format.gem', 'wb' do |io|
       io.write SIMPLE_GEM
     end
@@ -115,7 +117,6 @@ class TestGemPackage < Gem::Package::TarTestCase
     spec.date = Time.at 0
     spec.rubygems_version = Gem::Version.new '0'
 
-
     package = Gem::Package.new spec.file_name
 
     assert_equal Time.at(ENV["SOURCE_DATE_EPOCH"].to_i).utc, package.build_time
@@ -123,14 +124,45 @@ class TestGemPackage < Gem::Package::TarTestCase
     ENV["SOURCE_DATE_EPOCH"] = epoch
   end
 
+  def test_build_time_source_date_epoch_automatically_set
+    epoch = ENV["SOURCE_DATE_EPOCH"]
+    ENV["SOURCE_DATE_EPOCH"] = nil
+
+    start_time = Time.now.utc.to_i
+
+    spec = Gem::Specification.new 'build', '1'
+    spec.summary = 'build'
+    spec.authors = 'build'
+    spec.files = ['lib/code.rb']
+    spec.rubygems_version = Gem::Version.new '0'
+
+    package = Gem::Package.new spec.file_name
+
+    end_time = Time.now.utc.to_i
+
+    assert_kind_of Time, package.build_time
+
+    build_time = package.build_time.to_i
+
+    assert_operator(start_time, :<=, build_time)
+    assert_operator(build_time, :<=, end_time)
+  ensure
+    ENV["SOURCE_DATE_EPOCH"] = epoch
+  end
+
   def test_add_files
     spec = Gem::Specification.new
     spec.files = %w[lib/code.rb lib/empty]
 
     FileUtils.mkdir_p 'lib/empty'
 
-    File.open 'lib/code.rb',  'w' do |io| io.write '# lib/code.rb'  end
-    File.open 'lib/extra.rb', 'w' do |io| io.write '# lib/extra.rb' end
+    File.open 'lib/code.rb',  'w' do |io|
+      io.write '# lib/code.rb'
+    end
+
+    File.open 'lib/extra.rb', 'w' do |io|
+      io.write '# lib/extra.rb'
+    end
 
     package = Gem::Package.new 'bogus.gem'
     package.spec = spec
@@ -157,7 +189,10 @@ class TestGemPackage < Gem::Package::TarTestCase
     spec.files = %w[lib/code.rb lib/code_sym.rb lib/code_sym2.rb]
 
     FileUtils.mkdir_p 'lib'
-    File.open 'lib/code.rb',  'w' do |io| io.write '# lib/code.rb'  end
+
+    File.open 'lib/code.rb',  'w' do |io|
+      io.write '# lib/code.rb'
+    end
 
     # NOTE: 'code.rb' is correct, because it's relative to lib/code_sym.rb
     begin
@@ -412,6 +447,33 @@ class TestGemPackage < Gem::Package::TarTestCase
     assert_equal %w[lib/code.rb], reader.contents
   end
 
+  def test_raw_spec
+    data_tgz = util_tar_gz { }
+
+    gem = util_tar do |tar|
+      tar.add_file 'data.tar.gz', 0644 do |io|
+        io.write data_tgz.string
+      end
+
+      tar.add_file 'metadata.gz', 0644 do |io|
+        Zlib::GzipWriter.wrap io do |gzio|
+          gzio.write @spec.to_yaml
+        end
+      end
+    end
+
+    gem_path = "#{@destination}/test.gem"
+
+    File.open gem_path, "wb" do |io|
+      io.write gem.string
+    end
+
+    spec, metadata = Gem::Package.raw_spec(gem_path)
+
+    assert_equal @spec, spec
+    assert_match @spec.to_yaml, metadata.force_encoding("UTF-8")
+  end
+
   def test_contents
     package = Gem::Package.new @gem
 
@@ -433,7 +495,7 @@ class TestGemPackage < Gem::Package::TarTestCase
   end
 
   def test_extract_files_empty
-    data_tgz = util_tar_gz do end
+    data_tgz = util_tar_gz { }
 
     gem = util_tar do |tar|
       tar.add_file 'data.tar.gz', 0644 do |io|
@@ -462,7 +524,9 @@ class TestGemPackage < Gem::Package::TarTestCase
     package = Gem::Package.new @gem
 
     tgz_io = util_tar_gz do |tar|
-      tar.add_file '/absolute.rb', 0644 do |io| io.write 'hi' end
+      tar.add_file '/absolute.rb', 0644 do |io|
+        io.write 'hi'
+      end
     end
 
     e = assert_raises Gem::Package::PathError do
@@ -477,7 +541,10 @@ class TestGemPackage < Gem::Package::TarTestCase
     package = Gem::Package.new @gem
 
     tgz_io = util_tar_gz do |tar|
-      tar.add_file    'relative.rb', 0644 do |io| io.write 'hi' end
+      tar.add_file    'relative.rb', 0644 do |io|
+        io.write 'hi'
+      end
+
       tar.mkdir       'lib',         0755
       tar.add_symlink 'lib/foo.rb', '../relative.rb', 0644
     end
@@ -506,7 +573,9 @@ class TestGemPackage < Gem::Package::TarTestCase
     tgz_io = util_tar_gz do |tar|
       tar.mkdir       'lib',               0755
       tar.add_symlink 'lib/link', '../..', 0644
-      tar.add_file    'lib/link/outside.txt', 0644 do |io| io.write 'hi' end
+      tar.add_file    'lib/link/outside.txt', 0644 do |io|
+        io.write 'hi'
+      end
     end
 
     # Extract into a subdirectory of @destination; if this test fails it writes
@@ -568,7 +637,9 @@ class TestGemPackage < Gem::Package::TarTestCase
 
     tgz_io = util_tar_gz do |tar|
       tar.mkdir    'lib',        0755
-      tar.add_file 'lib/foo.rb', 0644 do |io| io.write 'hi' end
+      tar.add_file 'lib/foo.rb', 0644 do |io|
+        io.write 'hi'
+      end
       tar.mkdir    'lib/foo',    0755
     end
 
@@ -585,7 +656,9 @@ class TestGemPackage < Gem::Package::TarTestCase
     package = Gem::Package.new @gem
 
     tgz_io = util_tar_gz do |tar|
-      tar.add_file './dot_slash.rb', 0644 do |io| io.write 'hi' end
+      tar.add_file './dot_slash.rb', 0644 do |io|
+        io.write 'hi'
+      end
     end
 
     package.extract_tar_gz tgz_io, @destination
@@ -598,7 +671,9 @@ class TestGemPackage < Gem::Package::TarTestCase
     package = Gem::Package.new @gem
 
     tgz_io = util_tar_gz do |tar|
-      tar.add_file '.dot_file.rb', 0644 do |io| io.write 'hi' end
+      tar.add_file '.dot_file.rb', 0644 do |io|
+        io.write 'hi'
+      end
     end
 
     package.extract_tar_gz tgz_io, @destination
@@ -612,7 +687,9 @@ class TestGemPackage < Gem::Package::TarTestCase
       package = Gem::Package.new @gem
 
       tgz_io = util_tar_gz do |tar|
-        tar.add_file 'foo/file.rb', 0644 do |io| io.write 'hi' end
+        tar.add_file 'foo/file.rb', 0644 do |io|
+          io.write 'hi'
+        end
       end
 
       package.extract_tar_gz tgz_io, @destination.upcase
@@ -817,6 +894,7 @@ class TestGemPackage < Gem::Package::TarTestCase
   end
 
   def test_verify_corrupt
+    skip "jruby strips the null byte and does not think it's corrupt" if Gem.java_platform?
     tf = Tempfile.open 'corrupt' do |io|
       data = Gem::Util.gzip 'a' * 10
       io.write \
@@ -1042,6 +1120,11 @@ class TestGemPackage < Gem::Package::TarTestCase
     assert_equal @spec, package.spec
   end
 
+  def test_gem_attr
+    package = Gem::Package.new(@gem)
+    assert_equal(@gem, package.gem.path)
+  end
+
   def test_spec_from_io
     # This functionality is used by rubygems.org to extract spec data from an
     # uploaded gem before it is written to storage.
@@ -1077,7 +1160,9 @@ class TestGemPackage < Gem::Package::TarTestCase
     tgz_io = StringIO.new
 
     # can't wrap TarWriter because it seeks
-    Zlib::GzipWriter.wrap tgz_io do |io| io.write tar_io.string end
+    Zlib::GzipWriter.wrap tgz_io do |io|
+      io.write tar_io.string
+    end
 
     StringIO.new tgz_io.string
   end

data/test/rubygems/test_gem_package_old.rb

@@ -1,89 +1,92 @@
 # frozen_string_literal: true
 require 'rubygems/test_case'
-require 'rubygems/simple_gem'
 
-class TestGemPackageOld < Gem::TestCase
+unless Gem.java_platform? # jruby can't require the simple_gem file
+  require 'rubygems/simple_gem'
 
-  def setup
-    super
+  class TestGemPackageOld < Gem::TestCase
 
-    File.open 'old_format.gem', 'wb' do |io|
-      io.write SIMPLE_GEM
-    end
+    def setup
+      super
 
-    @package = Gem::Package::Old.new 'old_format.gem'
-    @destination = File.join @tempdir, 'extract'
+      File.open 'old_format.gem', 'wb' do |io|
+        io.write SIMPLE_GEM
+      end
 
-    FileUtils.mkdir_p @destination
-  end
+      @package = Gem::Package::Old.new 'old_format.gem'
+      @destination = File.join @tempdir, 'extract'
 
-  def test_contents
-    assert_equal %w[lib/foo.rb lib/test.rb lib/test/wow.rb], @package.contents
-  end
+      FileUtils.mkdir_p @destination
+    end
 
-  def test_contents_security_policy
-    skip 'openssl is missing' unless defined?(OpenSSL::SSL)
+    def test_contents
+      assert_equal %w[lib/foo.rb lib/test.rb lib/test/wow.rb], @package.contents
+    end
 
-    @package.security_policy = Gem::Security::AlmostNoSecurity
+    def test_contents_security_policy
+      skip 'openssl is missing' unless defined?(OpenSSL::SSL)
 
-    assert_raises Gem::Security::Exception do
-      @package.contents
+      @package.security_policy = Gem::Security::AlmostNoSecurity
+
+      assert_raises Gem::Security::Exception do
+        @package.contents
+      end
     end
-  end
 
-  def test_extract_files
-    @package.extract_files @destination
+    def test_extract_files
+      @package.extract_files @destination
 
-    extracted = File.join @destination, 'lib/foo.rb'
-    assert_path_exists extracted
+      extracted = File.join @destination, 'lib/foo.rb'
+      assert_path_exists extracted
 
-    mask = 0100644 & (~File.umask)
+      mask = 0100644 & (~File.umask)
 
-    assert_equal mask, File.stat(extracted).mode unless win_platform?
-  end
+      assert_equal mask, File.stat(extracted).mode unless win_platform?
+    end
 
-  def test_extract_files_security_policy
-    skip 'openssl is missing' unless defined?(OpenSSL::SSL)
+    def test_extract_files_security_policy
+      skip 'openssl is missing' unless defined?(OpenSSL::SSL)
 
-    @package.security_policy = Gem::Security::AlmostNoSecurity
+      @package.security_policy = Gem::Security::AlmostNoSecurity
 
-    assert_raises Gem::Security::Exception do
-      @package.extract_files @destination
+      assert_raises Gem::Security::Exception do
+        @package.extract_files @destination
+      end
     end
-  end
 
-  def test_spec
-    assert_equal 'testing', @package.spec.name
-  end
+    def test_spec
+      assert_equal 'testing', @package.spec.name
+    end
 
-  def test_spec_security_policy
-    skip 'openssl is missing' unless defined?(OpenSSL::SSL)
+    def test_spec_security_policy
+      skip 'openssl is missing' unless defined?(OpenSSL::SSL)
 
-    @package.security_policy = Gem::Security::AlmostNoSecurity
+      @package.security_policy = Gem::Security::AlmostNoSecurity
 
-    assert_raises Gem::Security::Exception do
-      @package.spec
+      assert_raises Gem::Security::Exception do
+        @package.spec
+      end
     end
-  end
 
-  def test_verify
-    skip 'openssl is missing' unless defined?(OpenSSL::SSL)
+    def test_verify
+      skip 'openssl is missing' unless defined?(OpenSSL::SSL)
 
-    assert @package.verify
+      assert @package.verify
 
-    @package.security_policy = Gem::Security::NoSecurity
+      @package.security_policy = Gem::Security::NoSecurity
 
-    assert @package.verify
+      assert @package.verify
 
-    @package.security_policy = Gem::Security::AlmostNoSecurity
+      @package.security_policy = Gem::Security::AlmostNoSecurity
 
-    e = assert_raises Gem::Security::Exception do
-      @package.verify
+      e = assert_raises Gem::Security::Exception do
+        @package.verify
+      end
+
+      assert_equal 'old format gems do not contain signatures ' +
+                   'and cannot be verified',
+                   e.message
     end
 
-    assert_equal 'old format gems do not contain signatures ' +
-                 'and cannot be verified',
-                 e.message
   end
-
 end

data/test/rubygems/test_gem_package_tar_reader_entry.rb

@@ -43,19 +43,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 +76,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

data/test/rubygems/test_gem_package_tar_writer.rb

@@ -25,7 +25,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])
@@ -123,7 +125,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 +161,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 +176,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])
@@ -195,7 +200,7 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
     @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 +300,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