X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Frstrip.rb;h=fc809c8bfb63c000baf87d908d98ca0cfdf561cf;hb=30caaa85aed7015ca0d77216bff175eebd917eb7;hp=e24abd5536c5cd489c220eacd780f32963b2ea54;hpb=6963202b4b62c2816655ac9532521b018fdf83bd;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/lib/puppet/parser/functions/rstrip.rb b/3rdparty/modules/stdlib/lib/puppet/parser/functions/rstrip.rb
index e24abd553..fc809c8bf 100644
--- a/3rdparty/modules/stdlib/lib/puppet/parser/functions/rstrip.rb
+++ b/3rdparty/modules/stdlib/lib/puppet/parser/functions/rstrip.rb
@@ -1,14 +1,20 @@
 #
 #  rstrip.rb
 #
-
 module Puppet::Parser::Functions
-  newfunction(:rstrip, :type => :rvalue, :doc => <<-EOS
-Strips leading spaces to the right of the string.
-    EOS
-  ) do |arguments|
+  newfunction(:rstrip, :type => :rvalue, :doc => <<-DOC
+    @summary
+      Strips leading spaces to the right of the string.
+
+    @return
+      the string with leading spaces removed
 
-    raise(Puppet::ParseError, "rstrip(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.size < 1
+    > *Note:* from Puppet 6.0.0, the compatible function with the same name in Puppet core
+    will be used instead of this function.
+    DOC
+             ) do |arguments|
+
+    raise(Puppet::ParseError, "rstrip(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.empty?
 
     value = arguments[0]
 
@@ -16,11 +22,11 @@ Strips leading spaces to the right of the string.
       raise(Puppet::ParseError, 'rstrip(): Requires either array or string to work with')
     end
 
-    if value.is_a?(Array)
-      result = value.collect { |i| i.is_a?(String) ? i.rstrip : i }
-    else
-      result = value.rstrip
-    end
+    result = if value.is_a?(Array)
+               value.map { |i| i.is_a?(String) ? i.rstrip : i }
+             else
+               value.rstrip
+             end
 
     return result
   end