projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update stdlib
[mirror/dsa-puppet.git]
/
3rdparty
/
modules
/
stdlib
/
lib
/
puppet
/
parser
/
functions
/
size.rb
diff --git
a/3rdparty/modules/stdlib/lib/puppet/parser/functions/size.rb
b/3rdparty/modules/stdlib/lib/puppet/parser/functions/size.rb
index
cc207e3
..
b503aa0
100644
(file)
--- a/
3rdparty/modules/stdlib/lib/puppet/parser/functions/size.rb
+++ b/
3rdparty/modules/stdlib/lib/puppet/parser/functions/size.rb
@@
-2,19
+2,18
@@
# size.rb
#
# size.rb
#
-# TODO(Krzysztof Wilczynski): Support for hashes would be nice too ...
-
module Puppet::Parser::Functions
newfunction(:size, :type => :rvalue, :doc => <<-EOS
module Puppet::Parser::Functions
newfunction(:size, :type => :rvalue, :doc => <<-EOS
-Returns the number of elements in a string
or array.
+Returns the number of elements in a string
, an array or a hash
EOS
) do |arguments|
EOS
) do |arguments|
- raise(Puppet::ParseError, "size(): Wrong number of arguments " +
- "given (#{arguments.size} for 1)") if arguments.size < 1
+ raise(Puppet::ParseError, "size(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.size < 1
item = arguments[0]
item = arguments[0]
+ function_deprecation([:size, 'This method is going to be deprecated, please use the stdlib length function.'])
+
if item.is_a?(String)
begin
if item.is_a?(String)
begin
@@
-28,14
+27,13
@@
Returns the number of elements in a string or array.
#
Float(item)
#
Float(item)
- raise(Puppet::ParseError, 'size(): Requires either ' +
- 'string or array to work with')
+ raise(Puppet::ParseError, 'size(): Requires either string, array or hash to work with')
rescue ArgumentError
result = item.size
end
rescue ArgumentError
result = item.size
end
- elsif item.is_a?(Array)
+ elsif item.is_a?(Array)
|| item.is_a?(Hash)
result = item.size
else
raise(Puppet::ParseError, 'size(): Unknown type given')
result = item.size
else
raise(Puppet::ParseError, 'size(): Unknown type given')