Merge remote-tracking branch 'upstream/master'

Author: mattmanning

CHANGELOG.md

@@ -1,3 +1,9 @@
+## v12 (12/13/2011)
+
+Bugfixes:
+
+* syck workaround for yaml/psych issues
+
 ## v11 (12/12/2011)
 
 Features:

lib/language_pack/ruby.rb

@@ -238,6 +238,7 @@ def build_bundler
     log("bundle") do
       bundle_without = ENV["BUNDLE_WITHOUT"] || "development:test"
       bundle_command = "bundle install --without #{bundle_without} --path vendor/bundle --binstubs bin/"
+      syck_hack      = File.expand_path(File.join(File.dirname(__FILE__), "../../vendor/syck_hack"))
 
       unless File.exist?("Gemfile.lock")
         error "Gemfile.lock is required. Please run \"bundle install\" locally\nand commit your Gemfile.lock."
@@ -254,7 +255,7 @@ def build_bundler
 
       cache_load "vendor/bundle"
 
-      version = run("bundle version").strip
+      version = run("env RUBYOPT=\"-r #{syck_hack}\" bundle version").strip
       topic("Installing dependencies using #{version}")
 
       bundler_output = ""
@@ -268,7 +269,7 @@ def build_bundler
         pwd            = run("pwd").chomp
         # we need to set BUNDLE_CONFIG and BUNDLE_GEMFILE for
         # codon since it uses bundler.
-        env_vars       = "env BUNDLE_GEMFILE=#{pwd}/Gemfile BUNDLE_CONFIG=#{pwd}/.bundle/config CPATH=#{yaml_include}:$CPATH CPPATH=#{yaml_include}:$CPPATH LIBRARY_PATH=#{yaml_lib}:$LIBRARY_PATH"
+        env_vars       = "env BUNDLE_GEMFILE=#{pwd}/Gemfile BUNDLE_CONFIG=#{pwd}/.bundle/config CPATH=#{yaml_include}:$CPATH CPPATH=#{yaml_include}:$CPPATH LIBRARY_PATH=#{yaml_lib}:$LIBRARY_PATH RUBYOPT=\"-r #{syck_hack}\""
         puts "Running: #{bundle_command}"
         bundler_output << pipe("#{env_vars} #{bundle_command} --no-clean 2>&1")
 

vendor/syck_hack.rb

@@ -0,0 +1,61 @@
+# :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
+
+  # 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: