shellopts 2.0.16 → 2.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 256d4f5a28f8f4028030ac17631d4e93a36584b77c96cd8090ecab8dc393f36f
-  data.tar.gz: 381c0515800feb0a4d2327d336ed35c43e5441915cf6aef5cb4ebd365cbe8d39
+  metadata.gz: ebd7911e579af4ddddd064399e7b456b45cef80dc3c6589e404ba5e32811bd6c
+  data.tar.gz: ea555ad68d0d6c43bad39a4e195e6661f72e1e43b6d3dbe647f4c8ff13d7eea3
 SHA512:
-  metadata.gz: ac3af229c984160970034b5bbef21584bb5d78e6581f3efb2d4d9c10e9217ebde1e3cc248136224c4859d9a73ded08fc1a6782ebddb55a2d8eff1b5d480c42f9
-  data.tar.gz: 855d30fcd66f441a09ab53d50284a11e2a24bcd8c24b9c5573e1783c571005ab6b7a383aefbd0d9883893207550fe9bd880def44e361f000c87289a3476fe48f
+  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/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__
@@ -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
@@ -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

data/lib/shellopts/version.rb

@@ -1,3 +1,3 @@
 module ShellOpts
-  VERSION = "2.0.16"
+  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.16
+  version: 2.0.17
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-11 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