Merge pull request #2 from seesharper/bugfix/help

Don't execute default step when help is invoked
seesharper · Mar 26, 2019 · 0ebcab0 · 0ebcab0
2 parents 4aaa4ff + b2ed3f0
commit 0ebcab0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/build/dotnet-steps.nuspec b/build/dotnet-steps.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>dotnet-steps</id>
     <title>dotnet-steps</title>
-    <version>0.0.1</version>
+    <version>0.0.2</version>
     <description>A small step for man kind, but a HUGE leap for build scripts.</description>
     <authors>Bernhard Richter</authors>
     <owners>Bernhard Richter</owners>

diff --git a/src/steps.csx b/src/steps.csx
@@ -125,6 +125,12 @@ private static class StepRunner
 
         var stepDelegates = GetStepDelegates();
 
+        if (stepNames.Contains("help", StringComparer.OrdinalIgnoreCase))
+        {
+            ShowHelp(stepDelegates.Values.ToArray());
+            return;
+        }
+
         if (stepDelegates.Keys.Intersect(stepNames).Count() == 0)
         {
             await GetDefaultDelegate(stepDelegates)();
@@ -134,11 +140,11 @@ private static class StepRunner
         {
             _callStack.Clear();
 
-            if (stepName.Equals("help", StringComparison.OrdinalIgnoreCase))
-            {
-                stepDelegates.Values.ToArray().ShowHelp();
-                continue;
-            }
+            // if (stepName.Equals("help", StringComparison.OrdinalIgnoreCase))
+            // {
+            //     stepDelegates.Values.ToArray().ShowHelp();
+            //     break;
+            // }
 
             if (stepDelegates.TryGetValue(stepName, out var stepDelegate))
             {

diff --git a/src/steps.tests.csx b/src/steps.tests.csx
@@ -44,6 +44,7 @@ public async Task ShouldShowHelp()
     TestContext.StandardOut.Should().Contain("Available Steps");
     TestContext.StandardOut.Should().Contain("This is step one");
     TestContext.StandardOut.Should().Contain("step1 (default)");
+    TestContext.StandardOut.Should().NotContain("Steps Summary");
 }
 
 public async Task ShouldReportNestedStep()