(MODULES-4473) join strings for i18n parser

This commit joins all strings that are split over two lines with a plus,
backslash, or double less than so that our magical i18n parser can wave
over the module and mark every ruby string with our i18n function.

lib/puppet/parser/functions/abs.rb

@@ -9,8 +9,7 @@ module Puppet::Parser::Functions
     EOS
   ) do |arguments|
 
-    raise(Puppet::ParseError, "abs(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
+    raise(Puppet::ParseError, "abs(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.size < 1
 
     value = arguments[0]
 
@@ -21,8 +20,7 @@ module Puppet::Parser::Functions
       elsif value.match(/^-?\d+$/)
         value = value.to_i
       else
-        raise(Puppet::ParseError, 'abs(): Requires float or ' +
-          'integer to work with')
+        raise(Puppet::ParseError, 'abs(): Requires float or integer to work with')
       end
     end
 

lib/puppet/parser/functions/any2bool.rb

@@ -15,8 +15,7 @@ module Puppet::Parser::Functions
     EOS
   ) do |arguments|
 
-    raise(Puppet::ParseError, "any2bool(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
+    raise(Puppet::ParseError, "any2bool(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.size < 1
 
     # If argument is already Boolean, return it
     if !!arguments[0] == arguments[0]

lib/puppet/parser/functions/assert_private.rb

@@ -9,8 +9,7 @@ module Puppet::Parser::Functions
     EOS
   ) do |args|
 
-    raise(Puppet::ParseError, "assert_private(): Wrong number of arguments "+
-      "given (#{args.size}}) for 0 or 1)") if args.size > 1
+    raise(Puppet::ParseError, "assert_private(): Wrong number of arguments given (#{args.size}}) for 0 or 1)") if args.size > 1
 
     scope = self
     if scope.lookupvar('module_name') != scope.lookupvar('caller_module_name')

lib/puppet/parser/functions/bool2num.rb

@@ -11,8 +11,7 @@ module Puppet::Parser::Functions
     EOS
   ) do |arguments|
 
-    raise(Puppet::ParseError, "bool2num(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
+    raise(Puppet::ParseError, "bool2num(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.size < 1
 
     value = function_str2bool([arguments[0]])
 

lib/puppet/parser/functions/bool2str.rb

@@ -20,8 +20,7 @@ module Puppet::Parser::Functions
   ) do |arguments|
 
     unless arguments.size == 1 or arguments.size == 3
-      raise(Puppet::ParseError, "bool2str(): Wrong number of arguments " +
-                                "given (#{arguments.size} for 3)")
+      raise(Puppet::ParseError, "bool2str(): Wrong number of arguments given (#{arguments.size} for 3)")
     end
 
     value = arguments[0]

lib/puppet/parser/functions/camelcase.rb

@@ -8,15 +8,13 @@ module Puppet::Parser::Functions
     EOS
   ) do |arguments|
 
-    raise(Puppet::ParseError, "camelcase(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
+    raise(Puppet::ParseError, "camelcase(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.size < 1
 
     value = arguments[0]
     klass = value.class
 
     unless [Array, String].include?(klass)
-      raise(Puppet::ParseError, 'camelcase(): Requires either ' +
-        'array or string to work with')
+      raise(Puppet::ParseError, 'camelcase(): Requires either array or string to work with')
     end
 
     if value.is_a?(Array)

lib/puppet/parser/functions/capitalize.rb

@@ -9,14 +9,12 @@ module Puppet::Parser::Functions
     EOS
   ) do |arguments|
 
-    raise(Puppet::ParseError, "capitalize(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
+    raise(Puppet::ParseError, "capitalize(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.size < 1
 
     value = arguments[0]
 
     unless value.is_a?(Array) || value.is_a?(String)
-      raise(Puppet::ParseError, 'capitalize(): Requires either ' +
-        'array or string to work with')
+      raise(Puppet::ParseError, 'capitalize(): Requires either array or string to work with')
     end
 
     if value.is_a?(Array)

lib/puppet/parser/functions/ceiling.rb

@@ -5,18 +5,15 @@ module Puppet::Parser::Functions
     EOS
   ) do |arguments|
 
-    raise(Puppet::ParseError, "ceiling(): Wrong number of arguments " +
-          "given (#{arguments.size} for 1)") if arguments.size != 1
+    raise(Puppet::ParseError, "ceiling(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.size != 1
 
     begin
       arg = Float(arguments[0])
     rescue TypeError, ArgumentError => e
-      raise(Puppet::ParseError, "ceiling(): Wrong argument type " +
-            "given (#{arguments[0]} for Numeric)")
+      raise(Puppet::ParseError, "ceiling(): Wrong argument type given (#{arguments[0]} for Numeric)")
     end
 
-    raise(Puppet::ParseError, "ceiling(): Wrong argument type " +
-          "given (#{arg.class} for Numeric)") if arg.is_a?(Numeric) == false
+    raise(Puppet::ParseError, "ceiling(): Wrong argument type given (#{arg.class} for Numeric)") if arg.is_a?(Numeric) == false
 
     arg.ceil
   end

lib/puppet/parser/functions/chomp.rb

@@ -10,14 +10,12 @@ module Puppet::Parser::Functions
     EOS
   ) do |arguments|
 
-    raise(Puppet::ParseError, "chomp(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
+    raise(Puppet::ParseError, "chomp(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.size < 1
 
     value = arguments[0]
 
     unless value.is_a?(Array) || value.is_a?(String)
-      raise(Puppet::ParseError, 'chomp(): Requires either ' +
-        'array or string to work with')
+      raise(Puppet::ParseError, 'chomp(): Requires either array or string to work with')
     end
 
     if value.is_a?(Array)

lib/puppet/parser/functions/chop.rb

@@ -12,14 +12,12 @@ module Puppet::Parser::Functions
     EOS
   ) do |arguments|
 
-    raise(Puppet::ParseError, "chop(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
+    raise(Puppet::ParseError, "chop(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.size < 1
 
     value = arguments[0]
 
     unless value.is_a?(Array) || value.is_a?(String)
-      raise(Puppet::ParseError, 'chop(): Requires either an ' +
-        'array or string to work with')
+      raise(Puppet::ParseError, 'chop(): Requires either an array or string to work with')
     end
 
     if value.is_a?(Array)

lib/puppet/parser/functions/clamp.rb

@@ -10,8 +10,7 @@ module Puppet::Parser::Functions
 
     args.flatten!
 
-    raise(Puppet::ParseError, 'clamp(): Wrong number of arguments, ' +
-          'need three to clamp') if args.size != 3
+    raise(Puppet::ParseError, 'clamp(): Wrong number of arguments, need three to clamp') if args.size != 3
 
     # check values out
     args.each do |value|

lib/puppet/parser/functions/concat.rb

@@ -17,8 +17,7 @@ module Puppet::Parser::Functions
   ) do |arguments|
 
     # Check that more than 2 arguments have been given ...
-    raise(Puppet::ParseError, "concat(): Wrong number of arguments " +
-      "given (#{arguments.size} for < 2)") if arguments.size < 2
+    raise(Puppet::ParseError, "concat(): Wrong number of arguments given (#{arguments.size} for < 2)") if arguments.size < 2
 
     a = arguments[0]
 

lib/puppet/parser/functions/count.rb

@@ -7,8 +7,7 @@ module Puppet::Parser::Functions
   ) do |args|
 
     if (args.size > 2) then
-      raise(ArgumentError, "count(): Wrong number of arguments "+
-        "given #{args.size} for 1 or 2.")
+      raise(ArgumentError, "count(): Wrong number of arguments given #{args.size} for 1 or 2.")
     end
 
     collection, item = args

lib/puppet/parser/functions/delete.rb

@@ -23,8 +23,7 @@ module Puppet::Parser::Functions
   EOS
   ) do |arguments|
 
-    raise(Puppet::ParseError, "delete(): Wrong number of arguments "+
-                              "given #{arguments.size} for 2") unless arguments.size == 2
+    raise(Puppet::ParseError, "delete(): Wrong number of arguments given #{arguments.size} for 2") unless arguments.size == 2
 
     collection = arguments[0].dup
     Array(arguments[1]).each do |item|
@@ -34,8 +33,7 @@ module Puppet::Parser::Functions
         when String
           collection.gsub! item, ''
         else
-          raise(TypeError, "delete(): First argument must be an Array, " +
-                             "String, or Hash. Given an argument of class #{collection.class}.")
+          raise(TypeError, "delete(): First argument must be an Array, String, or Hash. Given an argument of class #{collection.class}.")
       end
     end
     collection

lib/puppet/parser/functions/delete_at.rb

@@ -14,8 +14,7 @@ module Puppet::Parser::Functions
     EOS
   ) do |arguments|
 
-    raise(Puppet::ParseError, "delete_at(): Wrong number of arguments " +
-      "given (#{arguments.size} for 2)") if arguments.size < 2
+    raise(Puppet::ParseError, "delete_at(): Wrong number of arguments given (#{arguments.size} for 2)") if arguments.size < 2
 
     array = arguments[0]
 
@@ -26,8 +25,7 @@ module Puppet::Parser::Functions
     index = arguments[1]
 
     if index.is_a?(String) and not index.match(/^\d+$/)
-      raise(Puppet::ParseError, 'delete_at(): You must provide ' +
-        'non-negative numeric index')
+      raise(Puppet::ParseError, 'delete_at(): You must provide non-negative numeric index')
     end
 
     result = array.clone
@@ -36,8 +34,7 @@ module Puppet::Parser::Functions
     index = index.to_i
 
     if index > result.size - 1 # First element is at index 0 is it not?
-      raise(Puppet::ParseError, 'delete_at(): Given index ' +
-        'exceeds size of array given')
+      raise(Puppet::ParseError, 'delete_at(): Given index exceeds size of array given')
     end
 
     result.delete_at(index) # We ignore the element that got deleted ...

lib/puppet/parser/functions/delete_regex.rb

@@ -12,7 +12,7 @@ module Puppet::Parser::Functions
 
     delete_regex(['a','b','c','b'], 'b')
     Would return: ['a','c']
-    
+
     delete_regex(['a','b','c','b'], ['b', 'c'])
     Would return: ['a']
 
@@ -25,17 +25,15 @@ module Puppet::Parser::Functions
   EOS
   ) do |arguments|
 
-    raise(Puppet::ParseError, "delete_regex(): Wrong number of arguments "+
-                              "given #{arguments.size} for 2") unless arguments.size == 2
+    raise(Puppet::ParseError, "delete_regex(): Wrong number of arguments given #{arguments.size} for 2") unless arguments.size == 2
 
     collection = arguments[0].dup
     Array(arguments[1]).each do |item|
       case collection
         when Array, Hash, String
           collection.reject! { |coll_item| (coll_item =~ %r{\b#{item}\b}) }
         else
-          raise(TypeError, "delete_regex(): First argument must be an Array, " +
-                             "Hash, or String. Given an argument of class #{collection.class}.")
+          raise(TypeError, "delete_regex(): First argument must be an Array, Hash, or String. Given an argument of class #{collection.class}.")
       end
     end
     collection

lib/puppet/parser/functions/delete_undef_values.rb

@@ -15,13 +15,10 @@ module Puppet::Parser::Functions
       EOS
     ) do |args|
 
-    raise(Puppet::ParseError,
-          "delete_undef_values(): Wrong number of arguments given " +
-          "(#{args.size})") if args.size < 1
+    raise(Puppet::ParseError, "delete_undef_values(): Wrong number of arguments given (#{args.size})") if args.size < 1
 
     unless args[0].is_a? Array or args[0].is_a? Hash
-      raise(Puppet::ParseError,
-            "delete_undef_values(): expected an array or hash, got #{args[0]} type  #{args[0].class} ")
+      raise(Puppet::ParseError, "delete_undef_values(): expected an array or hash, got #{args[0]} type  #{args[0].class} ")
     end
     result = args[0].dup
     if result.is_a?(Hash)

lib/puppet/parser/functions/delete_values.rb

@@ -11,15 +11,12 @@ module Puppet::Parser::Functions
       EOS
     ) do |arguments|
 
-    raise(Puppet::ParseError,
-          "delete_values(): Wrong number of arguments given " +
-          "(#{arguments.size} of 2)") if arguments.size != 2
+    raise(Puppet::ParseError, "delete_values(): Wrong number of arguments given (#{arguments.size} of 2)") if arguments.size != 2
 
     hash, item = arguments
 
     if not hash.is_a?(Hash)
-      raise(TypeError, "delete_values(): First argument must be a Hash. " + \
-                       "Given an argument of class #{hash.class}.")
+      raise(TypeError, "delete_values(): First argument must be a Hash. Given an argument of class #{hash.class}.")
     end
     hash.dup.delete_if { |key, val| item == val }
   end

lib/puppet/parser/functions/deprecation.rb

@@ -4,8 +4,7 @@ module Puppet::Parser::Functions
 EOS
   ) do |arguments|
 
-    raise(Puppet::ParseError, "deprecation: Wrong number of arguments " +
-      "given (#{arguments.size} for 2)") unless arguments.size == 2
+    raise(Puppet::ParseError, "deprecation: Wrong number of arguments given (#{arguments.size} for 2)") unless arguments.size == 2
 
     key = arguments[0]
     message = arguments[1]

lib/puppet/parser/functions/difference.rb

@@ -17,8 +17,7 @@ module Puppet::Parser::Functions
   ) do |arguments|
 
     # Two arguments are required
