lab42_rgxargs 0.2.2 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6f5ad80ee90e6586a78c9ea98a1edbc211991425ad57779851c458270a24cdf
-  data.tar.gz: 424e5bd200042239c0f514dc148734a7ccfc6aa3b940d4f94ad2298e90b61e83
+  metadata.gz: fad5aa10d2f59f1463750eaf26714fa89c84c57bc1af8834467fcc5af041ae7c
+  data.tar.gz: 01f8276d9423596b87a88c6f9af13904bfc8df9b3c11ce7bcc4fef2121ca7bba
 SHA512:
-  metadata.gz: 3fa3c37dc3763b9369a530db5df60bbcecc1524e856e6a5e74bf0067a2d1838a5e4fdb53c3e5b4a09ae097c216dab484dd5490b5f717ffbfeee7db49bd4ad676
-  data.tar.gz: '009c8e68f9acdf6ac1ca97a06a7e06e2c17c5f64419ff417ee197b907ce0867b07eb6dfb6c330a6f80a5c924021ea532131a2a4469189a23ddbe82c7d9458519'
+  metadata.gz: c4d6c8d6d3324e96bbeafff6c232dbd21e28036ef49ab92b0c3d91f41d967c8fbf844c24bff30d2427bfe03709d73482fcdf0b4b2bea3d8bf582135be9e82f87
+  data.tar.gz: 6a0b083147b1f5c62ef82dc6b5769ba2fc1f5e744d6b1866ea1f002332fb5a0e47f28c11fab6f6ba53e89534e91f7e76db9ce6db380f9492076e1ae965f79af5

data/lib/lab42/rgxargs/version.rb

@@ -1,5 +1,7 @@
+require 'l42/map'
+
 module Lab42
   class Rgxargs
-    VERSION = "0.2.2"
+    VERSION = "0.3.1"
   end
 end

data/lib/lab42/rgxargs.rb

@@ -1,7 +1,7 @@
 require 'forwardable'
-require 'ostruct'
 require 'lab42/enumerable'
 require 'set'
+
 module Lab42
 
   class Rgxargs
@@ -18,7 +18,7 @@ module Lab42
     extend Forwardable
     def_delegators Predefined, :list_matcher
 
-    attr_reader :allowed, :args, :conversions, :defaults, :defined_rules, :errors, :options, :posix, :required, :syntaxes
+    attr_reader :allowed, :args, :conversions, :defaults, :defined_rules, :errors, :l42_map, :options, :posix, :required, :syntaxes
 
     def predefined_matchers
       Predefined.defined_names
@@ -69,7 +69,7 @@ module Lab42
 
     private
 
-    def initialize(posix: false, &blk)
+    def initialize(l42_map: true, posix: false, &blk)
       @args          = []
       @allowed       = nil
       @conversions   = {}
@@ -77,11 +77,12 @@ module Lab42
       @defined_rules = []
       @errors        = []
       @posix         = posix
+      @l42_map   = l42_map
       @required      = ::Set.new
       @syntaxes      = []
 
       instance_exec(&blk) if blk
-      @options       = ::OpenStruct.new(defaults)
+      @options       = defaults
     end
 
     def _convert(value, name:)
@@ -146,7 +147,7 @@ module Lab42
         argv = _parse_next_posix argv
       end
       _check_required_kwds
-      [options, args, errors]
+      _return_values
     end
 
     def _parse_posix_param first, rest
@@ -154,14 +155,14 @@ module Lab42
       when %r{\A--([-_[:alnum:]]+)=(.*)\z}
         Regexp.last_match.to_a => _, name, value
         name = name.gsub("-", "_")
-        options[name] = _convert(value, name: name)
+        options[name.to_sym] = _convert(value, name: name)
       when %r{\A--([-_[:alnum:]]+)\z}
         Regexp.last_match.to_a => _, name
         name = name.gsub("-", "_")
-        options[name] = true
+        options[name.to_sym] = true
       when %r{\A-([[:alnum:]]+)\z}
         $1.grapheme_clusters.each do |shopt|
-          options[shopt]=true
+          options[shopt.to_sym]=true
         end
       else
         args << first
@@ -175,7 +176,7 @@ module Lab42
         argv = _parse_next_ruby_syntax argv
       end
       _check_required_kwds
-      [options, args, errors]
+      _return_values
     end
 
     def _parse_symbolic first, rest
@@ -183,7 +184,7 @@ module Lab42
       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
@@ -201,7 +202,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
@@ -210,12 +211,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 l42_map
+        [L42::Map.new(**options).with_default(nil), 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.2
+  version: 0.3.1
 platform: ruby
 authors:
 - Robert Dober
@@ -11,61 +11,19 @@ cert_chain: []
 date: 2020-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: speculate_about
+  name: l42_map
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
-  type: :development
+        version: 0.1.1
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.9'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-- !ruby/object:Gem::Dependency
-  name: pry-doc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.1.1
 description: Parse CL args according to regexen
 email: robert.dober@gmail.com
 executables: []