shellopts 2.0.13 → 2.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dd7a731b489dbf650e15549d9768469ae9d6c47c6dba3ae79f4d956fea069ab
-  data.tar.gz: 4b71aff7ba350d4616a136580857a6acd840141ed0b7463034518dcf4ae4dada
+  metadata.gz: 256d4f5a28f8f4028030ac17631d4e93a36584b77c96cd8090ecab8dc393f36f
+  data.tar.gz: 381c0515800feb0a4d2327d336ed35c43e5441915cf6aef5cb4ebd365cbe8d39
 SHA512:
-  metadata.gz: bb5792606dd91f46b95fe786b509fd079697c87fd603c667e49740b365cafafa0cdc7b49a0a86c72cd014f9c2d88cdf74f096422e6099403042d8c34d35044b3
-  data.tar.gz: d7f2637649b474741b70dd9334e25107586fe52eb4e4f9a289453699f334488fed60322a676ad20fcab2f0c993785ccdef89be4397055028e75d79795766b972
+  metadata.gz: ac3af229c984160970034b5bbef21584bb5d78e6581f3efb2d4d9c10e9217ebde1e3cc248136224c4859d9a73ded08fc1a6782ebddb55a2d8eff1b5d480c42f9
+  data.tar.gz: 855d30fcd66f441a09ab53d50284a11e2a24bcd8c24b9c5573e1783c571005ab6b7a383aefbd0d9883893207550fe9bd880def44e361f000c87289a3476fe48f

data/TODO

@@ -1,4 +1,24 @@
+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!
+  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

@@ -101,10 +101,10 @@ module ShellOpts
     def to_h(*keys)
       keys = ::Kernel::Array(keys).flatten
       if keys.empty?
-        @__option_values__
+        self.to_h(@__grammar__.options.map(&:ident))
       else
         keys.map { |key|
-          @__option_values__.key?(key) ? [key, @__option_values__[key]] : nil
+          self.__send__("#{key}?".to_sym) ? [key, self.__send__(key)] : nil
         }.compact.to_h
       end
     end
@@ -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, repeated option with arguments have the
+    # array of values as value
     attr_reader :__option_values__
 
     # List of Option objects for the subcommand in the same order as
@@ -194,10 +194,23 @@ module ShellOpts
 
     def __define_option_methods__
       @__grammar__.options.each { |opt|
-        if opt.argument? || opt.repeatable?
-          if opt.optional?
+        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 = nil)
+              def #{opt.attr}(default = [])
                 if @__option_values__.key?(:#{opt.attr}) 
                   @__option_values__[:#{opt.attr}]
                 else
@@ -205,23 +218,41 @@ module ShellOpts
                 end
               end
             )
-          elsif !opt.argument? # Repeatable w/o argument
+          else
             self.instance_eval %(
-              def #{opt.attr}(default = []) 
-                if @__option_values__.key?(:#{opt.attr})
-                  @__option_values__[:#{opt.attr}]
-                else
+              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
             )
-          else
-            self.instance_eval("def #{opt.attr}() @__option_values__[:#{opt.attr}] end")
           end
-          self.instance_eval("def #{opt.attr}=(value) @__option_values__[:#{opt.attr}] = value end")
-          @__option_values__[opt.attr] = 0 if !opt.argument?
+
+        elsif opt.argument?
+          self.instance_eval %(
+            def #{opt.attr}(default = nil)
+              if @__option_values__.key?(:#{opt.attr}) 
+                @__option_values__[:#{opt.attr}]
+              else
+                default
+              end
+            end
+          )
+
+        else
+          self.instance_eval %(
+            def #{opt.attr}() 
+              @__option_values__.key?(:#{opt.attr}) 
+            end
+          )
         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.13"
+  VERSION = "2.0.16"
 end

metadata

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