Update stdlib and concat to 6.1.0 both

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

diff --git a/3rdparty/modules/stdlib/lib/puppet/parser/functions/shell_join.rb b/3rdparty/modules/stdlib/lib/puppet/parser/functions/shell_join.rb
index 682ed8d..e498f55 100644 (file)
--- a/3rdparty/modules/stdlib/lib/puppet/parser/functions/shell_join.rb
+++ b/3rdparty/modules/stdlib/lib/puppet/parser/functions/shell_join.rb
@@ -1,23 +1,25 @@
+
+require 'shellwords'
 #
 # shell_join.rb
 #
-
-require 'shellwords'
-
 module Puppet::Parser::Functions
-  newfunction(:shell_join, :type => :rvalue, :doc => <<-EOS
-Builds a command line string from the given array of strings. Each array item is escaped for Bourne shell. All items are
-then joined together, with a single space in between.
+  newfunction(:shell_join, :type => :rvalue, :doc => <<-DOC
+    @summary
+    Builds a command line string from the given array of strings.
+    Each array item is escaped for Bourne shell. All items are then joined together, with a single space in between.
+    This function behaves the same as ruby's Shellwords.shelljoin() function
 
-This function behaves the same as ruby's Shellwords.shelljoin() function
-  EOS
-  ) do |arguments|
+    @return
+      a command line string
+  DOC
+             ) do |arguments|
 
     raise(Puppet::ParseError, "shell_join(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.size != 1
 
     array = arguments[0]
 
-    raise Puppet::ParseError, ("First argument is not an Array: #{array.inspect}") unless array.is_a?(Array)
+    raise Puppet::ParseError, "First argument is not an Array: #{array.inspect}" unless array.is_a?(Array)
 
     # explicit conversion to string is required for ruby 1.9
     array = array.map { |item| item.to_s }