shellopts 2.0.19 → 2.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35b9e7b5699cc1a5637d4c00dd95c74047074f1227b0d05f9a9c8b04e1e2cc8b
-  data.tar.gz: c8deed23c8e6f0b26d080e15d2830edb5e65d1b5f2f821ccd83db7db27d7aefd
+  metadata.gz: 83e0ce72f27c72eec2087bee9296378fc0d84fc1124f830af27f21340cefffcc
+  data.tar.gz: 6c3b2363c1ca392b0950c792c48e353181f352ca22bfe16e7c42490248511b29
 SHA512:
-  metadata.gz: 5d3e96ec825ca58c0e653613ab84e2ede3e661737f5699571c81aaf9b2cb1252ea802581e5b981a1757d8a5a750ba998c43730c6d2da7d8228b721b06a45640e
-  data.tar.gz: e64eeac4c3bf784f8ef3a5e3a61c596e262bd23c4ee05857f76138f82ff2180afb72ccd5c2b7ffedc4e6aa2887b10c76e3a80c33e24ceadd20e71513549b5bf0
+  metadata.gz: dcc6e2271a451f494e007c78e9054c49bbb6f65f0f0fcf5be07158488157782c8216fc0f6fce7e4c25dda6bf0e39ac8ae2096f733cb4af7c4b1360b28a978129
+  data.tar.gz: e1d60f792447e5884f2ad939fbf408d5c053ef413328e2e2a42a082e34e9672537d8d64916fbc136f11797ac2c87894c148939d4feac9cc43489d3c66faa538d

data/TODO

@@ -1,3 +1,19 @@
+
+o Make opts[] point at the main object
+    opts[].subcommand is the direct subcommand of main
+o Make opts be the aggrated set of options in a subcommand
+    opts.subcommand is the concatenated path of subcommands
+o Make opts[:some_command] be the set of options for that subcommand (already done)
+o Sub-command options can overshadow options of outer commands but it is an
+  error to access them using opts. Use opts[] or opts[:some_command] instead
+
+o Add a default argument to extract:
+    def extract(range, *defaults)
+    end
+
+    extract(3..4, 'dbo')
+
+o More strict parsing of option and command lines
 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

data/lib/shellopts/program.rb

@@ -84,19 +84,27 @@ module ShellOpts
       }
     end
 
-    # Returns a hash of the given options if defined. Returns all options if no
-    # options are given
+    # Returns a hash from option ident to value
+    #
+    # The value depends on the option type: If it is not repeatable, the value
+    # is the argument or nil if not present (or allowed). If the option is
+    # repeatable and has an argument, the value is an array of the arguments,
+    # if it doesn't have an argument, the value is the number of occurrences
+    #
     def to_h(*keys)
       keys = ::Kernel::Array(keys).flatten
-      if keys.empty?
-        self.to_h(@__grammar__.options.map(&:ident))
-      else
-        keys.map { |key|
-          self.__send__("#{key}?".to_sym) ? [key, self.__send__(key)] : nil
-        }.compact.to_h
-      end
+      __option_values__.select { |key,_| keys.empty? || keys.include?(key) }
     end
 
+    # Like #to_h but present options without arguments have a true value
+    #
+    def to_h?(*keys)
+      keys = ::Kernel::Array(keys).flatten
+      keys = keys.empty? ? __option_values__.keys : keys
+      keys.filter_map { |key| __option_values__.key?(key) && [key, self.__send__(key)] }.to_h
+    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:
     #

data/lib/shellopts/version.rb

@@ -1,3 +1,3 @@
 module ShellOpts
-  VERSION = "2.0.19"
+  VERSION = "2.0.20"
 end

data/lib/shellopts.rb

@@ -382,7 +382,6 @@ module ShellOpts
     end
   end
 
-
   def self.process(spec, argv, quiet: nil, verbose: nil, debug: nil, **opts)
     constrain quiet, String, true, false, nil
     quiet = quiet.nil? ? Message.is_included? || Verbose.is_included? : quiet

metadata

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