X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fconvert_base.rb;h=da5ff2690afa6559b4715706b7b6069dcb2a73b9;hb=131e09855e065be940e104d9ab0f18940cc76257;hp=0fcbafeaf747925cd7e66215fa4907b2ec520367;hpb=6963202b4b62c2816655ac9532521b018fdf83bd;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/lib/puppet/parser/functions/convert_base.rb b/3rdparty/modules/stdlib/lib/puppet/parser/functions/convert_base.rb
index 0fcbafeaf..da5ff2690 100644
--- a/3rdparty/modules/stdlib/lib/puppet/parser/functions/convert_base.rb
+++ b/3rdparty/modules/stdlib/lib/puppet/parser/functions/convert_base.rb
@@ -1,7 +1,8 @@
+#
+# convert_base.rb
+#
 module Puppet::Parser::Functions
-
-  newfunction(:convert_base, :type => :rvalue, :arity => 2, :doc => <<-'ENDHEREDOC') do |args|
-
+  newfunction(:convert_base, :type => :rvalue, :arity => 2, :doc => <<-'DOC') do |args|
     Converts a given integer or base 10 string representing an integer to a specified base, as a string.
 
     Usage:
@@ -9,26 +10,31 @@ module Puppet::Parser::Functions
       $binary_repr = convert_base(5, 2)  # $binary_repr is now set to "101"
       $hex_repr = convert_base("254", "16")  # $hex_repr is now set to "fe"
 
-    ENDHEREDOC
+     Note: Since Puppet 4.5.0 this can be done with String.new() and its many formatting options:
+
+       $binary_repr = String(5, '%b') # results in "101"
+       $hex_repr = String(254, "%x")  # results in "fe"
+       $hex_repr = String(254, "%#x")  # results in "0xfe"
+    DOC
 
-    raise Puppet::ParseError, ("convert_base(): First argument must be either a string or an integer") unless (args[0].is_a?(Integer) or args[0].is_a?(String))
-    raise Puppet::ParseError, ("convert_base(): Second argument must be either a string or an integer") unless (args[1].is_a?(Integer) or args[1].is_a?(String))
+    raise Puppet::ParseError, 'convert_base(): First argument must be either a string or an integer' unless args[0].is_a?(Integer) || args[0].is_a?(String)
+    raise Puppet::ParseError, 'convert_base(): Second argument must be either a string or an integer' unless args[1].is_a?(Integer) || args[1].is_a?(String)
 
     if args[0].is_a?(String)
-      raise Puppet::ParseError, ("convert_base(): First argument must be an integer or a string corresponding to an integer in base 10") unless args[0] =~ /^[0-9]+$/
+      raise Puppet::ParseError, 'convert_base(): First argument must be an integer or a string corresponding to an integer in base 10' unless args[0] =~ %r{^[0-9]+$}
     end
 
     if args[1].is_a?(String)
-      raise Puppet::ParseError, ("convert_base(): First argument must be an integer or a string corresponding to an integer in base 10") unless args[1] =~ /^[0-9]+$/
+      raise Puppet::ParseError, 'convert_base(): First argument must be an integer or a string corresponding to an integer in base 10' unless args[1] =~ %r{^[0-9]+$}
     end
 
     number_to_convert = args[0]
     new_base = args[1]
 
-    number_to_convert = number_to_convert.to_i()
-    new_base = new_base.to_i()
+    number_to_convert = number_to_convert.to_i
+    new_base = new_base.to_i
 
-    raise Puppet::ParseError, ("convert_base(): base must be at least 2 and must not be greater than 36") unless new_base >= 2 and new_base <= 36
+    raise Puppet::ParseError, 'convert_base(): base must be at least 2 and must not be greater than 36' unless new_base >= 2 && new_base <= 36
 
     return number_to_convert.to_s(new_base)
   end