Merge pull request #37 from jasonwbarnett/fix-comment-issue

Fix #36

lib/parseconfig.rb

@@ -93,8 +93,8 @@ def import_config
             else
               add(var_name, new_value)
             end
-          elsif /^\[(.+)\]$/.match(line).to_a != []
-            group = /^\[(.+)\]$/.match(line).to_a[1]
+          elsif /^\[(.+)\](\s*#{escaped_comment_regex}+.*)?$/.match(line).to_a != []
+            group = /^\[(.+)\](\s*#{escaped_comment_regex}+.*)?$/.match(line).to_a[1]
             add(group, {})
           elsif /\w+/.match(line)
             add(line.to_s.chomp.strip, true)
@@ -104,6 +104,10 @@ def import_config
     end
   end
 
+  def escaped_comment_regex
+    /[#{Regexp.escape(@comments.join(''))}]/
+  end
+
   # This method will provide the value held by the object "@param"
   # where "@param" is actually the name of the param in the config
   # file.

tests/files/groups.conf

@@ -1,5 +1,11 @@
-[group1]
+[group1]; other
 foo = bar
 
 [group2]
 baz = quux
+
+[group3]# this is a comment
+blah = dah
+
+[group4] # this is a comment
+sha = ma

tests/files/groups.rb

@@ -4,5 +4,11 @@
   },
   "group2" => {
     "baz" => "quux"
+  },
+  "group3" => {
+    "blah" => "dah"
+  },
+  "group4" => {
+    "sha" => "ma"
   }
 }