shellopts 2.0.13 → 2.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dd7a731b489dbf650e15549d9768469ae9d6c47c6dba3ae79f4d956fea069ab
-  data.tar.gz: 4b71aff7ba350d4616a136580857a6acd840141ed0b7463034518dcf4ae4dada
+  metadata.gz: 2101f633ad0e166982b108842a83f91b3d216869f9fe3d6ac7ecea5256f2b437
+  data.tar.gz: da77f695902e5e921e598dd8d1327af4ce07ffe7b9cfadb88fe1b0889b95b4e0
 SHA512:
-  metadata.gz: bb5792606dd91f46b95fe786b509fd079697c87fd603c667e49740b365cafafa0cdc7b49a0a86c72cd014f9c2d88cdf74f096422e6099403042d8c34d35044b3
-  data.tar.gz: d7f2637649b474741b70dd9334e25107586fe52eb4e4f9a289453699f334488fed60322a676ad20fcab2f0c993785ccdef89be4397055028e75d79795766b972
+  metadata.gz: 36dbd8d33d74a5b985463df5fb514501c2881881bdd68f1fa479c7ecac3de2bc4a2bc3a713acfe735d3e53ccdde10f5abf5ecc066d370fa8e795a77e290f9988
+  data.tar.gz: b364c8d00de2f7ece58d3c721ef3d4f40a892a232aa39a0c94df2b7ef37cf86e78c99df25c07e8802b0e48640ec928c4157bd89a2cb0851955484ed5957733ca

data/TODO

@@ -1,4 +1,24 @@
 
+o In the following list is a command with a mandatory sub-command
+
+  list.tables!
+  list.uuids!
+
+  It should be rendered as
+    list tables|uuids
+
+  and not as
+    list tables
+    list uuids
+
+  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)
+o Macro that can be used in the SPEC for the program name (eg. <PROGRAM>)
 o Ignore all text after ' # ' (doesn't conflict with option flag)
 o Command aliases
 o Add user-defined setions

data/lib/shellopts/program.rb

@@ -194,33 +194,36 @@ module ShellOpts
 
     def __define_option_methods__
       @__grammar__.options.each { |opt|
-        if opt.argument? || opt.repeatable?
-          if opt.optional?
-            self.instance_eval %(
-              def #{opt.attr}(default = nil)
-                if @__option_values__.key?(:#{opt.attr}) 
-                  @__option_values__[:#{opt.attr}]
-                else
-                  default
-                end
+        if opt.argument?
+          self.instance_eval %(
+            def #{opt.attr}(default = nil)
+              if @__option_values__.key?(:#{opt.attr}) 
+                @__option_values__[:#{opt.attr}]
+              else
+                default
               end
-            )
-          elsif !opt.argument? # Repeatable w/o argument
-            self.instance_eval %(
-              def #{opt.attr}(default = []) 
-                if @__option_values__.key?(:#{opt.attr})
-                  @__option_values__[:#{opt.attr}]
-                else
-                  default
-                end
+            end
+          )
+
+        elsif opt.repeatable?
+          self.instance_eval %(
+            def #{opt.attr}(default = 0) 
+              if default > 0 && @__option_values__[:#{opt.attr}] == 0
+                default
+              else
+                @__option_values__[:#{opt.attr}]
               end
-            )
-          else
-            self.instance_eval("def #{opt.attr}() @__option_values__[:#{opt.attr}] end")
-          end
+            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")
       }
 

data/lib/shellopts/version.rb

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

metadata

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