Update stdlib and concat to 6.1.0 both

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

diff --git a/3rdparty/modules/stdlib/lib/puppet/parser/functions/glob.rb b/3rdparty/modules/stdlib/lib/puppet/parser/functions/glob.rb
index 54cdda6..5475b74 100644 (file)
--- a/3rdparty/modules/stdlib/lib/puppet/parser/functions/glob.rb
+++ b/3rdparty/modules/stdlib/lib/puppet/parser/functions/glob.rb
@@ -1,21 +1,30 @@
 #
 #  glob.rb
 #
-
 module Puppet::Parser::Functions
-  newfunction(:glob, :type => :rvalue, :doc => <<-'EOS'
-    Returns an Array of file entries of a directory or an Array of directories.
-    Uses same patterns as Dir#glob
-    EOS
-  ) do |arguments|
+  newfunction(:glob, :type => :rvalue, :doc => <<-DOC
+    @summary
+      Uses same patterns as Dir#glob.
+
+    @return
+      Returns an Array of file entries of a directory or an Array of directories.
+
+    @example Example Usage:
+      $confs = glob(['/etc/**/*.conf', '/opt/**/*.conf'])
+    DOC
+             ) do |arguments|
 
-    raise(Puppet::ParseError, "glob(): Wrong number of arguments given " +
-      "(#{arguments.size} for 1)") unless arguments.size == 1
+    unless arguments.size == 1
+      raise(Puppet::ParseError, 'glob(): Wrong number of arguments given ' \
+        "(#{arguments.size} for 1)")
+    end
 
     pattern = arguments[0]
 
-    raise(Puppet::ParseError, 'glob(): Requires either array or string ' +
-      'to work') unless pattern.is_a?(String) || pattern.is_a?(Array)
+    unless pattern.is_a?(String) || pattern.is_a?(Array)
+      raise(Puppet::ParseError, 'glob(): Requires either array or string ' \
+        'to work')
+    end
 
     Dir.glob(pattern)
   end