Mercurial > repos > other > Puppet
diff modules/stdlib/lib/puppet/parser/functions/max.rb @ 272:c42fb28cff86
Update to a newer Python module
This also pulls in an EPEL module (which we don't use) and a newer
stdlib version.
| author | IBBoard <dev@ibboard.co.uk> |
|---|---|
| date | Fri, 03 Jan 2020 19:56:04 +0000 |
| parents | 956e484adc12 |
| children | d9352a684e62 |
line wrap: on
line diff
--- a/modules/stdlib/lib/puppet/parser/functions/max.rb Tue Dec 31 13:49:38 2019 +0000 +++ b/modules/stdlib/lib/puppet/parser/functions/max.rb Fri Jan 03 19:56:04 2020 +0000 @@ -1,17 +1,19 @@ +# +# max.rb +# module Puppet::Parser::Functions - newfunction(:max, :type => :rvalue, :doc => <<-EOS + newfunction(:max, :type => :rvalue, :doc => <<-DOC Returns the highest value of all arguments. Requires at least one argument. - EOS - ) do |args| + DOC + ) do |args| - raise(Puppet::ParseError, "max(): Wrong number of arguments " + - "need at least one") if args.size == 0 + raise(Puppet::ParseError, 'max(): Wrong number of arguments need at least one') if args.empty? # Sometimes we get numbers as numerics and sometimes as strings. # We try to compare them as numbers when possible - return args.max do |a,b| - if a.to_s =~ /\A-?\d+(.\d+)?\z/ and b.to_s =~ /\A-?\d+(.\d+)?\z/ then + return args.max do |a, b| + if a.to_s =~ %r{\A-?\d+(.\d+)?\z} && b.to_s =~ %r{\A-?\d+(.\d+)?\z} a.to_f <=> b.to_f else a.to_s <=> b.to_s