* lib/rubygems*: Updated to RubyGems 2.0

* test/rubygems*:  ditto.

* common.mk (prelude):  Updated for RubyGems 2.0 source rearrangement.

* tool/change_maker.rb:  Allow invalid UTF-8 characters in source
  files.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37976 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 84 insertions, 1 deletions

diff --git a/test/rubygems/test_gem_package_tar_writer.rb b/test/rubygems/test_gem_package_tar_writer.rb
index 88779e7079..40c6982929 100644
--- a/test/rubygems/test_gem_package_tar_writer.rb
+++ b/test/rubygems/test_gem_package_tar_writer.rb
@@ -1,7 +1,7 @@
 require 'rubygems/package/tar_test_case'
 require 'rubygems/package/tar_writer'
 
-class TestTarWriter < Gem::Package::TarTestCase
+class TestGemPackageTarWriter < Gem::Package::TarTestCase
 
   def setup
     super
@@ -26,6 +26,89 @@ class TestTarWriter < Gem::Package::TarTestCase
     assert_equal 1024, @io.pos
   end
 
+  def test_add_file_digest
+    digest_algorithms = OpenSSL::Digest::SHA1, OpenSSL::Digest::SHA512
+
+    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_headers_equal(tar_file_header('x', '', 0644, 10),
+                         @io.string[0, 512])
+    assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
+    assert_equal 1024, @io.pos
+  end
+
+  def test_add_file_digest_multiple
+    digest_algorithms = [OpenSSL::Digest::SHA1, OpenSSL::Digest::SHA512]
+
+    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_headers_equal(tar_file_header('x', '', 0644, 10),
+                         @io.string[0, 512])
+    assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
+    assert_equal 1024, @io.pos
+  end
+
+  def test_add_file_signer
+    signer = Gem::Security::Signer.new PRIVATE_KEY, [PUBLIC_CERT]
+
+    @tar_writer.add_file_signed 'x', 0644, signer do |io|
+      io.write 'a' * 10
+    end
+
+    assert_headers_equal(tar_file_header('x', '', 0644, 10),
+                         @io.string[0, 512])
+    assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
+
+    digest = signer.digest_algorithm.new
+    digest.update 'a' * 10
+
+    signature = signer.sign digest.digest
+
+    assert_headers_equal(tar_file_header('x.sig', '', 0444, signature.length),
+                         @io.string[1024, 512])
+    assert_equal "#{signature}#{"\0" * (512 - signature.length)}",
+                 @io.string[1536, 512]
+
+    assert_equal 2048, @io.pos
+  end
+
+  def test_add_file_signer_empty
+    signer = Gem::Security::Signer.new nil, nil
+
+    @tar_writer.add_file_signed 'x', 0644, signer do |io|
+      io.write 'a' * 10
+    end
+
+    assert_headers_equal(tar_file_header('x', '', 0644, 10),
+                         @io.string[0, 512])
+    assert_equal "aaaaaaaaaa#{"\0" * 502}", @io.string[512, 512]
+
+    digest = signer.digest_algorithm.new
+    digest.update 'a' * 10
+
+    assert_equal 1024, @io.pos
+  end
+
   def test_add_file_simple
     @tar_writer.add_file_simple 'x', 0644, 10 do |io| io.write "a" * 10 end