Properly display command usage when it has sub-commands and doesn't have arguments

Author: gustavothecoder

lib/dry/cli/usage.rb

@@ -31,15 +31,16 @@ def self.call(result)
       def self.commands_and_arguments(result)
         max_length = 0
         ret        = commands(result).each_with_object({}) do |(name, node), memo|
-          args = if node.command && node.leaf? && node.children?
-                   ROOT_COMMAND_WITH_SUBCOMMANDS_BANNER
-                 elsif node.leaf?
-                   arguments(node.command)
-                 else
-                   SUBCOMMAND_BANNER
-                 end
-
-          partial       = "  #{command_name(result, name)}#{args}"
+          args        = arguments(node.command)
+          args_banner = if node.command && node.leaf? && node.children? && args
+                          ROOT_COMMAND_WITH_SUBCOMMANDS_BANNER
+                        elsif node.leaf? && args
+                          args
+                        elsif node.children?
+                          SUBCOMMAND_BANNER
+                        end
+
+          partial       = "  #{command_name(result, name)}#{args_banner}"
           max_length    = partial.bytesize if max_length < partial.bytesize
           memo[partial] = node
         end

spec/support/fixtures/shared_commands.rb

@@ -438,6 +438,18 @@ def call(**params)
     end
   end
 
+  class Namespace < Dry::CLI::Command
+    desc "This is a namespace"
+
+    class SubCommand < Dry::CLI::Command
+      desc "I'm a concrete command"
+
+      def call(**params)
+        puts "I'm a concrete command"
+      end
+    end
+  end
+
   class InitializedCommand < Dry::CLI::Command
     attr_reader :prop
 

spec/support/fixtures/with_block.rb

@@ -22,6 +22,9 @@
   cli.register "root-command", Commands::RootCommand do |prefix|
     prefix.register "sub-command", Commands::RootCommands::SubCommand
   end
+  cli.register "namespace", Commands::Namespace do |prefix|
+    prefix.register "sub-command", Commands::Namespace::SubCommand
+  end
 
   cli.register "options-with-aliases",                Commands::OptionsWithAliases
   cli.register "variadic default",                    Commands::VariadicArguments

spec/support/fixtures/with_registry.rb

@@ -58,6 +58,8 @@ module Commands
       register "with-initializer", ::Commands::InitializedCommand.new(prop: "prop_val")
       register "root-command", ::Commands::RootCommand
       register "root-command sub-command", ::Commands::RootCommands::SubCommand
+      register "namespace", ::Commands::Namespace
+      register "namespace sub-command", ::Commands::Namespace::SubCommand
 
       register "options-with-aliases",                ::Commands::OptionsWithAliases
       register "variadic default",                    ::Commands::VariadicArguments

spec/support/fixtures/with_zero_arity_block.rb

@@ -23,6 +23,10 @@
   register "root-command" do
     register "sub-command", Commands::RootCommands::SubCommand
   end
+  register "namespace", Commands::Namespace
+  register "namespace" do
+    register "sub-command", Commands::Namespace::SubCommand
+  end
 
   register "options-with-aliases",                Commands::OptionsWithAliases
   register "variadic default",                    Commands::VariadicArguments

spec/support/shared_examples/rendering.rb

@@ -19,6 +19,7 @@
         #{cmd} greeting [RESPONSE]
         #{cmd} hello                                                   # Print a greeting
         #{cmd} inherited [SUBCOMMAND]
+        #{cmd} namespace [SUBCOMMAND]                                  # This is a namespace
         #{cmd} new PROJECT                                             # Generate a new Foo project
         #{cmd} options-with-aliases                                    # Accepts options with aliases
         #{cmd} root-command [ARGUMENT|SUBCOMMAND]                      # Root command with arguments and subcommands
@@ -80,6 +81,7 @@
         #{cmd} greeting [RESPONSE]
         #{cmd} hello                                                   # Print a greeting
         #{cmd} inherited [SUBCOMMAND]
+        #{cmd} namespace [SUBCOMMAND]                                  # This is a namespace
         #{cmd} new PROJECT                                             # Generate a new Foo project
         #{cmd} options-with-aliases                                    # Accepts options with aliases
         #{cmd} root-command [ARGUMENT|SUBCOMMAND]                      # Root command with arguments and subcommands
@@ -109,6 +111,7 @@
         #{cmd} greeting [RESPONSE]
         #{cmd} hello                                                   # Print a greeting
         #{cmd} inherited [SUBCOMMAND]
+        #{cmd} namespace [SUBCOMMAND]                                  # This is a namespace
         #{cmd} new PROJECT                                             # Generate a new Foo project
         #{cmd} options-with-aliases                                    # Accepts options with aliases
         #{cmd} root-command [ARGUMENT|SUBCOMMAND]                      # Root command with arguments and subcommands