slimgems 1.3.9.4 → 1.3.9.5

data/lib/rubygems.rb

@@ -106,7 +106,7 @@ require 'thread'
 module Gem
   NAME = 'SlimGems'
   GEM_NAME = 'slimgems'
-  VERSION = '1.3.9.4'
+  VERSION = '1.3.9.5'
   SlimGemsVersion = RubyGemsVersion = VERSION
 
   ##
@@ -633,24 +633,54 @@ module Gem
   ##
   # Loads YAML, preferring Psych
 
+@yaml_loaded = false
+
+  ##
+  # Loads YAML, preferring Psych
+
   def self.load_yaml
-    begin
-      require 'psych' unless ENV['TEST_SYCK']
-    rescue ::LoadError
-    ensure
-      require 'yaml'
-    end
+    return if @yaml_loaded
+
+    test_syck = ENV['TEST_SYCK']
+
+    unless test_syck
+      begin
+        gem 'psych', '~> 1.2', '>= 1.2.1'
+      rescue Gem::LoadError
+        # It's OK if the user does not have the psych gem installed.  We will
+        # attempt to require the stdlib version
+      end
 
-    # Hack to handle syck's DefaultKey bug with psych.
-    # See the note at the top of lib/rubygems/requirement.rb for
-    # why we end up defining DefaultKey more than once.
-    if !defined? YAML::Syck
-      YAML.module_eval do
-          const_set 'Syck', Module.new {
-            const_set 'DefaultKey', Class.new
-          }
+      begin
+        # Try requiring the gem version *or* stdlib version of psych.
+        require 'psych'
+      rescue ::LoadError
+        # If we can't load psych, thats fine, go on.
+      else
+        # If 'yaml' has already been required, then we have to
+        # be sure to switch it over to the newly loaded psych.
+        if defined?(YAML::ENGINE) && YAML::ENGINE.yamler != "psych"
+          YAML::ENGINE.yamler = "psych"
         end
+
+        require 'rubygems/psych_additions'
+        require 'rubygems/psych_tree'
+      end
     end
+
+    require 'yaml'
+
+    # If we're supposed to be using syck, then we may have to force
+    # activate it via the YAML::ENGINE API.
+    if test_syck and defined?(YAML::ENGINE)
+      YAML::ENGINE.yamler = "syck" unless YAML::ENGINE.syck?
+    end
+
+    # Now that we're sure some kind of yaml library is loaded, pull
+    # in our hack to deal with Syck's DefaultKey ugliness.
+    require 'rubygems/syck_hack'
+
+    @yaml_loaded = true
   end
 
   ##

data/lib/rubygems/psych_additions.rb

@@ -0,0 +1,9 @@
+# This exists just to satify bugs in marshal'd gemspecs that
+# contain a reference to YAML::PrivateType. We prune these out
+# in Specification._load, but if we don't have the constant, Marshal
+# blows up.
+
+module Psych
+  class PrivateType
+  end
+end

data/lib/rubygems/psych_tree.rb

@@ -0,0 +1,27 @@
+module Gem
+  if defined? ::Psych::Visitors
+    class NoAliasYAMLTree < Psych::Visitors::YAMLTree
+      def visit_String(str)
+        return super unless str == '=' # or whatever you want
+
+        quote = Psych::Nodes::Scalar::SINGLE_QUOTED
+        @emitter.scalar str, nil, nil, false, true, quote
+      end
+
+      # Noop this out so there are no anchors
+      def register(target, obj)
+      end
+
+      # This is ported over from the yaml_tree in 1.9.3
+      def format_time time
+        if time.utc?
+          time.strftime("%Y-%m-%d %H:%M:%S.%9N Z")
+        else
+          time.strftime("%Y-%m-%d %H:%M:%S.%9N %:z")
+        end
+      end
+
+      private :format_time
+    end
+  end
+end

data/lib/rubygems/requirement.rb

@@ -129,18 +129,15 @@ class Gem::Requirement
   end
 
   def marshal_dump # :nodoc:
+    fix_syck_default_key_in_requirements
+
     [@requirements]
   end
 
   def marshal_load array # :nodoc:
     @requirements = array[0]
 
-    # Fixup the Syck DefaultKey bug
-    @requirements.each do |r|
-      if r[0].kind_of? YAML::Syck::DefaultKey
-        r[0] = "="
-      end
-    end
+    fix_syck_default_key_in_requirements
   end
 
   def prerelease?
@@ -157,7 +154,7 @@ class Gem::Requirement
   # True if +version+ satisfies this Requirement.
 
   def satisfied_by? version
-    requirements.all? { |op, rv| OPS[op].call version, rv }
+    requirements.all? { |op, rv| (OPS[op] || OPS["="]).call version, rv }
   end
 
   def to_s # :nodoc:
@@ -167,6 +164,20 @@ class Gem::Requirement
   def <=> other # :nodoc:
     to_s <=> other.to_s
   end
+
+  private
+
+  def fix_syck_default_key_in_requirements
+    Gem.load_yaml
+
+    # Fixup the Syck DefaultKey bug
+    @requirements.each do |r|
+      if r[0].kind_of? Gem::SyckDefaultKey
+        r[0] = "="
+      end
+    end
+  end
+
 end
 
 # :stopdoc:

data/lib/rubygems/specification.rb

@@ -504,7 +504,11 @@ class Gem::Specification
     gemspec = nil
     raise "NESTED Specification.load calls not allowed!" if @@gather
     @@gather = proc { |gs| gemspec = gs }
