shellopts 2.0.14 → 2.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2101f633ad0e166982b108842a83f91b3d216869f9fe3d6ac7ecea5256f2b437
-  data.tar.gz: da77f695902e5e921e598dd8d1327af4ce07ffe7b9cfadb88fe1b0889b95b4e0
+  metadata.gz: 253954c7f2de836c89e511dffabf3217719e778d47f74740a51c3b1099dcd07f
+  data.tar.gz: 4a5579e3c56674d09ba380d392e600028e6c353728994e8b2445629b772cb450
 SHA512:
-  metadata.gz: 36dbd8d33d74a5b985463df5fb514501c2881881bdd68f1fa479c7ecac3de2bc4a2bc3a713acfe735d3e53ccdde10f5abf5ecc066d370fa8e795a77e290f9988
-  data.tar.gz: b364c8d00de2f7ece58d3c721ef3d4f40a892a232aa39a0c94df2b7ef37cf86e78c99df25c07e8802b0e48640ec928c4157bd89a2cb0851955484ed5957733ca
+  metadata.gz: d0f0f0418361c69037a944c1e99021c32d578ed41dc239e7f9dc9f1ce94e578a137efdea3a9b96848fc0fb0b9aa1a8114153485b6ce21ceea7a3f34ceacdd197
+  data.tar.gz: f70644b23103d244fe06164a337839c042d6e65e1aa3dba59fa6b028cf7b0032fd694121c582142f2f3cdfbdaa12cba17464b74114bc5caf5b2aa489cde94f9a

data/TODO

@@ -1,4 +1,5 @@
-
+o --option can't be escaped if on the start of a block line?
+o Use require_relative
 o In the following list is a command with a mandatory sub-command
 
   list.tables!
@@ -14,7 +15,6 @@ o In the following list is a command with a mandatory sub-command
   and not as 
     list [tables|uuids]
 
-
 o Replace -h with -? when -h is specified by the user (eg. as a shorthand for --host)
 o Limit text width to -10 chars of what it is today (same as stackexchange width in characters)
 o Fix formatting error in long arguments (see ms2pg)

data/lib/shellopts/program.rb

@@ -153,10 +153,10 @@ module ShellOpts
     # Grammar object
     attr_reader :__grammar__
 
-    # Hash from identifier to value. Can be Integer, Float, or String
-    # depending on the option's type. Repeated options options without
-    # arguments have the number of occurences as the value, with arguments
-    # the value is an array of the given values
+    # Hash from identifier to value. Can be Integer, Float, or String depending
+    # on the option's type. Repeated options options without arguments have the
+    # number of occurences as value and with arguments the value is an array of
+    # the given values
     attr_reader :__option_values__
 
     # List of Option objects for the subcommand in the same order as
@@ -194,7 +194,48 @@ module ShellOpts
 
     def __define_option_methods__
       @__grammar__.options.each { |opt|
-        if opt.argument?
+        if !opt.repeatable?
+          self.instance_eval %(
+            def #{opt.attr}?() 
+              @__option_values__.key?(:#{opt.attr}) 
+            end
+          )
+        end
+        
+        if opt.repeatable?
+          if opt.argument?
+            self.instance_eval %(
+              def #{opt.attr}?() 
+                (@__option_values__[:#{opt.attr}]&.size || 0) > 0 
+              end
+            )
+            self.instance_eval %(
+              def #{opt.attr}(default = [])
+                if @__option_values__.key?(:#{opt.attr}) 
+                  @__option_values__[:#{opt.attr}]
+                else
+                  default
+                end
+              end
+            )
+          else
+            self.instance_eval %(
+              def #{opt.attr}?() 
+                (@__option_values__[:#{opt.attr}] || 0) > 0 
+              end
+            )
+            self.instance_eval %(
+              def #{opt.attr}(default = 0) 
+                if default > 0 && (@__option_values__[:#{opt.attr}] || 0) == 0
+                  default
+                else
+                  @__option_values__[:#{opt.attr}] || 0
+                end
+              end
+            )
+          end
+
+        elsif opt.argument?
           self.instance_eval %(
             def #{opt.attr}(default = nil)
               if @__option_values__.key?(:#{opt.attr}) 
@@ -205,26 +246,13 @@ module ShellOpts
             end
           )
 
-        elsif opt.repeatable?
+        else
           self.instance_eval %(
-            def #{opt.attr}(default = 0) 
-              if default > 0 && @__option_values__[:#{opt.attr}] == 0
-                default
-              else
-                @__option_values__[:#{opt.attr}]
-              end
+            def #{opt.attr}() 
+              @__option_values__.key?(:#{opt.attr}) 
             end
           )
-        else
-          self.instance_eval("def #{opt.attr}() @__option_values__[:#{opt.attr}] end")
         end
-
-        if opt.argument? || opt.repeatable?
-          self.instance_eval("def #{opt.attr}=(value) @__option_values__[:#{opt.attr}] = value end")
-          @__option_values__[opt.attr] = 0 if !opt.argument?
-        end
-
-        self.instance_eval("def #{opt.attr}?() @__option_values__.key?(:#{opt.attr}) end")
       }
 
       @__grammar__.commands.each { |cmd|

data/lib/shellopts/version.rb

@@ -1,3 +1,3 @@
 module ShellOpts
-  VERSION = "2.0.14"
+  VERSION = "2.0.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shellopts
 version: !ruby/object:Gem::Version
-  version: 2.0.14
+  version: 2.0.15
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-05 00:00:00.000000000 Z
+date: 2022-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: forward_to