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 and concat to 6.1.0 both
[mirror/dsa-puppet.git]
/
3rdparty
/
modules
/
stdlib
/
lib
/
puppet
/
parser
/
functions
/
union.rb
diff --git
a/3rdparty/modules/stdlib/lib/puppet/parser/functions/union.rb
b/3rdparty/modules/stdlib/lib/puppet/parser/functions/union.rb
index
c91bb80
..
ac521e5
100644
(file)
--- a/
3rdparty/modules/stdlib/lib/puppet/parser/functions/union.rb
+++ b/
3rdparty/modules/stdlib/lib/puppet/parser/functions/union.rb
@@
-1,33
+1,28
@@
#
# union.rb
#
#
# union.rb
#
-
module Puppet::Parser::Functions
module Puppet::Parser::Functions
- newfunction(:union, :type => :rvalue, :doc => <<-EOS
-This function returns a union of two arrays.
-
-*Examples:*
+ newfunction(:union, :type => :rvalue, :doc => <<-DOC
+ @summary
+ This function returns a union of two or more arrays.
- union(["a","b","c"],["b","c","d"])
+ @return
+ a unionized array of two or more arrays
+ @example **Usage**
-Would return: ["a","b","c","d"]
- EOS
- ) do |arguments|
+ union(["a","b","c"],["b","c","d"])
+ Would return: ["a","b","c","d"]
+ DOC
+ ) do |arguments|
- # Two arguments are required
- raise(Puppet::ParseError, "union(): Wrong number of arguments " +
- "given (#{arguments.size} for 2)") if arguments.size != 2
+ # Check that 2 or more arguments have been given ...
+ raise(Puppet::ParseError, "union(): Wrong number of arguments given (#{arguments.size} for < 2)") if arguments.size < 2
- first = arguments[0]
- second = arguments[1]
-
- unless first.is_a?(Array) && second.is_a?(Array)
- raise(Puppet::ParseError, 'union(): Requires 2 arrays')
+ arguments.each do |argument|
+ raise(Puppet::ParseError, 'union(): Every parameter must be an array') unless argument.is_a?(Array)
end
end
- result = first | second
-
- return result
+ arguments.reduce(:|)
end
end
end
end