From 9bacf14ca24283a94883523064603babcd7046d3 Mon Sep 17 00:00:00 2001
From: Johnson Earls <johnson.earls@oracle.com>
Date: Thu, 6 Aug 2015 13:00:11 -0700
Subject: allow `match` parameter to influence `ensure => absent` behavior.

Split the `destroy` method of the file_type::ruby provider into two
private methods:  `handle_destroy_line` which is the same as the previous
`destroy` method, and `handle_destroy_with_match` which will destroy any
line which matches the `match` parameter, raising an error if multiple
lines match and the `multiple` parameter is not `true`.  This new
behavior is only used if the new boolean parameter `match_for_absence`
is `true` (it defaults to `false`).
---
 lib/puppet/provider/file_line/ruby.rb | 26 +++++++++++++++++++++++---
 lib/puppet/type/file_line.rb          | 22 ++++++++++++++++++++++
 2 files changed, 45 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/provider/file_line/ruby.rb b/lib/puppet/provider/file_line/ruby.rb
index d4cdfec..aab6fe2 100644
--- a/lib/puppet/provider/file_line/ruby.rb
+++ b/lib/puppet/provider/file_line/ruby.rb
@@ -22,9 +22,10 @@ Puppet::Type.type(:file_line).provide(:ruby) do
   end
 
   def destroy
-    local_lines = lines
-    File.open(resource[:path],'w') do |fh|
-      fh.write(local_lines.reject{|l| l.chomp == resource[:line] }.join(''))
+    if resource[:match_for_absence].to_s == 'true' and resource[:match]
+      handle_destroy_with_match
+    else
+      handle_destroy_line
     end
   end
 
@@ -93,6 +94,25 @@ Puppet::Type.type(:file_line).provide(:ruby) do
     lines.select{|l| l.match(regex)}.size
   end
 
+  def handle_destroy_with_match
+    match_count = count_matches(match_regex)
+    if match_count > 1 && resource[:multiple].to_s != 'true'
+     raise Puppet::Error, "More than one line in file '#{resource[:path]}' matches pattern '#{resource[:match]}'"
+    end
+
+    local_lines = lines
+    File.open(resource[:path],'w') do |fh|
+      fh.write(local_lines.reject{|l| match_regex.match(l) }.join(''))
+    end
+  end
+
+  def handle_destroy_line
+    local_lines = lines
+    File.open(resource[:path],'w') do |fh|
+      fh.write(local_lines.reject{|l| l.chomp == resource[:line] }.join(''))
+    end
+  end
+
   ##
   # append the line to the file.
   #
diff --git a/lib/puppet/type/file_line.rb b/lib/puppet/type/file_line.rb
index 4a96ba7..446f103 100644
--- a/lib/puppet/type/file_line.rb
+++ b/lib/puppet/type/file_line.rb
@@ -34,6 +34,20 @@ Puppet::Type.newtype(:file_line) do
     In this code example match will look for a line beginning with export 
     followed by HTTP_PROXY and replace it with the value in line.
 
+    Match Example With `ensure => absent`:
+
+        file_line { 'bashrc_proxy':
+          ensure            => absent,
+          path              => '/etc/bashrc',
+          line              => 'export HTTP_PROXY=http://squid.puppetlabs.vm:3128',
+          match             => '^export\ HTTP_PROXY\=',
+          match_for_absence => true,
+        }
+
+    In this code example match will look for a line beginning with export
+    followed by HTTP_PROXY and delete it.  If multiple lines match, an
+    error will be raised unless the `multiple => true` parameter is set.
+
     **Autorequires:** If Puppet is managing the file that will contain the line
     being managed, the file_line resource will autorequire that file.
 
@@ -55,6 +69,14 @@ Puppet::Type.newtype(:file_line) do
          ' match an exception will be raised. '
   end
 
+  newparam(:match_for_absence) do
+    desc 'An optional value to determine if match should be applied when ensure => absent.' +
+         ' If set to true and match is set, the line that matches match will be deleted.' +
+         ' If set to false (the default), match is ignored when ensure => absent.'
+    newvalues(true, false)
+    defaultto false
+  end
+
   newparam(:multiple) do
     desc 'An optional value to determine if match can change multiple lines.' +
          ' If set to false, an exception will be raised if more than one line matches'
-- 
cgit v1.2.3