Merge pull request #126 from huan/master

fix issue where single characters settings were not being saved.

lib/puppet/util/ini_file.rb

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

spec/unit/puppet/util/ini_file_spec.rb

@@ -26,10 +26,12 @@ baz =
 
 foo= foovalue2
 baz=bazvalue
+ ; commented = out setting
     #another comment
  ; yet another comment
  zot = multi word value
  xyzzy['thing1']['thing2']=xyzzyvalue
+ l=git log
       EOS
       template.split("\n")
     }
@@ -45,13 +47,19 @@ baz=bazvalue
     end
 
     it "should expose settings for sections" do
-      subject.get_value("section1", "foo").should == "foovalue"
+      subject.get_settings("section1").should == {
-      subject.get_value("section1", "bar").should == "barvalue"
+        "bar" => "barvalue",
-      subject.get_value("section1", "baz").should == ""
+        "baz" => "",
-      subject.get_value("section2", "foo").should == "foovalue2"
+        "foo" => "foovalue"
-      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"
+      subject.get_settings("section2").should == {
+        "baz" => "bazvalue",
+        "foo" => "foovalue2",
+        "l" => "git log",
+        "xyzzy['thing1']['thing2']" => "xyzzyvalue",
+        "zot" => "multi word value"
+      }
     end
 
   end