parseconfig 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d1e9b35305ee60ce0732906eee17091e8c3564e
-  data.tar.gz: 20c5c7343345170d04a5f9009f55f9a31bf61cc2
+  metadata.gz: e211188d856835d945577417f00876882067caa2
+  data.tar.gz: 8004e0a522105456dde4bf1d35c0c6ac0c4c1bce
 SHA512:
-  metadata.gz: 7db0455728e0e7a4cbb058db4766e28bf5029258b10f808c11bf5eca06a5d53dafb9499dac1339bbcf847306ac3f39c6f55cd9ed77dfbdb57134170dcd3ff413
-  data.tar.gz: 31d19e90674de0732c023e644b90e9860c5845b8d0cabed89022786b45d8c43a4d16c81cd8b2f9f196da6548ada8a95741ee941fbe43bf1b250a5e822373a9c3
+  metadata.gz: 98046197998f9eca8c26805de80a7362776a56b9172312a71d3d8963e3eb9dbfc627248180ab847476e9a7d009a8dff32b3cefa2d787d891b8cc569322fa6c14
+  data.tar.gz: ba8a718dfd8a99c6ee194b97f1be7d92cb562a49a4fcab0752c320d0605325244f3c002777762bfc8fd1f642a6ea1c78dd496a24f8d77ec0b64d6c7739d97d84

data/Changelog

@@ -1,3 +1,7 @@
+Mon Jan 25, 2016 - v1.0.7
+- Support alternative comment types (default: ['#', ';']) (@voobscout)
+  Resolves Issue #30
+
 Mon Oct 06, 2014 - v1.0.6
 - Fix where extraneous double quotes were getting wrapped around parameters
   that have non-word characters (issue #19)

data/LICENSE

@@ -1,7 +1,7 @@
 
 The MIT License:
 
-Copyright (c) 2006-2014 Data Folk Labs, LLC
+Copyright (c) 2006-2016 Data Folk Labs, LLC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,5 +1,4 @@
-Ruby ParseConfig Library
-========================
+# Ruby ParseConfig Library
 
 ParseConfig provides simple parsing of standard configuration files in the
 form of 'param = value'.  It also supports nested [group] sections.
@@ -9,34 +8,37 @@ form of 'param = value'.  It also supports nested [group] sections.
 Installation
 ------------
 
-    $ sudo gem install parseconfig
+```
+$ sudo gem install parseconfig
+```
 
 Gemfile
 
-     gem 'parseconfig'
+```
+gem 'parseconfig'
+```
 
-Usage
------
+## Usage
 
 An example configuration file might look like:
 
-    # Example Config
-    param1 = value1
-    param2 = value2
+```
+# Example Config
+param1 = value1
+param2 = value2
 
-    [group1]
-    group1_param1 = group1_value1
-    group1_param2 = group1_value2
+[group1]
+group1_param1 = group1_value1
+group1_param2 = group1_value2
 
-    [group2]
-    group2_param1 = group2_value1
-    group2_param2 = group2_value2
+[group2]
+group2_param1 = group2_value1
+group2_param2 = group2_value2
 
 
 Access it with ParseConfig:
 
 ```ruby
-
 >> require 'parseconfig'
 => true
 
@@ -81,8 +83,7 @@ Access it with ParseConfig:
 
 ```
 
-License
--------
+## License
 
 The ParseConfig library is Open Source and distributed under the MIT license.
 Please see the LICENSE file included with this software.

data/lib/parseconfig.rb

@@ -1,6 +1,6 @@
 #
 # Author::      BJ Dierkes <derks@datafolklabs.com>
-# Copyright::   Copyright (c) 2006,2013 BJ Dierkes
+# Copyright::   Copyright (c) 2006,2016 Data Folk Labs, LLC
 # License::     MIT
 # URL::         https://github.com/datafolklabs/ruby-parseconfig
 #
@@ -18,7 +18,7 @@
 
 class ParseConfig
 
-  Version = '1.0.6'
+  Version = '1.0.7'
 
   attr_accessor :config_file, :params, :groups
 
@@ -28,10 +28,12 @@ class ParseConfig
   # the config file is 'param = value' then the itializer
   # will eval "@param = value"
   #
-  def initialize(config_file=nil)
+  def initialize(config_file=nil, separator='=', comments: ['#', ';'])
     @config_file = config_file
     @params = {}
     @groups = []
+    @splitRegex = '\s*' + separator + '\s*'
+    @comments = comments
 
     if(self.config_file)
       self.validate_config()
@@ -64,9 +66,17 @@ class ParseConfig
       rescue NoMethodError
       end
 
-      unless (/^\#/.match(line))
-        if(/\s*=\s*/.match(line))
-          param, value = line.split(/\s*=\s*/, 2)
+      is_comment = false
+      @comments.each do |comment|
+        if (/^#{comment}/.match(line))
+          is_comment = true
+          break
+        end
+      end
+
+      unless is_comment
+        if(/#{@splitRegex}/.match(line))
+          param, value = line.split(/#{@splitRegex}/, 2)
           var_name = "#{param}".chomp.strip
           value = value.chomp.strip
           new_value = ''
@@ -124,11 +134,15 @@ class ParseConfig
 
   # This method adds an element to the config object (not the config file)
   # By adding a Hash, you create a new group
-  def add(param_name, value)
+  def add(param_name, value, override = false)
     if value.class == Hash
       if self.params.has_key?(param_name)
         if self.params[param_name].class == Hash
-          self.params[param_name].merge!(value)
+          if override
+            self.params[param_name] = value
+          else
+            self.params[param_name].merge!(value)
+          end
         elsif self.params.has_key?(param_name)
           if self.params[param_name].class != value.class
             raise ArgumentError, "#{param_name} already exists, and is of different type!"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parseconfig
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - BJ Dierkes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies: []
 description: ParseConfig provides simple parsing of standard configuration files in
   the form of 'param = value'.  It also supports nested [group] sections.
@@ -40,7 +40,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Config File Parser for Standard Unix/Linux Type Config Files