diff options
author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-04-17 20:50:00 +0000 |
---|---|---|
committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-04-17 20:50:00 +0000 |
commit | 22d9456b7917fe96fa81fd1d994073312753af8b (patch) | |
tree | be157928ed84f75988ceb82a070797c3482b66a6 /lib/rubygems/syck_hack.rb | |
parent | 22263729af357eb86e8bc2165a9eaa6f25eec8a6 (diff) |
* 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@35370 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/syck_hack.rb')
-rw-r--r-- | lib/rubygems/syck_hack.rb | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/lib/rubygems/syck_hack.rb b/lib/rubygems/syck_hack.rb new file mode 100644 index 0000000000..154d1d16f1 --- /dev/null +++ b/lib/rubygems/syck_hack.rb @@ -0,0 +1,65 @@ +# :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 + 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 + SyckDefaultKey = YAML::Syck::DefaultKey +end + +# :startdoc: |