drbrain	2011-08-12 09:42:44 +0900 (Fri, 12 Aug 2011)

  New Revision: 32942

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32942

  Log:
    * backport r32941 from trunk
    
    * lib/rubygems:  Import RubyGems 1.8.8.  Fixes encoding of YAML gemspec
      from gems.  Github Issue #149

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/lib/rubygems/package/tar_input.rb
    branches/ruby_1_9_3/lib/rubygems.rb

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 32941)
+++ ruby_1_9_3/ChangeLog	(revision 32942)
@@ -1,3 +1,10 @@
+Fri Aug 12 09:00:24 2011  Eric Hodel  <drbrain@s...>
+
+	* backport r32941 from trunk
+
+	* lib/rubygems:  Import RubyGems 1.8.8.  Fixes encoding of YAML gemspec
+	  from gems.  Github Issue #149
+
 Fri Aug 12 03:24:35 2011  Eric Hodel  <drbrain@s...>
 
 	* backport r32935 from trunk
Index: ruby_1_9_3/lib/rubygems/package/tar_input.rb
===================================================================
--- ruby_1_9_3/lib/rubygems/package/tar_input.rb	(revision 32941)
+++ ruby_1_9_3/lib/rubygems/package/tar_input.rb	(revision 32942)
@@ -49,8 +49,13 @@
             sio.rewind
           end
 
-          # TODO use Gem.gunzip
-          gzis = Zlib::GzipReader.new(sio || entry)
+          # Ruby 1.8 doesn't have encoding and YAML is UTF-8
+          args = [sio || entry]
+          args << { :external_encoding => Encoding::UTF_8 } if
+            Object.const_defined?(:Encoding)
+
+          gzis = Zlib::GzipReader.new(*args)
+
           # YAML wants an instance of IO
           @metadata = load_gemspec(gzis)
           has_meta = true
Index: ruby_1_9_3/lib/rubygems.rb
===================================================================
--- ruby_1_9_3/lib/rubygems.rb	(revision 32941)
+++ ruby_1_9_3/lib/rubygems.rb	(revision 32942)
@@ -118,7 +118,7 @@
 # -The RubyGems Team
 
 module Gem
-  VERSION = '1.8.7'
+  VERSION = '1.8.8'
 
   ##
   # Raised when RubyGems is unable to load or activate a gem.  Contains the

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/