shellopts 2.0.12 → 2.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2f378c7e7c04297221bfae81065ef06699e93b2dc4fda892b210ef4702c5836
-  data.tar.gz: f5d83b09b371aebd7cc07e73905edffb2f9f834ba5e382894277310e984e7ecc
+  metadata.gz: 253954c7f2de836c89e511dffabf3217719e778d47f74740a51c3b1099dcd07f
+  data.tar.gz: 4a5579e3c56674d09ba380d392e600028e6c353728994e8b2445629b772cb450
 SHA512:
-  metadata.gz: 6255a64a99ceefe0dc0a7a3195976d42b2db6b3a28d779cbeefbc9f36380e46a762939e2062ff9f32f4f78bd5bff8122606b5102d9d8473e86c0a742cd7db479
-  data.tar.gz: b54f74a5d8fd251d1492667bd8e1340c1f17a3e96936f423efd61e82fe665294936c1edd1ac9ac4ab9df118450ccefafcda117f84ef4e0726d78159196e075cf
+  metadata.gz: d0f0f0418361c69037a944c1e99021c32d578ed41dc239e7f9dc9f1ce94e578a137efdea3a9b96848fc0fb0b9aa1a8114153485b6ce21ceea7a3f34ceacdd197
+  data.tar.gz: f70644b23103d244fe06164a337839c042d6e65e1aa3dba59fa6b028cf7b0032fd694121c582142f2f3cdfbdaa12cba17464b74114bc5caf5b2aa489cde94f9a

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

@@ -45,12 +45,12 @@ module ShellOpts
 
     # These names can't be used as option or command names
     RESERVED_OPTION_NAMES = %w(
-        is_a instance_eval instance_exec method_missing singleton_method_added
+        is_a to_h instance_eval instance_exec method_missing singleton_method_added
         singleton_method_removed singleton_method_undefined
     )
 
-    # These methods can be overridden by an option or a command (the value is not used -
-    # this is just for informational purposes)
+    # These methods can be overridden by an option or a command (this constant
+    # is not used - it is just for informational purposes)
     OVERRIDEABLE_METHOD_NAMES = %w(
         subcommand subcommand! supercommand!
     )
@@ -96,6 +96,19 @@ module ShellOpts
       end
     end
       
+    # Returns a hash of the given options if defined. Returns all options if no
+    # options are given
+    def to_h(*keys)
+      keys = ::Kernel::Array(keys).flatten
+      if keys.empty?
+        @__option_values__
+      else
+        keys.map { |key|
+          @__option_values__.key?(key) ? [key, @__option_values__[key]] : nil
+        }.compact.to_h
+      end
+    end
+
     # Subcommand identifier or nil if not present. #subcommand is often used in
     # case statement to branch out to code that handles the given subcommand:
     #
@@ -140,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
@@ -181,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}(default = nil)
+              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
@@ -192,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.12"
+  VERSION = "2.0.15"
 end

metadata

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