Handle initial help argument when applied to subcommand methods

CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 9.3.1 - 2023-05-12
+
+## Changed
+
+* Previously, when help was requested on a subcommand method,
+  the output was of listing all subcommand methods.
+  Now, the output is now the help for that specific method.
+
 ## 9.2.0 - 2023-03-01
 
 ## Changed

lib/imap/backup/cli.rb

@@ -22,6 +22,21 @@ class CLI < Thor
 
     default_task :backup
 
+    def self.start(*args)
+      # By default, commands like `imap-backup help foo bar`
+      # are handled by listing all `foo` methods, whereas the user
+      # probably wants the detailed help for the `bar` method.
+      # Move initial "help" argument to after any subcommand,
+      # so we get help for the requested subcommand method.
+      first_argument_is_help = ARGV[0] == "help"
+      second_argument_is_subcommand = subcommands.include?(ARGV[1])
+      if first_argument_is_help && second_argument_is_subcommand
+        help, subcommand = ARGV.shift(2)
+        ARGV.unshift(subcommand, help)
+      end
+      super
+    end
+
     def self.exit_on_failure?
       true
     end

lib/imap/backup/version.rb

@@ -3,7 +3,7 @@ module Imap; end
 module Imap::Backup
   MAJOR    = 9
   MINOR    = 3
-  REVISION = 0
+  REVISION = 1
   PRE      = nil
   VERSION  = [MAJOR, MINOR, REVISION, PRE].compact.map(&:to_s).join(".")
 end

spec/features/help_spec.rb

@@ -0,0 +1,11 @@
+require "features/helper"
+
+RSpec.describe "imap-backup help", type: :aruba do
+  context "when subcommands are invoked with a method" do
+    it "outputs the method's help" do
+      run_command_and_stop "imap-backup help remote namespaces"
+
+      expect(last_command_started).to have_output(/Options:/)
+    end
+  end
+end