diff options
author | Jeff McCune <jeff@puppetlabs.com> | 2012-11-19 08:45:18 -0500 |
---|---|---|
committer | Jeff McCune <jeff@puppetlabs.com> | 2012-11-19 08:45:18 -0500 |
commit | 6c36b494a0f0e3001a46da9951fd52f343008042 (patch) | |
tree | 9c583ad535b007866573d48f2d426f5e866eed3c /lib | |
parent | 43dd60698203482f0b0bd737fb402a4d7c2f4b95 (diff) | |
parent | 7322e4dc2f8dc831097d2b0fa3768df0689acfa2 (diff) | |
download | puppet-stdlib-6c36b494a0f0e3001a46da9951fd52f343008042.tar.gz puppet-stdlib-6c36b494a0f0e3001a46da9951fd52f343008042.tar.bz2 |
Merge branch 'lifton-feature/2.x/extend_delete_function' into 2.x
* lifton-feature/2.x/extend_delete_function:
Extend delete function for strings and hashes
Fixed typo
Diffstat (limited to 'lib')
-rw-r--r-- | lib/puppet/parser/functions/delete.rb | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/lib/puppet/parser/functions/delete.rb b/lib/puppet/parser/functions/delete.rb index ab8f75b..f814344 100644 --- a/lib/puppet/parser/functions/delete.rb +++ b/lib/puppet/parser/functions/delete.rb @@ -3,31 +3,43 @@ # # TODO(Krzysztof Wilczynski): We need to add support for regular expression ... -# TODO(Krzysztof Wilczynski): Support for strings and hashes too ... module Puppet::Parser::Functions newfunction(:delete, :type => :rvalue, :doc => <<-EOS -Deletes a selected element from an array. +Deletes all instances of a given element from an array, substring from a +string, or key from a hash. *Examples:* - delete(['a','b','c'], 'b') + delete(['a','b','c','b'], 'b') + Would return: ['a','c'] -Would return: ['a','c'] + delete({'a'=>1,'b'=>2,'c'=>3}, 'b') + Would return: {'a'=>1,'c'=>3} + + delete('abracadabra', 'bra') + Would return: 'acada' EOS ) do |arguments| if (arguments.size != 2) then raise(Puppet::ParseError, "delete(): Wrong number of arguments "+ - "given #{arguments.size} for 2") + "given #{arguments.size} for 2.") end - a = arguments[0] + collection = arguments[0] item = arguments[1] - a.delete(item) - a - + case collection + when Array, Hash + collection.delete item + when String + collection.gsub! item, '' + else + raise(TypeError, "delete(): First argument must be an Array, " + + "String, or Hash. Given an argument of class #{collection.class}.") + end + collection end end |