Merge sup-heliotrope#16: Fix YAML regression in 1.9

Squashed commit of the following: commit a26b99c64e2da4115ea47606ae8b66f0b008b002 Author: Whyme Lyu <[email protected]> Date: Tue Mar 26 23:03:50 2013 +0800 Ensure Syck is used. In the long run we'd better drop Syck in favor of Psych commit a99a2b244063c2088d91688f667ee68f05f24df0 Author: Whyme Lyu <[email protected]> Date: Tue Mar 26 23:03:25 2013 +0800 A regression test for YAMLing in 1.9
gauteh · Apr 20, 2013 · ac82b28 · ac82b28
1 parent 66e183c
commit ac82b28
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/bin/sup-config b/bin/sup-config
@@ -2,7 +2,6 @@
 
 require 'rubygems'
 require 'highline/import'
-require 'yaml'
 require 'trollop'
 require "sup"
 

diff --git a/lib/sup.rb b/lib/sup.rb
@@ -1,6 +1,9 @@
 require 'rubygems'
+
 require 'syck'
 require 'yaml'
+YAML::ENGINE.yamler = 'syck'
+
 require 'zlib'
 require 'thread'
 require 'fileutils'

diff --git a/test/test_yaml_regressions.rb b/test/test_yaml_regressions.rb
@@ -0,0 +1,17 @@
+require 'test/unit'
+
+# Requiring 'yaml' before 'sup' in 1.9.x would get Psych loaded first
+# and becoming the default yamler.
+require 'yaml'
+require 'sup'
+
+module Redwood
+  class TestYamlRegressions < Test::Unit::TestCase
+    def test_yamling_hash
+      hsh = {:foo => 42}
+      reloaded = YAML.load(hsh.to_yaml)
+
+      assert_equal reloaded, hsh
+    end
+  end
+end