Set arity on all functions

Use the function arity feature to remove a lot of boilerplate code from
the functions.

Author: Erik Dalén

.travis.yml

@@ -6,9 +6,7 @@ matrix:
   fast_finish: true
   include:
   - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
+    env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 1.9.3
     env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 2.0.0

lib/puppet/parser/functions/abs.rb

@@ -3,15 +3,12 @@
 #
 
 module Puppet::Parser::Functions
-  newfunction(:abs, :type => :rvalue, :doc => <<-EOS
+  newfunction(:abs, :type => :rvalue, :arity => 1, :doc => <<-EOS
     Returns the absolute value of a number, for example -34.56 becomes
     34.56. Takes a single integer and float value as an argument.
     EOS
   ) do |arguments|
 
-    raise(Puppet::ParseError, "abs(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
     value = arguments[0]
 
     # Numbers in Puppet are often string-encoded which is troublesome ...

lib/puppet/parser/functions/any2array.rb

@@ -3,7 +3,7 @@
 #
 
 module Puppet::Parser::Functions
-  newfunction(:any2array, :type => :rvalue, :doc => <<-EOS
+  newfunction(:any2array, :type => :rvalue, :arity => -1, :doc => <<-EOS
 This converts any object to an array containing that object. Empty argument
 lists are converted to an empty array. Arrays are left untouched. Hashes are
 converted to arrays of alternating keys and values.

lib/puppet/parser/functions/base64.rb

@@ -1,6 +1,6 @@
 module Puppet::Parser::Functions
-
-  newfunction(:base64, :type => :rvalue, :doc => <<-'ENDHEREDOC') do |args|
+ 
+  newfunction(:base64, :type => :rvalue, :arity => 2, :doc => <<-'ENDHEREDOC') do |args|
 
     Base64 encode or decode a string based on the command and the string submitted
 
@@ -12,9 +12,7 @@ module Puppet::Parser::Functions
     ENDHEREDOC
 
     require 'base64'
-
-    raise Puppet::ParseError, ("base64(): Wrong number of arguments (#{args.length}; must be = 2)") unless args.length == 2
-
+ 
     actions = ['encode','decode']
 
     unless actions.include?(args[0])

lib/puppet/parser/functions/bool2num.rb

@@ -3,17 +3,14 @@
 #
 
 module Puppet::Parser::Functions
-  newfunction(:bool2num, :type => :rvalue, :doc => <<-EOS
+  newfunction(:bool2num, :type => :rvalue, :arity => 1, :doc => <<-EOS
     Converts a boolean to a number. Converts the values:
       false, f, 0, n, and no to 0
       true, t, 1, y, and yes to 1
     Requires a single boolean or string as an input.
     EOS
   ) do |arguments|
 
-    raise(Puppet::ParseError, "bool2num(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
     value = arguments[0]
     klass = value.class
 

lib/puppet/parser/functions/bool2str.rb

@@ -3,15 +3,12 @@
 #
 
 module Puppet::Parser::Functions
-  newfunction(:bool2str, :type => :rvalue, :doc => <<-EOS
+  newfunction(:bool2str, :type => :rvalue, :arity => 1, :doc => <<-EOS
     Converts a boolean to a string.
     Requires a single boolean as an input.
     EOS
   ) do |arguments|
 
-    raise(Puppet::ParseError, "bool2str(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
     value = arguments[0]
     klass = value.class
 

lib/puppet/parser/functions/camelcase.rb

@@ -3,14 +3,11 @@
 #
 
 module Puppet::Parser::Functions
-  newfunction(:camelcase, :type => :rvalue, :doc => <<-EOS
+  newfunction(:camelcase, :type => :rvalue, :arity => 1, :doc => <<-EOS
 Converts the case of a string or all strings in an array to camel case.
     EOS
   ) do |arguments|
 
-    raise(Puppet::ParseError, "camelcase(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
     value = arguments[0]
     klass = value.class
 

lib/puppet/parser/functions/capitalize.rb

@@ -3,15 +3,12 @@
 #
 
 module Puppet::Parser::Functions
-  newfunction(:capitalize, :type => :rvalue, :doc => <<-EOS
+  newfunction(:capitalize, :type => :rvalue, :arity => 1, :doc => <<-EOS
     Capitalizes the first letter of a string or array of strings.
     Requires either a single string or an array as an input.
     EOS
   ) do |arguments|
 
-    raise(Puppet::ParseError, "capitalize(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
     value = arguments[0]
     klass = value.class
 

lib/puppet/parser/functions/chomp.rb

@@ -3,16 +3,13 @@
 #
 
 module Puppet::Parser::Functions
-  newfunction(:chomp, :type => :rvalue, :doc => <<-'EOS'
+  newfunction(:chomp, :type => :rvalue, :arity => 1, :doc => <<-'EOS'
     Removes the record separator from the end of a string or an array of
     strings, for example `hello\n` becomes `hello`.
     Requires a single string or array as an input.
     EOS
   ) do |arguments|
 
-    raise(Puppet::ParseError, "chomp(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
     value = arguments[0]
     klass = value.class
 

lib/puppet/parser/functions/chop.rb

@@ -3,7 +3,7 @@
 #
 
 module Puppet::Parser::Functions
-  newfunction(:chop, :type => :rvalue, :doc => <<-'EOS'
+  newfunction(:chop, :type => :rvalue, :arity => 1, :doc => <<-'EOS'
     Returns a new string with the last character removed. If the string ends
     with `\r\n`, both characters are removed. Applying chop to an empty
     string returns an empty string. If you wish to merely remove record
@@ -12,9 +12,6 @@ module Puppet::Parser::Functions
     EOS
   ) do |arguments|
 
-    raise(Puppet::ParseError, "chop(): Wrong number of arguments " +
-      "given (#{arguments.size} for 1)") if arguments.size < 1
-
     value = arguments[0]
     klass = value.class