-    raise(Puppet::ParseError, "difference(): Wrong number of arguments " +
-      "given (#{arguments.size} for 2)") if arguments.size != 2
+    raise(Puppet::ParseError, "difference(): Wrong number of arguments given (#{arguments.size} for 2)") if arguments.size != 2
 
     first = arguments[0]
     second = arguments[1]

lib/puppet/parser/functions/dig44.rb

@@ -42,19 +42,16 @@ module Puppet::Parser::Functions
   eos
   ) do |arguments|
     # Two arguments are required
-    raise(Puppet::ParseError, "dig44(): Wrong number of arguments " +
-                              "given (#{arguments.size} for at least 2)") if arguments.size < 2
+    raise(Puppet::ParseError, "dig44(): Wrong number of arguments given (#{arguments.size} for at least 2)") if arguments.size < 2
 
     data, path, default = *arguments
 
     unless data.is_a?(Hash) or data.is_a?(Array)
-      raise(Puppet::ParseError, "dig44(): first argument must be a hash or an array, " <<
-                                "given #{data.class.name}")
+      raise(Puppet::ParseError, "dig44(): first argument must be a hash or an array, given #{data.class.name}")
     end
 
     unless path.is_a? Array
-      raise(Puppet::ParseError, "dig44(): second argument must be an array, " <<
-                                "given #{path.class.name}")
+      raise(Puppet::ParseError, "dig44(): second argument must be an array, given #{path.class.name}")
     end
 
     value = path.reduce(data) do |structure, key|

