X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Flib%2Fpuppet%2Fprovider%2Ffile_line%2Fruby.rb;h=f85ae85f84b48a3274054a895bbc9db1fda7ccd5;hb=30caaa85aed7015ca0d77216bff175eebd917eb7;hp=16f2709c32edd355e5f78f63728273d4deb6fcd1;hpb=6963202b4b62c2816655ac9532521b018fdf83bd;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/lib/puppet/provider/file_line/ruby.rb b/3rdparty/modules/stdlib/lib/puppet/provider/file_line/ruby.rb
index 16f2709c3..f85ae85f8 100644
--- a/3rdparty/modules/stdlib/lib/puppet/provider/file_line/ruby.rb
+++ b/3rdparty/modules/stdlib/lib/puppet/provider/file_line/ruby.rb
@@ -1,4 +1,13 @@
 Puppet::Type.type(:file_line).provide(:ruby) do
+  desc <<-DOC
+    @summary
+      This type allows puppet to manage small config files.
+
+    The implementation matches the full line, including whitespace at the
+    beginning and end.  If the line is not contained in the given file, Puppet
+    will append the line to the end of the file to ensure the desired state.
+    Multiple resources may be declared to manage multiple lines in the same file.
+  DOC
   def exists?
     found = false
     lines_count = 0
@@ -8,30 +17,46 @@ Puppet::Type.type(:file_line).provide(:ruby) do
         lines_count += 1
       end
     end
-    if resource[:match] == nil
-      found = lines_count > 0
-    else
-      match_count = count_matches(new_match_regex)
-      if resource[:append_on_no_match].to_s == 'false'
-        found = true
-      elsif resource[:replace].to_s == 'true'
-        found = lines_count > 0 && lines_count == match_count
-      else
-        found = match_count > 0
-      end
-    end
-    found
+    return found = lines_count > 0 if resource[:match].nil?
+
+    match_count = count_matches(new_match_regex)
+    found = if resource[:ensure] == :present
+              if match_count.zero?
+                if lines_count.zero? && resource[:append_on_no_match].to_s == 'false'
+                  true # lies, but gets the job done
+                elsif lines_count.zero? && resource[:append_on_no_match].to_s != 'false'
+                  false
+                else
+                  true
+                end
+              elsif resource[:replace_all_matches_not_matching_line].to_s == 'true'
+                false # maybe lies, but knows there's still work to do
+              elsif lines_count.zero?
+                resource[:replace].to_s == 'false'
+              else
+                true
+              end
+            elsif match_count.zero?
+              if lines_count.zero?
+                false
+              else
+                true
+              end
+            elsif lines_count.zero?
+              resource[:match_for_absence].to_s == 'true'
+            else
+              true
+            end
   end
 
   def create
-    unless resource[:replace].to_s != 'true' && count_matches(new_match_regex) > 0
-      if resource[:match]
-        handle_create_with_match
-      elsif resource[:after]
-        handle_create_with_after
-      else
-        handle_append_line
-      end
+    return if resource[:replace].to_s != 'true' && count_matches(new_match_regex) > 0
+    if resource[:match]
+      handle_create_with_match
+    elsif resource[:after]
+      handle_create_with_after
+    else
+      handle_append_line
     end
   end
 
@@ -51,12 +76,11 @@ Puppet::Type.type(:file_line).provide(:ruby) do
     #  file; for now assuming that this type is only used on
     #  small-ish config files that can fit into memory without
     #  too much trouble.
-    begin
-      @lines ||= File.readlines(resource[:path], :encoding => resource[:encoding])
-    rescue TypeError => e
-      # Ruby 1.8 doesn't support open_args
-      @lines ||= File.readlines(resource[:path])
-    end
+
+    @lines ||= File.readlines(resource[:path], :encoding => resource[:encoding])
+  rescue TypeError => _e
+    # Ruby 1.8 doesn't support open_args
+    @lines ||= File.readlines(resource[:path])
   end
 
   def new_after_regex
@@ -68,30 +92,35 @@ Puppet::Type.type(:file_line).provide(:ruby) do
   end
 
   def count_matches(regex)
-    lines.select{ |line| line.match(regex) }.size
+    lines.select { |line|
+      if resource[:replace_all_matches_not_matching_line].to_s == 'true'
+        line.match(regex) unless line.chomp == resource[:line]
+      else
+        line.match(regex)
+      end
+    }.size
   end
 
-  def handle_create_with_match()
+  def handle_create_with_match
     after_regex = new_after_regex
     match_regex = new_match_regex
     match_count = count_matches(new_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]}'"
+      raise Puppet::Error, "More than one line in file '#{resource[:path]}' matches pattern '#{resource[:match]}'"
     end
 
     File.open(resource[:path], 'w') do |fh|
       lines.each do |line|
         fh.puts(match_regex.match(line) ? resource[:line] : line)
-        if match_count == 0 && after_regex
-          if after_regex.match(line)
-            fh.puts(resource[:line])
-            match_count += 1 # Increment match_count to indicate that the new line has been inserted.
-          end
+        next unless match_count.zero? && after_regex
+        if after_regex.match(line)
+          fh.puts(resource[:line])
+          match_count += 1 # Increment match_count to indicate that the new line has been inserted.
         end
       end
 
-      if (match_count == 0)
+      if match_count.zero?
         fh.puts(resource[:line])
       end
     end
@@ -105,7 +134,7 @@ Puppet::Type.type(:file_line).provide(:ruby) do
       raise Puppet::Error, "#{after_count} lines match pattern '#{resource[:after]}' in file '#{resource[:path]}'. One or no line must match the pattern."
     end
 
-    File.open(resource[:path],'w') do |fh|
+    File.open(resource[:path], 'w') do |fh|
       lines.each do |line|
         fh.puts(line)
         if after_regex.match(line)
@@ -113,7 +142,7 @@ Puppet::Type.type(:file_line).provide(:ruby) do
         end
       end
 
-      if (after_count == 0)
+      if after_count.zero?
         fh.puts(resource[:line])
       end
     end
@@ -123,25 +152,26 @@ Puppet::Type.type(:file_line).provide(:ruby) do
     match_regex = new_match_regex
     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]}'"
+      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{ |line| match_regex.match(line) }.join(''))
+    File.open(resource[:path], 'w') do |fh|
+      fh.write(local_lines.reject { |line| match_regex.match(line) }.join(''))
     end
   end
 
   def handle_destroy_line
     local_lines = lines
-    File.open(resource[:path],'w') do |fh|
-      fh.write(local_lines.reject{ |line| line.chomp == resource[:line] }.join(''))
+    File.open(resource[:path], 'w') do |fh|
+      fh.write(local_lines.reject { |line| line.chomp == resource[:line] }.join(''))
     end
   end
 
   def handle_append_line
-    File.open(resource[:path],'w') do |fh|
-      lines.each do |line|
+    local_lines = lines
+    File.open(resource[:path], 'w') do |fh|
+      local_lines.each do |line|
         fh.puts(line)
       end
       fh.puts(resource[:line])