From 0d46515b57cea60d4d5f1e4d81a75a448a7a73a8 Mon Sep 17 00:00:00 2001
From: Joseph Yaworski <joseph.yaworski@fireeye.com>
Date: Mon, 11 Apr 2016 22:09:24 -0400
Subject: Add support for regular expressions to delete

---
 lib/puppet/parser/functions/delete.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'lib/puppet/parser/functions/delete.rb')

diff --git a/lib/puppet/parser/functions/delete.rb b/lib/puppet/parser/functions/delete.rb
index f548b44..8435163 100644
--- a/lib/puppet/parser/functions/delete.rb
+++ b/lib/puppet/parser/functions/delete.rb
@@ -2,8 +2,6 @@
 # delete.rb
 #
 
-# TODO(Krzysztof Wilczynski): We need to add support for regular expression ...
-
 module Puppet::Parser::Functions
   newfunction(:delete, :type => :rvalue, :doc => <<-EOS
 Deletes all instances of a given element from an array, substring from a
@@ -34,7 +32,7 @@ string, or key from a hash.
     Array(arguments[1]).each do |item|
       case collection
         when Array, Hash
-          collection.delete item
+          collection.delete_if { |coll_item| coll_item =~ %r{#{item}} }
         when String
           collection.gsub! item, ''
         else
-- 
cgit v1.2.3


From 232de137f1018060b256b1f3f649be0b6d7d9952 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppet.com>
Date: Mon, 25 Apr 2016 14:33:43 -0700
Subject: Revert "Add support for regular expressions to delete"

This reverts commit 0d46515b57cea60d4d5f1e4d81a75a448a7a73a8.

It introduced backwards-incompatible functionality.
---
 lib/puppet/parser/functions/delete.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib/puppet/parser/functions/delete.rb')

diff --git a/lib/puppet/parser/functions/delete.rb b/lib/puppet/parser/functions/delete.rb
index 8435163..f548b44 100644
--- a/lib/puppet/parser/functions/delete.rb
+++ b/lib/puppet/parser/functions/delete.rb
@@ -2,6 +2,8 @@
 # delete.rb
 #
 
+# TODO(Krzysztof Wilczynski): We need to add support for regular expression ...
+
 module Puppet::Parser::Functions
   newfunction(:delete, :type => :rvalue, :doc => <<-EOS
 Deletes all instances of a given element from an array, substring from a
@@ -32,7 +34,7 @@ string, or key from a hash.
     Array(arguments[1]).each do |item|
       case collection
         when Array, Hash
-          collection.delete_if { |coll_item| coll_item =~ %r{#{item}} }
+          collection.delete item
         when String
           collection.gsub! item, ''
         else
-- 
cgit v1.2.3


From 540546b9b41745bbc4821f9966ae301dc0b5056a Mon Sep 17 00:00:00 2001
From: Joseph Yaworski <joseph.yaworski@fireeye.com>
Date: Tue, 12 Apr 2016 16:53:07 -0400
Subject: Use reject instead of delete_if

---
 lib/puppet/parser/functions/delete.rb | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'lib/puppet/parser/functions/delete.rb')

diff --git a/lib/puppet/parser/functions/delete.rb b/lib/puppet/parser/functions/delete.rb
index f548b44..814e1ad 100644
--- a/lib/puppet/parser/functions/delete.rb
+++ b/lib/puppet/parser/functions/delete.rb
@@ -2,8 +2,6 @@
 # delete.rb
 #
 
-# TODO(Krzysztof Wilczynski): We need to add support for regular expression ...
-
 module Puppet::Parser::Functions
   newfunction(:delete, :type => :rvalue, :doc => <<-EOS
 Deletes all instances of a given element from an array, substring from a
@@ -22,19 +20,23 @@ string, or key from a hash.
 
     delete('abracadabra', 'bra')
     Would return: 'acada'
+
+    delete(['abracadabra'], '^.*bra.*$')
+    Would return: []
+
+    delete(['abracadabra'], '^.*jimbob.*$')
+    Would return: ['abracadabra']
   EOS
   ) do |arguments|
 
-    if (arguments.size != 2) then
-      raise(Puppet::ParseError, "delete(): Wrong number of arguments "+
-                                  "given #{arguments.size} for 2.")
-    end
+    raise(Puppet::ParseError, "delete(): Wrong number of arguments "+
+                              "given #{arguments.size} for 2") unless arguments.size == 2
 
     collection = arguments[0].dup
     Array(arguments[1]).each do |item|
       case collection
         when Array, Hash
-          collection.delete item
+          collection.reject! { |coll_item| (coll_item =~ %r{\b#{item}\b}) }
         when String
           collection.gsub! item, ''
         else
-- 
cgit v1.2.3


From dd71c0288052dd3a96e730ff198f5c0a8d640946 Mon Sep 17 00:00:00 2001
From: Joseph Yaworski <joseph.yaworski@fireeye.com>
Date: Wed, 11 May 2016 13:21:24 -0400
Subject: Add a delete_regex function

To maintain backwards compatibility, add a delete_regex function instead
of modifying delete itself.
---
 lib/puppet/parser/functions/delete.rb | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'lib/puppet/parser/functions/delete.rb')

diff --git a/lib/puppet/parser/functions/delete.rb b/lib/puppet/parser/functions/delete.rb
index 814e1ad..466c55c 100644
--- a/lib/puppet/parser/functions/delete.rb
+++ b/lib/puppet/parser/functions/delete.rb
@@ -20,12 +20,6 @@ string, or key from a hash.
 
     delete('abracadabra', 'bra')
     Would return: 'acada'
-
-    delete(['abracadabra'], '^.*bra.*$')
-    Would return: []
-
-    delete(['abracadabra'], '^.*jimbob.*$')
-    Would return: ['abracadabra']
   EOS
   ) do |arguments|
 
@@ -36,7 +30,7 @@ string, or key from a hash.
     Array(arguments[1]).each do |item|
       case collection
         when Array, Hash
-          collection.reject! { |coll_item| (coll_item =~ %r{\b#{item}\b}) }
+          collection.delete item
         when String
           collection.gsub! item, ''
         else
-- 
cgit v1.2.3