diff options
| -rw-r--r-- | lib/rubygems/commands/unpack_command.rb | 3 | ||||
| -rw-r--r-- | lib/rubygems/package.rb | 3 | ||||
| -rw-r--r-- | test/rubygems/test_gem_package.rb | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/lib/rubygems/commands/unpack_command.rb b/lib/rubygems/commands/unpack_command.rb index 317fd44251..09829d873c 100644 --- a/lib/rubygems/commands/unpack_command.rb +++ b/lib/rubygems/commands/unpack_command.rb @@ -85,7 +85,7 @@ command help for an example. end if @options[:spec] - spec, metadata = Gem::Package.metadata(path, security_policy) + spec, metadata = Gem::Package.raw_spec(path, security_policy) if metadata.nil? alert_error "--spec is unsupported on '#{name}' (old format gem)" @@ -173,4 +173,5 @@ command help for an example. path end + end diff --git a/lib/rubygems/package.rb b/lib/rubygems/package.rb index b667196bfc..06b1dc0db3 100644 --- a/lib/rubygems/package.rb +++ b/lib/rubygems/package.rb @@ -161,7 +161,7 @@ class Gem::Package # +path+. #-- - def self.metadata(path, security_policy = nil) + def self.raw_spec(path, security_policy = nil) format = new(path, security_policy) spec = format.spec @@ -716,6 +716,7 @@ EOM rescue Zlib::GzipFile::Error => e raise Gem::Package::FormatError.new(e.message, entry.full_name) end + end require 'rubygems/package/digest_io' diff --git a/test/rubygems/test_gem_package.rb b/test/rubygems/test_gem_package.rb index c7b3cb3e20..e07304e9a5 100644 --- a/test/rubygems/test_gem_package.rb +++ b/test/rubygems/test_gem_package.rb @@ -420,7 +420,7 @@ class TestGemPackage < Gem::Package::TarTestCase assert_equal %w[lib/code.rb], reader.contents end - def test_metadata + def test_raw_spec data_tgz = util_tar_gz { } gem = util_tar do |tar| @@ -441,7 +441,7 @@ class TestGemPackage < Gem::Package::TarTestCase io.write gem.string end - spec, metadata = Gem::Package.metadata(gem_path) + spec, metadata = Gem::Package.raw_spec(gem_path) assert_equal @spec, spec assert_match @spec.to_yaml, metadata.force_encoding("UTF-8") |