diff options
author | Martin Hellmich <mhellmic@gmail.com> | 2013-04-22 23:24:38 +0200 |
---|---|---|
committer | Martin Hellmich <mhellmic@gmail.com> | 2013-04-22 23:24:38 +0200 |
commit | 89bceb2821d82c64434e6529de48ec7d7389a13e (patch) | |
tree | 28378bbd407cae78abbff2a1fc86349db9d58c0b /lib/puppet/parser/functions/num2bool.rb | |
parent | 0c622b2e30333f26103a4440a888d440cf455c9c (diff) | |
parent | bebecd33783b483f6af059e311b9631d3a3336cc (diff) | |
download | puppet-stdlib-89bceb2821d82c64434e6529de48ec7d7389a13e.tar.gz puppet-stdlib-89bceb2821d82c64434e6529de48ec7d7389a13e.tar.bz2 |
Merge branch 'master' of git://github.com/puppetlabs/puppetlabs-stdlib
Diffstat (limited to 'lib/puppet/parser/functions/num2bool.rb')
-rw-r--r-- | lib/puppet/parser/functions/num2bool.rb | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/lib/puppet/parser/functions/num2bool.rb b/lib/puppet/parser/functions/num2bool.rb index 874db22..af0e6ed 100644 --- a/lib/puppet/parser/functions/num2bool.rb +++ b/lib/puppet/parser/functions/num2bool.rb @@ -2,38 +2,41 @@ # num2bool.rb # -# TODO(Krzysztof Wilczynski): We probably need to approach numeric values differently ... - module Puppet::Parser::Functions newfunction(:num2bool, :type => :rvalue, :doc => <<-EOS -This function converts a number into a true boolean. Zero becomes false. Numbers -higher then 0 become true. +This function converts a number or a string representation of a number into a +true boolean. Zero or anything non-numeric becomes false. Numbers higher then 0 +become true. EOS ) do |arguments| raise(Puppet::ParseError, "num2bool(): Wrong number of arguments " + - "given (#{arguments.size} for 1)") if arguments.size < 1 + "given (#{arguments.size} for 1)") if arguments.size != 1 number = arguments[0] - # Only numbers allowed ... - unless number.match(/^\-?\d+$/) - raise(Puppet::ParseError, 'num2bool(): Requires integer to work with') + case number + when Numeric + # Yay, it's a number + when String + begin + number = Float(number) + rescue ArgumentError => ex + raise(Puppet::ParseError, "num2bool(): '#{number}' does not look like a number: #{ex.message}") + end + else + begin + number = number.to_s + rescue NoMethodError => ex + raise(Puppet::ParseError, "num2bool(): Unable to parse argument: #{ex.message}") + end end - result = case number - when /^0$/ - false - when /^\-?\d+$/ - # Numbers in Puppet are often string-encoded which is troublesome ... - number = number.to_i - # We yield true for any positive number and false otherwise ... - number > 0 ? true : false - else - raise(Puppet::ParseError, 'num2bool(): Unknown numeric format given') - end + # Truncate Floats + number = number.to_i - return result + # Return true for any positive number and false otherwise + return number > 0 end end |