lab42_rgxargs 0.2.1 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9f2ee6bdaddb5db512e1cf55c65f42699b2441ac0878760f44c8083ff12f023
-  data.tar.gz: 8e4175e4906cc5b5a3511f413b96f27f63cf7eaeaec7c07fe5e851ee2faa6e08
+  metadata.gz: fa12272618cb7bd23bf218ce2405f99119f1686352b7ddfc622e5697caa22dbf
+  data.tar.gz: 5f6c5ebf2b1ff5bdfa3d701b493359aff5fdea521f221b78d0f5f3e3838060a9
 SHA512:
-  metadata.gz: 33a12fa2ce1f98386d28bdd1c99a18fc982545fb26030c5a6dd618f5ce75e2276dfc06f91a4c9bbe6bb6867550be9a9a2aa95ca18d67244f4c3861409d4d58fe
-  data.tar.gz: 022b992b251e8027bb19e1a91810abc066fac549b4d74ff77d43ecfa3c8ceae7bd41311b3161d7f7546ba187673307385c522f272a677aa0e81c54250c4ca0af
+  metadata.gz: bb9e676b416e06afdb02c10740026afd313f41aaf17ce60824054309327915e00dd4883901d311bb96ff15d376793fdf27a9cc6be7a1c2ee6d8074a75ff302bc
+  data.tar.gz: 1a40c994e1b1943c070f6b2969c1b4b59ab832e17e79908cd7218210bbf12e916c1521ea5758aa0e7330515606dd4745a18941771f8bd9e3d57d775b941791a2

data/lib/lab42/monkey/open_struct.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'ostruct'
+class OpenStruct
+  def deconstruct_keys(_keys)
+    to_h
+  end
+end
+# SPDX-License-Identifier: Apache-2.0

data/lib/lab42/rgxargs/version.rb

@@ -1,5 +1,5 @@
 module Lab42
   class Rgxargs
-    VERSION = "0.2.1"
+    VERSION = "0.2.4"
   end
 end

data/lib/lab42/rgxargs.rb

@@ -1,7 +1,8 @@
 require 'forwardable'
-require 'ostruct'
 require 'lab42/enumerable'
 require 'set'
+
+require_relative 'monkey/open_struct'
 module Lab42
 
   class Rgxargs
@@ -18,7 +19,7 @@ module Lab42
     extend Forwardable
     def_delegators Predefined, :list_matcher
 
-    attr_reader :allowed, :args, :conversions, :defaults, :defined_rules, :errors, :options, :required, :syntaxes
+    attr_reader :allowed, :args, :conversions, :defaults, :defined_rules, :errors, :open_struct, :options, :posix, :required, :syntaxes
 
     def predefined_matchers
       Predefined.defined_names
@@ -52,11 +53,11 @@ module Lab42
     end
 
     def parse argv
-      until argv.empty?
-        argv = _parse_next argv
+      if posix
+        _parse_posix argv
+      else
+        _parse_ruby_syntax argv
       end
-      _check_required_kwds
-      [options, args, errors]
     end
 
     def allows name, matcher=nil, &converter
@@ -69,18 +70,20 @@ module Lab42
 
     private
 
-    def initialize &blk
+    def initialize(open_struct: true, posix: false, &blk)
       @args          = []
       @allowed       = nil
       @conversions   = {}
       @defaults      = {}
       @defined_rules = []
       @errors        = []
+      @posix         = posix
+      @open_struct   = open_struct
       @required      = ::Set.new
       @syntaxes      = []
 
       instance_exec(&blk) if blk
-      @options       = ::OpenStruct.new(defaults)
+      @options       = defaults
     end
 
     def _convert(value, name:)
@@ -122,7 +125,16 @@ module Lab42
       end
     end
 
-    def _parse_next argv
+    def _parse_next_posix argv
+      first, *rest = argv
+      if first == '--'
+        @args += rest
+        return []
+      end
+      _parse_posix_param first, rest
+    end
+
+    def _parse_next_ruby_syntax argv
       first, *rest = argv
       if first == '--'
         @args += rest
@@ -131,12 +143,49 @@ module Lab42
       _parse_symbolic first, rest
     end
 
+    def _parse_posix argv
+      until argv.empty?
+        argv = _parse_next_posix argv
+      end
+      _check_required_kwds
+      _return_values
+    end
+
+    def _parse_posix_param first, rest
+      case first
+      when %r{\A--([-_[:alnum:]]+)=(.*)\z}
+        Regexp.last_match.to_a => _, name, value
+        name = name.gsub("-", "_")
+        options[name.to_sym] = _convert(value, name: name)
+      when %r{\A--([-_[:alnum:]]+)\z}
+        Regexp.last_match.to_a => _, name
+        name = name.gsub("-", "_")
+        options[name.to_sym] = true
+      when %r{\A-([[:alnum:]]+)\z}
+        $1.grapheme_clusters.each do |shopt|
+          options[shopt.to_sym]=true
+        end
+      else
+        args << first
+        # _parse_syntax(first)
+      end
+      rest
+    end
+
+    def _parse_ruby_syntax argv
+      until argv.empty?
+        argv = _parse_next_ruby_syntax argv
+      end
+      _check_required_kwds
+      _return_values
+    end
+
     def _parse_symbolic first, rest
       case first
       when %r{\A:(.*)}
         switch = $1.gsub('-','_').to_sym
         _check_switch(switch)
-        options[switch]=true
+        options[switch.to_sym]=true
         rest
       when %r{(.*):\z}
         kwd = $1.gsub('-', '_').to_sym
@@ -154,7 +203,7 @@ module Lab42
     def _parse_syntax first
       value, as = syntaxes.find_value(first){ |matcher| matcher.match(first) }
       if as
-        options[as] = value
+        options[as.to_sym] = value
       else
         args << value
       end
@@ -163,12 +212,19 @@ module Lab42
     def _parse_value name, rest
       value, *rest1 = rest
       if value
-        options[name] = _convert(value, name: name)
+        options[name.to_sym] = _convert(value, name: name)
         return rest1
       end
       errors << [:missing_required_value, name]
       []
     end
 
+    def _return_values
+      if open_struct
+        [::OpenStruct.new(options), args, errors]
+      else
+        [options, args, errors]
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lab42_rgxargs
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.4
 platform: ruby
 authors:
 - Robert Dober
@@ -73,6 +73,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/lab42/enumerable.rb
+- lib/lab42/monkey/open_struct.rb
 - lib/lab42/rgxargs.rb
 - lib/lab42/rgxargs/argument_matcher.rb
 - lib/lab42/rgxargs/checker.rb
@@ -101,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Parse CL args according to regexen