Merge pull request #159 from WhatsARanjit/MODULES-1940

Adding the ability to change regex match for $section in inifile

Author: tphoney

README.markdown

@@ -65,6 +65,24 @@ ini_subsetting {'sample subsetting':
 }
 ~~~
 
+###Use a non-standard section header
+
+~~~
+default:
+   minage = 1
+   maxage = 13
+
+ini_setting { 'default minage':
+  ensure         => present,
+  path           => '/etc/security/users',
+  section        => 'default',
+  setting        => 'minage',
+  value          => '1',
+  section_prefix => '',
+  section_suffix => ':',
+}
+~~~
+
 ###Implement child providers
 
 
@@ -176,6 +194,16 @@ Determines whether the specified setting should exist. Valid options: 'present'
 
 *Optional.* Supplies a value for the specified setting. Valid options: a string. Default value: undefined.
 
+##### `section_prefix`
+
+*Optional.*  Designates the string that will appear before the section's name.  Default value: "["
+
+##### `section_suffix`
+
+*Optional.*  Designates the string that will appear after the section's name.  Default value: "]"
+
+**NOTE:** The way this type finds all sections in the file is by looking for lines like `${section_prefix}${title}${section_suffix}`
+
 ### Type: ini_subsetting
 
 

lib/puppet/provider/ini_setting/ruby.rb

@@ -94,9 +94,25 @@ def separator
     end
   end
 
+  def section_prefix
+    if resource.class.validattr?(:section_prefix)
+      resource[:section_prefix] || '['
+    else
+      '['
+    end
+  end
+
+  def section_suffix
+    if resource.class.validattr?(:section_suffix)
+      resource[:section_suffix] || ']'
+    else
+      ']'
+    end
+  end
+
   private
   def ini_file
-    @ini_file ||= Puppet::Util::IniFile.new(file_path, separator)
+    @ini_file ||= Puppet::Util::IniFile.new(file_path, separator, section_prefix, section_suffix)
   end
 
 end

lib/puppet/type/ini_setting.rb

@@ -39,5 +39,16 @@
     desc 'The value of the setting to be defined.'
   end
 
+  newparam(:section_prefix) do
+    desc 'The prefix to the section name\'s header.' +
+        'Defaults to \'[\'.'
+    defaultto('[')
+  end
+
+  newparam(:section_suffix) do
+    desc 'The suffix to the section name\'s header.' +
+        'Defaults to \']\'.'
+    defaultto(']')
+  end
 
 end

lib/puppet/util/ini_file.rb

@@ -5,11 +5,14 @@ module Puppet
 module Util
   class IniFile
 
-    def initialize(path, key_val_separator = ' = ')
+    def initialize(path, key_val_separator = ' = ', section_prefix = '[', section_suffix = ']')
 
       k_v_s = key_val_separator.strip
 
-      @@SECTION_REGEX = /^\s*\[([^\]]*)\]\s*$/
+      @section_prefix = section_prefix
+      @section_suffix = section_suffix
+
+      @@SECTION_REGEX = section_regex
       @@SETTING_REGEX = /^(\s*)([^#;\s]|[^#;\s].*?[^\s#{k_v_s}])(\s*#{k_v_s}\s*)(.*)\s*$/
       @@COMMENTED_SETTING_REGEX = /^(\s*)[#;]+(\s*)(.*?[^\s#{k_v_s}])(\s*#{k_v_s}[ \t]*)(.*)\s*$/
 
@@ -22,6 +25,26 @@ def initialize(path, key_val_separator = ' = ')
       end
     end
 
+    def section_regex
+      # Only put in prefix/suffix if they exist
+      # Also, if the prefix is '', the negated
+      # set match should be a match all instead.
+      r_string = '^\s*'
+      r_string += Regexp.escape(@section_prefix)
+      r_string += '('
+      if @section_prefix != ''
+        r_string += '[^'
+        r_string += Regexp.escape(@section_prefix)
+        r_string += ']'
+      else
+        r_string += '.'
+      end
+      r_string += '*)'
+      r_string += Regexp.escape(@section_suffix)
+      r_string += '\s*$'
+      /#{r_string}/
+    end
+
     def section_names
       @section_names
     end
@@ -107,7 +130,7 @@ def save
           whitespace_buffer = []
 
           if (section.is_new_section?) && (! section.is_global?)
-            fh.puts("\n[#{section.name}]")
+            fh.puts("\n#{@section_prefix}#{section.name}#{@section_suffix}")
           end
 
           if ! section.is_new_section?