-    data = File.read filename
+    if defined? Encoding
+      data = File.read filename, :mode => 'r:UTF-8:-'
+    else
+      data = File.read filename
+    end
     eval data, nil, filename
     gemspec
   ensure

data/lib/rubygems/syck_hack.rb

@@ -0,0 +1,74 @@
+# :stopdoc:
+
+# Hack to handle syck's DefaultKey bug
+#
+# This file is always loaded AFTER either syck or psych are already
+# loaded. It then looks at what constants are available and creates
+# a consistent view on all rubys.
+#
+# All this is so that there is always a YAML::Syck::DefaultKey
+# class no matter if the full yaml library has loaded or not.
+#
+
+module YAML
+  # In newer 1.9.2, there is a Syck toplevel constant instead of it
+  # being underneith YAML. If so, reference it back under YAML as
+  # well.
+  if defined? ::Syck
+    # for tests that change YAML::ENGINE
+    # 1.8 does not support the second argument to const_defined?
+    remove_const :Syck rescue nil
+
+    Syck = ::Syck
+
+  # JRuby's "Syck" is called "Yecht"
+  elsif defined? YAML::Yecht
+    Syck = YAML::Yecht
+
+  # Otherwise, if there is no YAML::Syck, then we've got just psych
+  # loaded, so lets define a stub for DefaultKey.
+  elsif !defined? YAML::Syck
+    module Syck
+      class DefaultKey
+      end
+    end
+  end
+
+  # Now that we've got something that is always here, define #to_s
+  # so when code tries to use this, it at least just shows up like it
+  # should.
+  module Syck
+    class DefaultKey
+      remove_method :to_s rescue nil
+
+      def to_s
+        '='
+      end
+    end
+  end
+end
+
+# Sometime in the 1.9 dev cycle, the Syck constant was moved from under YAML
+# to be a toplevel constant. So gemspecs created under these versions of Syck
+# will have references to Syck::DefaultKey.
+#
+# So we need to be sure that we reference Syck at the toplevel too so that
+# we can always load these kind of gemspecs.
+#
+if !defined?(Syck)
+  Syck = YAML::Syck
+end
+
+# Now that we've got Syck setup in all the right places, store
+# a reference to the DefaultKey class inside Gem. We do this so that
+# if later on YAML, etc are redefined, we've still got a consistent
+# place to find the DefaultKey class for comparison.
+
+module Gem
+  # for tests that change YAML::ENGINE
+  remove_const :SyckDefaultKey if const_defined? :SyckDefaultKey
+
+  SyckDefaultKey = YAML::Syck::DefaultKey
+end
+
+# :startdoc:

data/test/test_gem_specification.rb

@@ -177,6 +177,30 @@ end
     @a2.files.clear
   end
 
+  def test_self_load_utf8_with_ascii_encoding
+    int_enc = Encoding.default_internal
+    Encoding.default_internal = 'US-ASCII'
+    
+    spec2 = @a2.dup
+    bin = "\u5678"
+    full_path = nil
+    write_file spec2.spec_name do |io|
+      full_path = io.path
+      io.write spec2.to_ruby.force_encoding('BINARY').sub("\\u{5678}", bin.force_encoding('BINARY'))
+    end
+
+    begin
+      spec = Gem::Specification.load full_path
+      assert true
+    rescue Encoding::UndefinedConversionError => e
+      assert false, "raised encoding conversion error: #{e}"
+    end
+
+    assert_equal spec2, spec
+  ensure
+    Encoding.default_internal = int_enc
+  end if defined?(Encoding)
+
   def test_self_load_legacy_ruby
     spec = eval LEGACY_RUBY_SPEC
     assert_equal 'keyedlist', spec.name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slimgems
 version: !ruby/object:Gem::Version
-  version: 1.3.9.4
+  version: 1.3.9.5
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-08 00:00:00.000000000 -05:00
+date: 2012-05-08 00:00:00.000000000 -04:00
 default_executable: 
 dependencies: []
 description: ! "SlimGems is a drop-in replacement for RubyGems, a package management
@@ -102,6 +102,8 @@ files:
 - lib/rubygems/package.rb
 - lib/rubygems/package_task.rb
 - lib/rubygems/platform.rb
+- lib/rubygems/psych_additions.rb
+- lib/rubygems/psych_tree.rb
 - lib/rubygems/remote_fetcher.rb
 - lib/rubygems/require_paths_builder.rb
 - lib/rubygems/requirement.rb
@@ -112,6 +114,7 @@ files:
 - lib/rubygems/source_info_cache_entry.rb
 - lib/rubygems/spec_fetcher.rb
 - lib/rubygems/specification.rb
+- lib/rubygems/syck_hack.rb
 - lib/rubygems/test_utilities.rb
 - lib/rubygems/text.rb
 - lib/rubygems/uninstaller.rb
@@ -216,7 +219,7 @@ files:
 has_rdoc: true
 homepage: http://slimgems.github.com
 licenses: []
-post_install_message: ! "Upgraded from RubyGems to SlimGems 1.3.9.4\n\uFEFF=== 1.3.9.3
+post_install_message: ! "Upgraded from RubyGems to SlimGems 1.3.9.5\n\uFEFF=== 1.3.9.3
   / 2011-09-07\n\nSlimGems is a drop-in replacement for RubyGems. See README.md for
   more.\n\n* Add support for Ruby 1.9.3 preview release (#9)\n* Fix rubygems-pwn gem
   install remote execution vulnerability (#10)\n\n"
@@ -237,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.3.9.3
+rubygems_version: 1.3.9.4
 signing_key: 
 specification_version: 3
 summary: SlimGems is a package management framework for Ruby