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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f964195592d079499e1ac64d97966be5041cec718b12d7dbdcad3a13a78a987c
-  data.tar.gz: 19eb60e90e5d136ac43762f8c897b7f3b9d0197074e12c3a7237ad96230034e2
+  metadata.gz: cfc6870147f7e3d9460cfe07f349ada53c96554e6ea4c986561063526c465131
+  data.tar.gz: dc1abfb5043af486f5a80cc629583e5e87b9586478d5f51596e5bb5aec7b8b25
 SHA512:
-  metadata.gz: 85b055c56a7fd6c9752449275766126f57a51aa2a74e976246b62b25b4a7625cc858b794121d5443b03020cee8407cc00b4fdb79be1c3cbb8b7d738255d10dbf
-  data.tar.gz: 943acef312431e8176115bea9c3dcdbcef4960640eb409f391a731442b1098f7dbafb5562546c120e00f01524c4087d54b98cd505688923d5de3bcc3a18ff109
+  metadata.gz: 239d210f27002efb93e3e51d0bf649057d7f516bdd7e038b98d19aa03dce99993ef2a20fb1db27c9980c9fed4e73e7983c796e37cd7048de3203cbec6d54a11d
+  data.tar.gz: 6806b30859960dcc9d112811ceba66111d02a6d4002e1ebe4bb05a923efda14f492681549a3e74a81f0d8701c1fdbbb632f032320f64f1a5303958ed4de11eb0

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-beta1"
     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.beta1
 platform: ruby
 authors:
 - rngtng
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-20 00:00:00.000000000 Z
+date: 2022-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: completely