Restore fix from issue #149 for YAML spec loading. Set proper encodin…

…g for Gem::Specification#to_yaml

lib/rubygems/package.rb

@@ -292,7 +292,11 @@ def load_spec entry # :nodoc:
     when 'metadata' then
       @spec = Gem::Specification.from_yaml entry.read
     when 'metadata.gz' then
-      Zlib::GzipReader.wrap entry do |gzio|
+      args = [entry]
+      args << { :external_encoding => Encoding::UTF_8 } if
+        Object.const_defined? :Encoding
+
+      Zlib::GzipReader.wrap *args do |gzio|
         @spec = Gem::Specification.from_yaml gzio.read
       end
     end

lib/rubygems/specification.rb

@@ -2185,6 +2185,7 @@ def to_yaml(opts = {}) # :nodoc:
       ast = builder.tree
 
       io = StringIO.new
+      io.set_encoding Encoding::UTF_8 if Object.const_defined? :Encoding
 
       Psych::Visitors::Emitter.new(io).accept(ast)
 

test/rubygems/test_gem_package.rb

@@ -1,3 +1,5 @@
+# coding: UTF-8
+
 require 'rubygems/package/tar_test_case'
 require 'rubygems/simple_gem'
 
@@ -7,6 +9,7 @@ def setup
     super
 
     @spec = quick_gem 'a' do |s|
+      s.description = 'π'
       s.files = %w[lib/code.rb]
     end
 
@@ -227,6 +230,17 @@ def test_install_location_relative
                  "#{@destination} is not allowed", e.message)
   end
 
+  def test_load_spec
+    entry = StringIO.new Gem.gzip @spec.to_yaml
+    def entry.full_name() 'metadata.gz' end
+
+    package = Gem::Package.new 'nonexistent.gem'
+
+    spec = package.load_spec entry
+
+    assert_equal @spec, spec
+  end
+
   def test_verify
     package = Gem::Package.new @gem