diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-16 15:35:06 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-16 15:35:06 +0000 |
commit | cbf98166355bd8db68ec271634fe74a05662cc7f (patch) | |
tree | 903ad81f18de0074f2f879fd7884d9d547ecf380 /test | |
parent | 5ac6776b0f3df3ffc22d6332f616353f65ddfae2 (diff) |
* lib/rubygems: update to RubyGems 2.0.6. the patch by drbrain.
[ruby-core:56633] [Backport #8787]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42587 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r-- | test/rubygems/test_gem_commands_install_command.rb | 1 | ||||
-rw-r--r-- | test/rubygems/test_gem_package.rb | 14 | ||||
-rw-r--r-- | test/rubygems/test_gem_package_task.rb | 25 |
3 files changed, 30 insertions, 10 deletions
diff --git a/test/rubygems/test_gem_commands_install_command.rb b/test/rubygems/test_gem_commands_install_command.rb index 28b4e474ba..f86d2837ea 100644 --- a/test/rubygems/test_gem_commands_install_command.rb +++ b/test/rubygems/test_gem_commands_install_command.rb @@ -1,5 +1,6 @@ require 'rubygems/test_case' require 'rubygems/commands/install_command' +require 'rubygems/rdoc' class TestGemCommandsInstallCommand < Gem::TestCase diff --git a/test/rubygems/test_gem_package.rb b/test/rubygems/test_gem_package.rb index bb78829bf9..c77fc47ada 100644 --- a/test/rubygems/test_gem_package.rb +++ b/test/rubygems/test_gem_package.rb @@ -64,13 +64,16 @@ class TestGemPackage < Gem::Package::TarTestCase reader = Gem::Package::TarReader.new gem_io checksums = nil + tar = nil reader.each_entry do |entry| case entry.full_name - when 'checksums.yaml.gz' + when 'checksums.yaml.gz' then Zlib::GzipReader.wrap entry do |io| checksums = io.read end + when 'data.tar.gz' then + tar = entry.read end end @@ -83,19 +86,14 @@ class TestGemPackage < Gem::Package::TarTestCase metadata_sha1 = Digest::SHA1.hexdigest s.string metadata_sha512 = Digest::SHA512.hexdigest s.string - data_digests = nil - util_tar do |tar| - data_digests = package.add_contents tar - end - expected = { 'SHA1' => { 'metadata.gz' => metadata_sha1, - 'data.tar.gz' => data_digests['SHA1'].hexdigest, + 'data.tar.gz' => Digest::SHA1.hexdigest(tar), }, 'SHA512' => { 'metadata.gz' => metadata_sha512, - 'data.tar.gz' => data_digests['SHA512'].hexdigest, + 'data.tar.gz' => Digest::SHA512.hexdigest(tar), } } diff --git a/test/rubygems/test_gem_package_task.rb b/test/rubygems/test_gem_package_task.rb index 35b38cdbc7..1526e825fe 100644 --- a/test/rubygems/test_gem_package_task.rb +++ b/test/rubygems/test_gem_package_task.rb @@ -4,16 +4,37 @@ require 'rubygems/package_task' class TestGemPackageTask < Gem::TestCase + def setup + super + + Rake.application = Rake::Application.new + RakeFileUtils.verbose_flag = false + end + def test_gem_package gem = Gem::Specification.new do |g| g.name = "pkgr" g.version = "1.2.3" - g.files = Rake::FileList["x"].resolve + + g.authors = %w[author] + g.files = %w[x] + g.summary = 'summary' end + pkg = Gem::PackageTask.new(gem) do |p| p.package_files << "y" end - assert_equal ["x", "y"], pkg.package_files + + assert_equal %w[x y], pkg.package_files + + Dir.chdir @tempdir do + FileUtils.touch 'x' + FileUtils.touch 'y' + + Rake.application['package'].invoke + + assert_path_exists 'pkg/pkgr-1.2.3.gem' + end end def test_gem_package_with_current_platform |