dry-cli-completion 0.9.0.pre.alpha → 1.0.0.pre.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f964195592d079499e1ac64d97966be5041cec718b12d7dbdcad3a13a78a987c
-  data.tar.gz: 19eb60e90e5d136ac43762f8c897b7f3b9d0197074e12c3a7237ad96230034e2
+  metadata.gz: 84584d0b8311a6a0608e830090cedb404ab30c92901a21cefff324a9f6ba5119
+  data.tar.gz: ed55444a593eb3811a25f6cc2a0dacc94d1accc06384928846f6d2973aa469e7
 SHA512:
-  metadata.gz: 85b055c56a7fd6c9752449275766126f57a51aa2a74e976246b62b25b4a7625cc858b794121d5443b03020cee8407cc00b4fdb79be1c3cbb8b7d738255d10dbf
-  data.tar.gz: 943acef312431e8176115bea9c3dcdbcef4960640eb409f391a731442b1098f7dbafb5562546c120e00f01524c4087d54b98cd505688923d5de3bcc3a18ff109
+  metadata.gz: 1188fe5ea0da8bbc42bec08198126558cd2657c422d1a16ac5cf4c08f974a43148bc6f56e13906687d35ae94664ae4994bede0c3609b7dc048f03f4c5c614e2e
+  data.tar.gz: 5e7d91437507f85aff8b94d38e98c93bb5e5a2d28055427e1598504e330591d0c8a15c6b1c885f5ceef6faaf09444645662eddf971992c8cfbdd3d37dd89b6c3

data/CHANGELOG.md

@@ -1,5 +1,7 @@
 # CHANGELOG
 
+## 1.0.0-beta Add support for subcommands
+
 ## 0.9.0-alpha First full fledged Implementation
 
 ## 0.3.0 Inital Skeleton

data/README.md

@@ -38,14 +38,20 @@ Simplest usage is to drop in the `Dry::CLI::Completion::Command` to your existin
 module MyRegistry
   extend Dry::CLI::Registry
 
-   register "cmd1", MyCmd1
-   #....
+  register "cmd1", MyCmd1
+  #....
 
-   register "completion", Dry::CLI::Completion::Command[self]
-  end
+  register "completion", Dry::CLI::Completion::Command[self]
 end
 ```
 
+or extend the registry subsequently:
+
+```ruby
+#....
+MyRegistry.register("completion", Dry::CLI::Completion::Command[MyRegistry])
+```
+
 This will extend your cli for a new command `completion` with following usage:
 
 ```sh
@@ -105,7 +111,7 @@ The gem comes with a full-fledged rspec testsuite. To execute all tests run in d
     $ rspec
 
 ### Manual Testing
-The foo registry is used in unit test is available as `spec/foo-cli` for manual testing. First source the comepltion script:
+The `Foo::CLI::Command` registry used in unit test is available as `spec/foo-cli` for manual testing. First source the completion script:
 
     $ source <(spec/foo-cli completion bash)
 

data/dry-cli-completion.gemspec

@@ -25,5 +25,5 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.7.6"
 
-  spec.add_dependency "completely", "~> 0.4"
+  spec.add_dependency "completely", "~> 0.5"
 end

data/lib/dry/cli/completion/command.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require "dry/cli/completion"
-
 module Dry
   class CLI
     module Completion
+      require "dry/cli/completion"
+
       class Command < Dry::CLI::Command
         desc "Print tab completion script for given shell"
 

data/lib/dry/cli/completion/generator.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
-require_relative "input"
 require "completely"
 
 module Dry
   class CLI
     module Completion
       class Generator
+        require_relative "input"
+
         def initialize(registry, program_name: nil)
           @registry = registry
           @program_name = program_name || Dry::CLI::ProgramName.call

data/lib/dry/cli/completion/input.rb

@@ -10,23 +10,36 @@ module Dry
         end
 
         def call(include_aliases:)
-          nodes = root_node.children.dup
-          nodes.merge!(root_node.aliases.dup) if include_aliases
-
-          commands = nodes.each_with_object({}) do |(name, sub_node), hash|
-            next unless sub_node.command
-            hash[name] = command(sub_node.command, include_aliases: include_aliases)
-          end
-
+          commands = extract_commands(root_node, include_aliases: include_aliases)
           commands.each_with_object({
-            @program_name => commands.keys + ["help"]
+            @program_name => commands.keys.map(&:first).uniq + ["help"]
           }) do |(name, config), input|
-            input_line(input, "#{@program_name} #{name}", config[:arguments].shift, config)
+            input_line(input, "#{@program_name} #{name.join(" ")}", config[:arguments].shift, config)
           end
         end
 
         private
 
+        def extract_commands(parent_node, include_aliases:, prefix: [])
+          nodes = parent_node.children.dup
+          nodes.merge!(parent_node.aliases.dup) if include_aliases
+
+          nodes.each_with_object({}) do |(name, sub_node), hash|
+            key = prefix.dup << name
+            hash[key] = if sub_node.command
+              command(sub_node.command, include_aliases: include_aliases)
+            elsif sub_node.children
+              hash.merge!(extract_commands(sub_node, include_aliases: include_aliases, prefix: key))
+              {
+                options: {},
+                arguments: [
+                  ["subcommands", sub_node.children.keys]
+                ]
+              }
+            end
+          end
+        end
+
         def root_node
           @registry.get({}).instance_variable_get(:@node)
         end

data/lib/dry/cli/completion/version.rb

@@ -3,7 +3,7 @@
 module Dry
   class CLI
     module Completion
-      VERSION = "0.9.0-alpha"
+      VERSION = "1.0.0-beta2"
     end
   end
 end

data/lib/dry/cli/completion.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative "completion/version"
-require_relative "completion/generator"
-
 module Dry
   class CLI
     module Completion
+      require_relative "completion/version"
+      require_relative "completion/generator"
+
       SUPPORTED_SHELLS = [
         BASH = "bash",
         ZSH = "zsh"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-cli-completion
 version: !ruby/object:Gem::Version
-  version: 0.9.0.pre.alpha
+  version: 1.0.0.pre.beta2
 platform: ruby
 authors:
 - rngtng
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-20 00:00:00.000000000 Z
+date: 2022-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: completely
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
 description: Extension Command for Dry::CLI which generates a completion script for
   bash/zsh.
 email: