shellopts 2.0.14 → 2.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2101f633ad0e166982b108842a83f91b3d216869f9fe3d6ac7ecea5256f2b437
-  data.tar.gz: da77f695902e5e921e598dd8d1327af4ce07ffe7b9cfadb88fe1b0889b95b4e0
+  metadata.gz: ebd7911e579af4ddddd064399e7b456b45cef80dc3c6589e404ba5e32811bd6c
+  data.tar.gz: ea555ad68d0d6c43bad39a4e195e6661f72e1e43b6d3dbe647f4c8ff13d7eea3
 SHA512:
-  metadata.gz: 36dbd8d33d74a5b985463df5fb514501c2881881bdd68f1fa479c7ecac3de2bc4a2bc3a713acfe735d3e53ccdde10f5abf5ecc066d370fa8e795a77e290f9988
-  data.tar.gz: b364c8d00de2f7ece58d3c721ef3d4f40a892a232aa39a0c94df2b7ef37cf86e78c99df25c07e8802b0e48640ec928c4157bd89a2cb0851955484ed5957733ca
+  metadata.gz: 453d3bd1e4354a56947623232f1fabcdc8d212a91d317ce16026c356c71c77ab53031e4e42d05242d0c04ce309ccd69fd75386d3d40705feac461f58d6a2c86b
+  data.tar.gz: 282655ab16154e1b50c25b6ddf8a07196a296f8a2bad4086cd78b8962a9003c22e1fb8dfbe2e339fc97973fef95b1cf9965a829bab23b2ad98f63df1aef8c009

data/PROBLEMS

@@ -0,0 +1,41 @@
+
+# Subcommand options are not recognized unless there exists an option on the
+# program level (try to remove -a below)
+
+SPEC = %(
+  Foreign data wrapper maintenance tool
+
+  -a,an-option
+    Gryf
+
+  list.servers! -- DATABASE
+    List foreign servers
+
+  create.server! -- DATABASE FDW-SERVER MSSQL-DATABASE [MSSQL-HOST [MSSQL-PORT]]
+    Create a new FDW server
+
+    -c,credentials=EFILE
+      Credentials file. The credentials file is a YAML formatted file that can
+      define the fields 'user', 'password', 'host', and 'port'
+
+  drop.server! -- DATABASE FDW-SERVER
+    Drop a FDW server. This cascades to FDW users too
+
+  list.users! -- DATABASE
+    List FDW users. 'users' in this context is postgres users that have an
+    associated FDW user mapping
+
+    --servers @ Also list the user's FDW servers
+
+  create.user! -- DATABASE FDW-SERVER [FDW-USER [FDW-PASSWORD]]
+    Create a FDW user. The user has to exist beforehand, this command only adds
+    a user mapping to the user and grants the usage privilege
+
+    -c,credentials=EFILE
+      Credentials file
+
+  drop.user! -- DATABASE FDW-USER
+    Drops a FDW user. The postgres user is not dropped but the user's user
+    mapping and grants are
+)
+

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/ext/follow.rb

@@ -0,0 +1,26 @@
+
+module Algorithm
+  class FollowEnumerator < Enumerator
+    def initialize(object, method = nil, &block)
+      closure = method ? lambda { |object| object.__send__(method) } : block
+      super() { |yielder|
+        while object
+          yielder << object
+          object = closure.call(object)
+        end
+      }
+    end
+  end
+
+  def follow(object, method = nil, &block)
+    !method.nil? || block_given? or raise ArgumentError, "Needs either a method or a block"
+    method.nil? == block_given? or raise ArgumentError, "Can't use both method and block"
+    FollowEnumerator.new(object, method, &block)
+  end
+
+  module_function :follow
+end
+
+
+
+

data/lib/shellopts/program.rb

@@ -52,7 +52,7 @@ module ShellOpts
     # 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!
+        subcommand subcommand! subcommands subcommands! supercommand!
     )
 
     # Redefine ::new to call #__initialize__
@@ -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
@@ -133,6 +133,13 @@ module ShellOpts
     #
     def subcommand!() __subcommand__! end
 
+    # Returns the concatenated identifier of subcommands (eg. :cmd.subcmd!)
+    def subcommands() __subcommands__ end
+
+    # Returns the subcommands in an array. This doesn't include the top-level
+    # program object
+    def subcommands!() __subcommands__! end
+
     # The parent command or nil. Initialized by #add_command
     #
     # Note: Can be overridden by a subcommand declaration (but not an
@@ -153,10 +160,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
@@ -180,6 +187,16 @@ module ShellOpts
     # The actual subcommand object or nil if not present
     def __subcommand__!() @__subcommand__ end
 
+    # Implementation of the #subcommands method
+    def __subcommands__()
+      __subcommands__!.last&.__uid__&.to_sym
+    end
+
+    # Implementation of the #subcommands! method
+    def __subcommands__!()
+      ::Algorithm.follow(self.__subcommand__!, :__subcommand__!).to_a
+    end
+
   private
     def __initialize__(grammar)
       @__grammar__ = grammar
@@ -194,7 +211,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 +263,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.17"
 end

data/lib/shellopts.rb

@@ -5,6 +5,7 @@ require 'constrain'
 include Constrain
 
 require 'ext/array.rb'
+require 'ext/follow.rb'
 require 'ext/forward_to.rb'
 require 'ext/lcs.rb'
 include ForwardTo

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shellopts
 version: !ruby/object:Gem::Version
-  version: 2.0.14
+  version: 2.0.17
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-05 00:00:00.000000000 Z
+date: 2022-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: forward_to
@@ -135,6 +135,7 @@ files:
 - ".rspec"
 - ".ruby-version"
 - Gemfile
+- PROBLEMS
 - README.md
 - Rakefile
 - TODO
@@ -147,6 +148,7 @@ files:
 - doc/syntax.rb
 - doc/syntax.txt
 - lib/ext/array.rb
+- lib/ext/follow.rb
 - lib/ext/forward_to.rb
 - lib/ext/lcs.rb
 - lib/shellopts.rb