fix: update generated help to display [command] first then [options] (#308)

Should be:
  Usage: mytool [command] [options]
instead of:
  Usage: mytool [options] [command]

Having any options in front of the command verb fails, so the usage help should reflect this.

Author: AndreGleichner

src/CommandLineUtils/HelpText/DefaultHelpTextGenerator.cs

@@ -145,6 +145,11 @@ protected virtual void GenerateUsage(
                 output.Write(stack.Pop());
             }
 
+            if (visibleCommands.Any())
+            {
+                output.Write(" [command]");
+            }
+
             if (visibleOptions.Any())
             {
                 output.Write(" [options]");
@@ -157,11 +162,6 @@ protected virtual void GenerateUsage(
                 output.Write(">");
             }
 
-            if (visibleCommands.Any())
-            {
-                output.Write(" [command]");
-            }
-
             if (application.AllowArgumentSeparator)
             {
                 output.Write(" [[--] <arg>...]");

test/CommandLineUtils.Tests/CommandLineApplicationTests.cs

@@ -800,7 +800,7 @@ public void HelpOptionIsInherited(string helpOptionString)
                 outData = outWriter.ToString();
 
                 Assert.True(helpOption.HasValue());
-                Assert.Contains("Usage: lvl1 [options]", outData);
+                Assert.Contains("Usage: lvl1 [command] [options]", outData);
             }
         }
 

test/CommandLineUtils.Tests/HelpOptionAttributeTests.cs

@@ -181,9 +181,9 @@ public void HelpOptionIsInherited()
         [InlineData(new[] { "get", "--help" }, "Usage: updater get [options]")]
         [InlineData(new[] { "get", "-h" }, "Usage: updater get [options]")]
         [InlineData(new[] { "get", "-?" }, "Usage: updater get [options]")]
-        [InlineData(new[] { "--help" }, "Usage: updater [options] [command]")]
-        [InlineData(new[] { "-h" }, "Usage: updater [options] [command]")]
-        [InlineData(new[] { "-?" }, "Usage: updater [options] [command]")]
+        [InlineData(new[] { "--help" }, "Usage: updater [command] [options]")]
+        [InlineData(new[] { "-h" }, "Usage: updater [command] [options]")]
+        [InlineData(new[] { "-?" }, "Usage: updater [command] [options]")]
         public void NestedHelpOptionsChoosesHelpOptionNearestSelectedCommand(string[] args, string helpNeedle)
         {
             var sb = new StringBuilder();

test/CommandLineUtils.Tests/SubcommandAttributeTests.cs

@@ -140,7 +140,7 @@ public void HandlesHelp_Middle()
             };
             var rc = CommandLineApplication.Execute<MasterApp>(console, "level1", "--help");
             Assert.Equal(0, rc);
-            Assert.Contains("Usage: master level1 [options]", sb.ToString());
+            Assert.Contains("Usage: master level1 [command] [options]", sb.ToString());
         }
 
         [Fact]
@@ -154,7 +154,7 @@ public void HandlesHelp_Top()
             };
             var rc = CommandLineApplication.Execute<MasterApp>(console, "--help");
             Assert.Equal(0, rc);
-            Assert.Contains("Usage: master [options]", sb.ToString());
+            Assert.Contains("Usage: master [command] [options]", sb.ToString());
         }
 
         [Fact]