lib/puppet/parser/functions/downcase.rb

@@ -8,14 +8,12 @@ module Puppet::Parser::Functions
     EOS
   ) do |arguments|
 
-    raise(Puppet::ParseError, "downcase(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
+    raise(Puppet::ParseError, "downcase(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.size < 1
 
     value = arguments[0]
 
     unless value.is_a?(Array) || value.is_a?(String)
-      raise(Puppet::ParseError, 'downcase(): Requires either ' +
-        'array or string to work with')
+      raise(Puppet::ParseError, 'downcase(): Requires either array or string to work with')
     end
 
     if value.is_a?(Array)

lib/puppet/parser/functions/empty.rb

@@ -8,14 +8,12 @@ module Puppet::Parser::Functions
     EOS
   ) do |arguments|
 
-    raise(Puppet::ParseError, "empty(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
+    raise(Puppet::ParseError, "empty(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.size < 1
 
     value = arguments[0]
 
     unless value.is_a?(Array) || value.is_a?(Hash) || value.is_a?(String) || value.is_a?(Numeric)
-      raise(Puppet::ParseError, 'empty(): Requires either ' +
-        'array, hash, string or integer to work with')
+      raise(Puppet::ParseError, 'empty(): Requires either array, hash, string or integer to work with')
     end
 
     if value.is_a?(Numeric)

lib/puppet/parser/functions/enclose_ipv6.rb

@@ -16,12 +16,10 @@ module Puppet::Parser::Functions
     end
 
     if (arguments.size != 1) then
-      raise(Puppet::ParseError, "enclose_ipv6(): Wrong number of arguments "+
-        "given #{arguments.size} for 1")
+      raise(Puppet::ParseError, "enclose_ipv6(): Wrong number of arguments given #{arguments.size} for 1")
     end
     unless arguments[0].is_a?(String) or arguments[0].is_a?(Array) then
-      raise(Puppet::ParseError, "enclose_ipv6(): Wrong argument type "+
-        "given #{arguments[0].class} expected String or Array")
+      raise(Puppet::ParseError, "enclose_ipv6(): Wrong argument type given #{arguments[0].class} expected String or Array")
     end
 
     input = [arguments[0]].flatten.compact
@@ -32,8 +30,7 @@ module Puppet::Parser::Functions
         begin
           ip = IPAddr.new(val)
         rescue *rescuable_exceptions
-          raise(Puppet::ParseError, "enclose_ipv6(): Wrong argument "+
-                "given #{val} is not an ip address.")
+          raise(Puppet::ParseError, "enclose_ipv6(): Wrong argument given #{val} is not an ip address.")
         end
         val = "[#{ip.to_s}]" if ip.ipv6?
       end