Merge pull request scriptcs#518 from per-samuelsson/issue/515

glennblock · glennblock · commit 3e79891ce0ce · 2013-11-25T14:41:40.000-08:00
Fixing scriptcs#515 - allowing non-script arguments to the CLI to be properly handled again
diff --git a/src/ScriptCs/Program.cs b/src/ScriptCs/Program.cs
@@ -31,21 +31,24 @@ private static int Main(string[] args)
 
             if (string.IsNullOrWhiteSpace(extension) && !commandArgs.Repl)
             {
+                // No extension was given, i.e we might have something like
+                // "scriptcs foo" to deal with. We activate the default extension,
+                // to make sure it's given to the LoadModules below.
                 extension = ".csx";
-                var scriptName = string.Format("{0}.csx", commandArgs.ScriptName);
 
-                if (!File.Exists(scriptName))
+                if (!string.IsNullOrWhiteSpace(commandArgs.ScriptName)) 
                 {
-                    console.WriteLine(string.Format(
-                        "Can't find a script named {0}",scriptName));
-
-                    return 1;
+                    // If the was in fact a script specified, we'll extend it
+                    // with the default extension, assuming the user giving
+                    // "scriptcs foo" actually meant "scriptcs foo.csx". We
+                    // perform no validation here thought; let it be done by
+                    // the activated command. If the file don't exist, it's
+                    // up to the command to detect and report.
+
+                    commandArgs.ScriptName += extension;
                 }
-
-                commandArgs.ScriptName = scriptName;
             }
             
-
             scriptServicesBuilder.LoadModules(extension, modules);
             var scriptServiceRoot = scriptServicesBuilder.Build();
 
diff --git a/test/ScriptCs.Tests/ArgumentHandlerTests.cs b/test/ScriptCs.Tests/ArgumentHandlerTests.cs
@@ -132,6 +132,20 @@ public void ShouldHandleCustomConfigFile()
                 result.ScriptArguments.ShouldEqual(new string[] { "-port", "8080" });
                 result.CommandArguments.Install.ShouldEqual("install test value");
             }
+
+            [Fact]
+            public void ShouldHandleHelp() 
+            {
+                string[] args = { "-help" };
+
+                var argumentHandler = Setup(null);
+                var result = argumentHandler.Parse(args);
+
+                result.ShouldNotBeNull();
+                result.Arguments.ShouldEqual(args);
+                result.CommandArguments.ScriptName.ShouldBeNull();
+                result.CommandArguments.Help.ShouldBeTrue();
+            }
         }
     }
 }
diff --git a/test/ScriptCs.Tests/ArgumentParserTests.cs b/test/ScriptCs.Tests/ArgumentParserTests.cs
@@ -45,6 +45,20 @@ public void ShouldHandleNull()
                 result.LogLevel.ShouldEqual(LogLevel.Info);
                 result.Config.ShouldEqual("scriptcs.opts");
             }
-        }         
+
+            [Fact]
+            public void ShouldSupportHelp() 
+            {
+                string[] args = { "-help" };
+
+                var parser = new ArgumentParser(new ScriptConsole());
+                var result = parser.Parse(args);
+
+                result.ShouldNotBeNull();
+                result.ScriptName.ShouldBeNull();
+                result.Help.ShouldBeTrue();
+                result.LogLevel.ShouldEqual(LogLevel.Info);
+            }
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,20 @@ public void ShouldHandleCustomConfigFile()`
`132`	`132`	`result.ScriptArguments.ShouldEqual(new string[] { "-port", "8080" });`
`133`	`133`	`result.CommandArguments.Install.ShouldEqual("install test value");`
`134`	`134`	`}`
	`135`	`+`
	`136`	`+ [Fact]`
	`137`	`+ public void ShouldHandleHelp()`
	`138`	`+ {`
	`139`	`+ string[] args = { "-help" };`
	`140`	`+`
	`141`	`+ var argumentHandler = Setup(null);`
	`142`	`+ var result = argumentHandler.Parse(args);`
	`143`	`+`
	`144`	`+ result.ShouldNotBeNull();`
	`145`	`+ result.Arguments.ShouldEqual(args);`
	`146`	`+ result.CommandArguments.ScriptName.ShouldBeNull();`
	`147`	`+ result.CommandArguments.Help.ShouldBeTrue();`
	`148`	`+ }`
`135`	`149`	`}`
`136`	`150`	`}`
`137`	`151`	`}`