parseconfig 1.0.8 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 56edd2517c03e43f3a23682fde2c9d75d347915a
-  data.tar.gz: e3558aa93f8891394d6a2a16cb23eccd572ff7dd
+SHA256:
+  metadata.gz: 79e32d975451b2b4cbf6ee3123e87b26a1fbf540066b3d44322c02d573a451af
+  data.tar.gz: 3a53181d9344b6b2ea790f968d7f33305709944bafd1c430a27601c411672fff
 SHA512:
-  metadata.gz: 80853b4986b86ba31a242c340d72422719214e9e1955588fe63575d1afb74da7b3535efeb7ab9b27dfa5d58e47820f26d234e0cf1309224c12ae6b3a85f4e7c9
-  data.tar.gz: 504a7f0c4d64ea7679850edecb18802087d0de0eb96195830af33284d5a747b1e3f108d2aa7f0cfbb006abee3abb0f47950f249adabacfde6e3c30f9b42d1918
+  metadata.gz: d7b538e6e901837e6d6e479e072841ba6dd404ecc060cf417d98a40e714daabaf92fa54c3eeec137ff11d5df98e055f374c8f8f43917ce4d3d3ef4668a3d2efa
+  data.tar.gz: 634668d51266a54123d170652bb8bd03fcac5936c4a0deb0f388860ecad6cd84cd88c256b85be6d78a7155b766cbccbc2de0334d3b601e1b9304aaa8403118c9

data/Changelog

@@ -1,3 +1,7 @@
+Mon Sep 28, 2020 - v1.1.0
+- Add non-value option support.
+  Resolves Issue #11
+
 Mon Jan 25, 2016 - v1.0.8
 - Use backward compatible positional arguments (not named keyword arguments)
   Resolves Issue #31

data/lib/parseconfig.rb

@@ -17,9 +17,6 @@
 # config file
 
 class ParseConfig
-
-  Version = '1.0.8'
-
   attr_accessor :config_file, :params, :groups
 
   # Initialize the class with the path to the 'config_file'
@@ -28,81 +25,83 @@ class ParseConfig
   # the config file is 'param = value' then the itializer
   # will eval "@param = value"
   #
-  def initialize(config_file=nil, separator='=', comments=['#', ';'])
+  def initialize(config_file = nil, separator = '=', comments = ['#', ';'])
     @config_file = config_file
     @params = {}
     @groups = []
-    @splitRegex = '\s*' + separator + '\s*'
+    @split_regex = '\s*' + separator + '\s*'
     @comments = comments
 
-    if(self.config_file)
-      self.validate_config()
-      self.import_config()
-    end
+    return unless config_file
+
+    validate_config
+    import_config
   end
 
   # Validate the config file, and contents
-  def validate_config()
-    unless File.readable?(self.config_file)
-      raise Errno::EACCES, "#{self.config_file} is not readable"
-    end
+  def validate_config
+    return if File.readable?(config_file)
+
+    raise Errno::EACCES, "#{config_file} is not readable"
 
     # FIX ME: need to validate contents/structure?
   end
 
   # Import data from the config to our config object.
-  def import_config()
+  def import_config
     # The config is top down.. anything after a [group] gets added as part
     # of that group until a new [group] is found.
     group = nil
