Merge pull request #95 from orien/help-after-command-argument

Use --help after command and argument

lib/commander/runner.rb

@@ -237,9 +237,18 @@ def active_command
     ##
     # Attempts to locate a command name from within the arguments.
     # Supports multi-word commands, using the largest possible match.
+    # Returns the default command, if no valid commands found in the args.
 
     def command_name_from_args
-      @__command_name_from_args ||= (valid_command_names_from(*@args.dup).sort.last || @default_command)
+      @__command_name_from_args ||= (longest_valid_command_name_from(@args) || @default_command)
+    end
+
+    ##
+    # Attempts to locate a command name from within the provided arguments.
+    # Supports multi-word commands, using the largest possible match.
+
+    private def longest_valid_command_name_from(args)
+      valid_command_names_from(*args.dup).max
     end
 
     ##
@@ -304,7 +313,7 @@ def create_default_commands
           if args.empty?
             say help_formatter.render
           else
-            command = command args.join(' ')
+            command = command(longest_valid_command_name_from(args))
             begin
               require_valid_command command
             rescue InvalidCommandError => e

spec/runner_spec.rb

@@ -484,6 +484,22 @@
       expect(run('test', '--help')).to eq("Implement help for test here\n")
     end
 
+    it 'can be used after the command and command arguments' do
+      expect(run('test', 'command-arg', '--help')).to eq("Implement help for test here\n")
+    end
+
+    it 'can be used before a single-word command with command arguments' do
+      expect(run('help', 'test', 'command-arg')).to eq("Implement help for test here\n")
+    end
+
+    it 'can be used before a multi-word command with command arguments' do
+      expect(
+        run('help', 'module', 'install', 'command-arg') do
+          command('module install') { |c| c.when_called { say 'whee!' } }
+        end
+      ).to eq("Implement help for module install here\n")
+    end
+
     describe 'help_paging program information' do
       it 'enables paging when enabled' do
         run('--help') { program :help_paging, true }