[DRE-commits] [SCM] ruby-crack.git branch, master, updated. upstream/0.3.2-12-g1f950f5

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 1f950f5e5188d35c88efc5ec430813831c19c3ae
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed May 15 17:29:01 2013 +0200

    use sych YAML engine in tests with Ruby1.9

diff --git a/debian/patches/series b/debian/patches/series
index f3d30db..5a126b8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 dont_call_gem
 no-rubygems-need-rexml.patch
+use_syck_in_tests_with_ruby19.patch
diff --git a/debian/patches/use_syck_in_tests_with_ruby19.patch b/debian/patches/use_syck_in_tests_with_ruby19.patch
new file mode 100644
index 0000000..06604d3
--- /dev/null
+++ b/debian/patches/use_syck_in_tests_with_ruby19.patch
@@ -0,0 +1,23 @@
+Description: use syck YAML engine for tests in Ruby1.9
+ Because of the way Psych::SyntaxError are defined, some tests do not pass
+ properly with Ruby1.9 and the Psych default YAML engine.
+ Using Syck instead is a workaround this problem, which has been solved in
+ the Ruby interpreter upstream
+ https://github.com/tenderlove/psych/commit/66e22be9d7e33eb79b204a7d55ebc5abd5284e4d
+Author: Cédric Boutillier <boutil at debian.org>
+Bug: https://github.com/jnunemaker/crack/issues/26
+Last-Update: 2013-05-15
+
+--- a/test/json_test.rb
++++ b/test/json_test.rb
+@@ -1,6 +1,10 @@
+ # coding: utf-8
+ require 'test_helper'
+ 
++if RUBY_VERSION =~ /1\.9/
++  YAML::ENGINE.yamler = "syck"
++end
++
+ class JsonTest < Test::Unit::TestCase  
+   TESTS = {
+     %q({"data": "G\u00fcnter"})                   => {"data" => "Günter"},

-- 
ruby-crack.git