-    open(self.config_file) { |f| f.each_with_index do |line, i|
-      line.strip!
-
-      # force_encoding not available in all versions of ruby
-      begin
-        if i.eql? 0 and line.include?("\xef\xbb\xbf".force_encoding("UTF-8"))
-          line.delete!("\xef\xbb\xbf".force_encoding("UTF-8"))
+    open(config_file) do |f|
+      f.each_with_index do |line, i|
+        line.strip!
+
+        # force_encoding not available in all versions of ruby
+        begin
+          if i.eql? 0 && line.include?("\xef\xbb\xbf".force_encoding('UTF-8'))
+            line.delete!("\xef\xbb\xbf".force_encoding('UTF-8'))
+          end
+        rescue NoMethodError
         end
-      rescue NoMethodError
-      end
 
-      is_comment = false
-      @comments.each do |comment|
-        if (/^#{comment}/.match(line))
-          is_comment = true
-          break
+        is_comment = false
+        @comments.each do |comment|
+          if /^#{comment}/.match(line)
+            is_comment = true
+            break
+          end
         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 = ''
-          if (value)
-            if value =~ /^['"](.*)['"]$/
-              new_value = $1
+        unless is_comment
+          if /#{@split_regex}/.match(line)
+            param, value = line.split(/#{@split_regex}/, 2)
+            var_name = param.to_s.chomp.strip
+            value = value.chomp.strip
+            new_value = ''
+            if value
+              if value =~ /^['"](.*)['"]$/
+                new_value = Regexp.last_match(1)
+              else
+                new_value = value
+              end
             else
-              new_value = value
+              new_value = ''
             end
-          else
-            new_value = ''
-          end
 
-          if group
-            self.add_to_group(group, var_name, new_value)
-          else
-            self.add(var_name, new_value)
+            if group
+              add_to_group(group, var_name, new_value)
+            else
+              add(var_name, new_value)
+            end
+          elsif /^\[(.+)\]$/.match(line).to_a != []
+            group = /^\[(.+)\]$/.match(line).to_a[1]
+            add(group, {})
+          elsif /\w+/.match(line)
+            add(line.to_s.chomp.strip, true)
           end
-
-        elsif(/^\[(.+)\]$/.match(line).to_a != [])
-          group = /^\[(.+)\]$/.match(line).to_a[1]
-          self.add(group, {})
-
         end
       end
-    end }
+    end
   end
 
   # This method will provide the value held by the object "@param"
@@ -112,65 +111,63 @@ class ParseConfig
   # DEPRECATED - will be removed in future versions
   #
   def get_value(param)
-    puts "ParseConfig Deprecation Warning: get_value() is deprecated. Use " + \
+    puts 'ParseConfig Deprecation Warning: get_value() is deprecated. Use ' \
          "config['param'] or config['group']['param'] instead."
-    return self.params[param]
+    params[param]
   end
 
   # This method is a shortcut to accessing the @params variable
   def [](param)
-    return self.params[param]
+    params[param]
   end
 
   # This method returns all parameters/groups defined in a config file.
-  def get_params()
-    return self.params.keys
+  def get_params
+    params.keys
   end
 
   # List available sub-groups of the config.
-  def get_groups()
-    return self.groups
+  def get_groups
+    groups
   end
 
   # 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, override = false)
     if value.class == Hash
-      if self.params.has_key?(param_name)
-        if self.params[param_name].class == Hash
+      if params.key? param_name
+        if params[param_name].class == Hash
           if override
-            self.params[param_name] = value
+            params[param_name] = value
           else
-            self.params[param_name].merge!(value)
+            params[param_name].merge!(value)
           end
-        elsif self.params.has_key?(param_name)
-          if self.params[param_name].class != value.class
+        elsif params.key? param_name
+          if params[param_name].class != value.class
             raise ArgumentError, "#{param_name} already exists, and is of different type!"
           end
         end
       else
-        self.params[param_name] = value
+        params[param_name] = value
       end
-      if ! self.groups.include?(param_name)
-        self.groups.push(param_name)
+      unless groups.include?(param_name)
+        groups.push(param_name)
       end
     else
-      self.params[param_name] = value
+      params[param_name] = value
     end
   end
 
   # Add parameters to a group. Note that parameters with the same name
   # could be placed in different groups
   def add_to_group(group, param_name, value)
-    if ! self.groups.include?(group)
-      self.add(group, {})
-    end
-    self.params[group][param_name] = value
+    add(group, {}) unless groups.include?(group)
+    params[group][param_name] = value
   end
 
   # Writes out the config file to output_stream
-  def write(output_stream=STDOUT, quoted=true)
-    self.params.each do |name,value|
+  def write(output_stream = STDOUT, quoted = true)
+    params.each do |name, value|
       if value.class.to_s != 'Hash'
         if quoted == true
           output_stream.puts "#{name} = \"#{value}\""
@@ -181,9 +178,9 @@ class ParseConfig
     end
     output_stream.puts "\n"
 
-    self.groups.each do |group|
+    groups.each do |group|
       output_stream.puts "[#{group}]"
-      self.params[group].each do |param, value|
+      params[group].each do |param, value|
         if quoted == true
           output_stream.puts "#{param} = \"#{value}\""
         else
@@ -202,7 +199,7 @@ class ParseConfig
   # Returns true if ParseConfig are equivalent and false if they differ.
 
   def eql?(other)
-    self.params == other.params && self.groups == other.groups
+    params == other.params && groups == other.groups
   end
   alias == eql?
 end

data/lib/version.rb

@@ -0,0 +1,3 @@
+module ParseConfig
+  VERSION = '1.1.0'.freeze
+end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: parseconfig
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.1.0
 platform: ruby
 authors:
 - BJ Dierkes
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-25 00:00:00.000000000 Z
+date: 2020-09-28 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.
+description: ParseConfig provides simple parsing of standardconfiguration files in
+  the form of 'param = value'. It also supports nested [group] sections.
 email: derks@datafolklabs.com
 executables: []
 extensions: []
@@ -21,10 +21,11 @@ files:
 - LICENSE
 - README.md
 - lib/parseconfig.rb
+- lib/version.rb
 homepage: http://github.com/datafolklabs/ruby-parseconfig/
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -39,10 +40,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.1
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: Config File Parser for Standard Unix/Linux Type Config Files
 test_files: []
-has_rdoc: