summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authortenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-23 19:05:47 +0000
committertenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-23 19:05:47 +0000
commit4eaf3d4a511611f0a81d2da23ffb72b7641507f3 (patch)
tree6ad8538abf5a4adc52c364e4c5db79d46e1fdaab /lib
parent7d20942bf6dd54cf54d12d4c9f9dc86b9a813bb4 (diff)
* lib/yaml.rb: switch default YAML engine to Psych, old syck engine
may be enabled via YAML::ENGINE.yamler = "syck". [ruby-core:36374] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31715 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/yaml.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/yaml.rb b/lib/yaml.rb
index 9b5a9b2787..dd89a30e3f 100644
--- a/lib/yaml.rb
+++ b/lib/yaml.rb
@@ -30,6 +30,14 @@ module YAML
ENGINE = YAML::EngineManager.new
end
+begin
+ require 'psych'
+rescue LoadError
+ warn "#{caller[0]}:"
+ warn "It seems your ruby installation is missing psych (for YAML output)."
+ warn "To eliminate this warning, please install libyaml and reinstall your ruby."
+end
+
engine = (!defined?(Syck) && defined?(Psych) ? 'psych' : 'syck')
module Syck