From 6c1da63bd77b4caa409b919f8c9893b27f9ae1be Mon Sep 17 00:00:00 2001
From: drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 18 Apr 2012 00:04:12 +0000
Subject: * lib/rubygems:  Update to RubyGems 1.8.22 plus r33517 and r35337
 which   were ported to the rubygems git repository.

  See https://github.com/rubygems/rubygems/blob/1.8/History.txt for
  changes since 1.8.11.
* test/rubygems:  ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35374 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rubygems/syck_hack.rb | 71 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 lib/rubygems/syck_hack.rb

(limited to 'lib/rubygems/syck_hack.rb')

diff --git a/lib/rubygems/syck_hack.rb b/lib/rubygems/syck_hack.rb
new file mode 100644
index 0000000000..065d7b9614
--- /dev/null
+++ b/lib/rubygems/syck_hack.rb
@@ -0,0 +1,71 @@
+# :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
+    remove_const :Syck if const_defined? :Syck, false
+    
+    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
+      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:
-- 
cgit v1.2.3