(19864) Enable num2bool to accept numeric input

RELEASE_PROCESS.markdown

@@ -22,4 +22,3 @@
  * Build a new package with puppet-module or the rake build task if it exists
  * Publish the new package to the forge
  * Bonus points for an announcement to puppet-users.
-

lib/puppet/parser/functions/abs.rb

@@ -4,7 +4,7 @@
 
 module Puppet::Parser::Functions
   newfunction(:abs, :type => :rvalue, :doc => <<-EOS
-    Returns the absolute value of a number, for example -34.56 becomes 
+    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|

lib/puppet/parser/functions/chomp.rb

@@ -4,7 +4,7 @@
 
 module Puppet::Parser::Functions
   newfunction(:chomp, :type => :rvalue, :doc => <<-'EOS'
-    Removes the record separator from the end of a string or an array of 
+    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

lib/puppet/parser/functions/chop.rb

@@ -4,9 +4,9 @@
 
 module Puppet::Parser::Functions
   newfunction(:chop, :type => :rvalue, :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 
+    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
     separators then you should use the `chomp` function.
     Requires a string or array of strings as input.
     EOS

lib/puppet/parser/functions/is_ip_address.rb

@@ -15,7 +15,7 @@ module Puppet::Parser::Functions
         "given #{arguments.size} for 1")
     end
 
-    begin 
+    begin
       ip = IPAddr.new(arguments[0])
     rescue ArgumentError
       return false

lib/puppet/parser/functions/num2bool.rb

@@ -14,7 +14,8 @@ module Puppet::Parser::Functions
     raise(Puppet::ParseError, "num2bool(): Wrong number of arguments " +
       "given (#{arguments.size} for 1)") if arguments.size < 1
 
-    number = arguments[0]
+    # Since we're matching against a regex, coerce to String
+    number = arguments[0].to_s
 
     # Only numbers allowed ...
     unless number.match(/^\-?\d+$/)

lib/puppet/parser/functions/parseyaml.rb

@@ -4,7 +4,7 @@
 
 module Puppet::Parser::Functions
   newfunction(:parseyaml, :type => :rvalue, :doc => <<-EOS
-This function accepts YAML as a string and converts it into the correct 
+This function accepts YAML as a string and converts it into the correct
 Puppet structure.
     EOS
   ) do |arguments|

lib/puppet/parser/functions/squeeze.rb

@@ -14,9 +14,9 @@ module Puppet::Parser::Functions
     end
 
     item = arguments[0]
-    squeezeval = arguments[1] 
+    squeezeval = arguments[1]
 
-    if item.is_a?(Array) then  
+    if item.is_a?(Array) then
       if squeezeval then
         item.collect { |i| i.squeeze(squeezeval) }
       else

lib/puppet/parser/functions/str2bool.rb

@@ -4,7 +4,7 @@
 
 module Puppet::Parser::Functions
   newfunction(:str2bool, :type => :rvalue, :doc => <<-EOS
-This converts a string to a boolean. This attempt to convert strings that 
+This converts a string to a boolean. This attempt to convert strings that
 contain things like: y, 1, t, true to 'true' and strings that contain things
 like: 0, f, n, false, no to 'false'.
     EOS

spec/monkey_patches/publicize_methods.rb

@@ -8,4 +8,3 @@ def publicize_methods(*methods)
         self.class_eval { private(*saved_private_instance_methods) }
     end
 end
-

spec/unit/puppet/parser/functions/fqdn_rotate_spec.rb

@@ -19,7 +19,7 @@
   end
 
   it "should rotate a string to give the same results for one host" do
-    scope.expects(:lookupvar).with("::fqdn").returns("127.0.0.1").twice 
+    scope.expects(:lookupvar).with("::fqdn").returns("127.0.0.1").twice
     scope.function_fqdn_rotate(["abcdefg"]).should eql(scope.function_fqdn_rotate(["abcdefg"]))
   end
 

spec/unit/puppet/parser/functions/num2bool_spec.rb

@@ -12,13 +12,33 @@
     lambda { scope.function_num2bool([]) }.should( raise_error(Puppet::ParseError))
   end
 
-  it "should return true if 1" do
+  it "should return true if passed string 1" do
     result = scope.function_num2bool(["1"])
     result.should(be_true)
   end
 
-  it "should return false if 0" do
+  it "should return true if passed number 1" do
+    result = scope.function_num2bool([1])
+    result.should(be_true)
+  end
+
+  it "should return false if passed string 0" do
     result = scope.function_num2bool(["0"])
     result.should(be_false)
   end
+
+  it "should return false if passed number 0" do
+    result = scope.function_num2bool([0])
+    result.should(be_false)
+  end
+
+  it "should return false if passed string -1" do
+    result = scope.function_num2bool(["-1"])
+    result.should(be_false)
+  end
+
+  it "should return false if passed number -1" do
+    result = scope.function_num2bool([-1])
+    result.should(be_false)
+  end
 end

spec/unit/puppet/parser/functions/validate_hash_spec.rb

@@ -41,4 +41,3 @@
   end
 
 end
-

spec/unit/puppet/parser/functions/validate_string_spec.rb

@@ -58,4 +58,3 @@
     end
   end
 end
-