Merge pull request redhat-openstack#65 from shrug/master

Update settings regexes to support settings containing square brackets

lib/puppet/util/ini_file.rb

@@ -6,8 +6,8 @@ module Util
   class IniFile
 
     @@SECTION_REGEX = /^\s*\[([\w\d\.\\\/\-\:\s]*[\w\d\.\\\/\-])\]\s*$/
-    @@SETTING_REGEX = /^(\s*)([\w\d\.\\\/\-\s]*[\w\d\.\\\/\-])([ \t]*=[ \t]*)([\S\s]*?)\s*$/
-    @@COMMENTED_SETTING_REGEX = /^(\s*)[#;]+(\s*)([\w\d\.\\\/\-]+)([ \t]*=[ \t]*)([\S\s]*?)\s*$/
+    @@SETTING_REGEX = /^(\s*)([^\[#;][\w\d\.\\\/\-\s\[\]\']*[\w\d\.\\\/\-\]])([ \t]*=[ \t]*)([\S\s]*?)\s*$/
+    @@COMMENTED_SETTING_REGEX = /^(\s*)[#;]+(\s*)([^\[]*[\w\d\.\\\/\-]+[\w\d\.\\\/\-\[\]\']+)([ \t]*=[ \t]*)([\S\s]*?)\s*$/
 
     def initialize(path, key_val_separator = ' = ')
       @path = path

spec/unit/puppet/util/ini_file_spec.rb

@@ -29,6 +29,7 @@
     #another comment
  ; yet another comment
  zot = multi word value
+ xyzzy['thing1']['thing2']=xyzzyvalue
       EOS
       template.split("\n")
     }
@@ -50,6 +51,7 @@
       subject.get_value("section2", "foo").should == "foovalue2"
       subject.get_value("section2", "baz").should == "bazvalue"
       subject.get_value("section2", "zot").should == "multi word value"
+      subject.get_value("section2", "xyzzy['thing1']['thing2']").should == "xyzzyvalue"
     end
 
   end
@@ -113,6 +115,7 @@
 [section1]
 foo=
 #bar=
+#xyzzy['thing1']['thing2']='xyzzyvalue'
       EOS
       template.split("\n")
     }
@@ -127,6 +130,9 @@
       subject.get_value("section1", "bar").should == nil
       subject.set_value("section1", "bar", "barvalue")
       subject.get_value("section1", "bar").should == "barvalue"
+      subject.get_value("section1", "xyzzy['thing1']['thing2']").should == nil
+      subject.set_value("section1", "xyzzy['thing1']['thing2']", "xyzzyvalue")
+      subject.get_value("section1", "xyzzy['thing1']['thing2']").should == "xyzzyvalue"
     end
 
     it "should properly add new empty values" do