lab42_rgxargs 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46ea3cf93ac7771a551e9a10b20f186f138212ebce19c00a5083f81643d6f5aa
-  data.tar.gz: 67228a63a2bafd4e31146ed404763f5594d04874814ceb4a305f32fbc43be2bb
+  metadata.gz: fa12272618cb7bd23bf218ce2405f99119f1686352b7ddfc622e5697caa22dbf
+  data.tar.gz: 5f6c5ebf2b1ff5bdfa3d701b493359aff5fdea521f221b78d0f5f3e3838060a9
 SHA512:
-  metadata.gz: 6ed3a187a04077514644c693ac0e4ec39a3043da60b4bf1f89e330e09de277b87383173d4705e5b977a3f004fb9dc0c96dbe906a4e68944a78ea9e3d0db09b50
-  data.tar.gz: 7d4e6142d636dfb485c2724ef6c55a20bef1128d025778f478feb6ce7f7ac0c2a9756e23c22c695475d24c03a2c814ed30735e7cc9eafcc8341ad4d8189b8d93
+  metadata.gz: bb9e676b416e06afdb02c10740026afd313f41aaf17ce60824054309327915e00dd4883901d311bb96ff15d376793fdf27a9cc6be7a1c2ee6d8074a75ff302bc
+  data.tar.gz: 1a40c994e1b1943c070f6b2969c1b4b59ab832e17e79908cd7218210bbf12e916c1521ea5758aa0e7330515606dd4745a18941771f8bd9e3d57d775b941791a2

data/lib/lab42/rgxargs/version.rb

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

data/lib/lab42/rgxargs.rb

@@ -19,7 +19,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, :open_struct, :options, :posix, :required, :syntaxes
 
     def predefined_matchers
       Predefined.defined_names
@@ -70,7 +70,7 @@ module Lab42
 
     private
 
-    def initialize(posix: false, &blk)
+    def initialize(open_struct: true, posix: false, &blk)
       @args          = []
       @allowed       = nil
       @conversions   = {}
@@ -78,11 +78,12 @@ module Lab42
       @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:)
@@ -147,7 +148,7 @@ module Lab42
         argv = _parse_next_posix argv
       end
       _check_required_kwds
-      [options, args, errors]
+      _return_values
     end
 
     def _parse_posix_param first, rest
@@ -155,14 +156,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
@@ -176,7 +177,7 @@ module Lab42
         argv = _parse_next_ruby_syntax argv
       end
       _check_required_kwds
-      [options, args, errors]
+      _return_values
     end
 
     def _parse_symbolic first, rest
@@ -184,7 +185,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
@@ -202,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
@@ -211,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.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Robert Dober