Update stdlib and concat to 6.1.0 both

[mirror/dsa-puppet.git] / 3rdparty / modules / stdlib / lib / puppet / parser / functions / parseyaml.rb

diff --git a/3rdparty/modules/stdlib/lib/puppet/parser/functions/parseyaml.rb b/3rdparty/modules/stdlib/lib/puppet/parser/functions/parseyaml.rb
index 53d54fa..5d081e6 100644 (file)
--- a/3rdparty/modules/stdlib/lib/puppet/parser/functions/parseyaml.rb
+++ b/3rdparty/modules/stdlib/lib/puppet/parser/functions/parseyaml.rb
@@ -1,23 +1,32 @@
 #
 # parseyaml.rb
 #
-
 module Puppet::Parser::Functions
-  newfunction(:parseyaml, :type => :rvalue, :doc => <<-EOS
-This function accepts YAML as a string and converts it into the correct
-Puppet structure.
-    EOS
-  ) do |arguments|
+  newfunction(:parseyaml, :type => :rvalue, :doc => <<-DOC
+    @summary
+      This function accepts YAML as a string and converts it into the correct
+      Puppet structure.
 
-    if (arguments.size != 1) then
-      raise(Puppet::ParseError, "parseyaml(): Wrong number of arguments "+
-        "given #{arguments.size} for 1")
-    end
+    @return
+      converted YAML into Puppet structure
 
+    > *Note:*
+      The optional second argument can be used to pass a default value that will
+      be returned if the parsing of YAML string have failed.
+  DOC
+             ) do |arguments|
+    raise ArgumentError, 'Wrong number of arguments. 1 or 2 arguments should be provided.' unless arguments.length >= 1
     require 'yaml'
 
-    YAML::load(arguments[0])
-
+    begin
+      YAML.load(arguments[0]) || arguments[1] # rubocop:disable Security/YAMLLoad : using YAML.safe_load causes the code to break
+      # in ruby 1.9.3 Psych::SyntaxError is a RuntimeException
+      # this still needs to catch that and work also on rubies that
+      # do not have Psych available.
+    rescue StandardError, Psych::SyntaxError => e # rubocop:disable Lint/ShadowedException : See above
+      raise e unless arguments[1]
+      arguments[1]
+    end
   end
 end