applied my own feedback

filipw · filipw · commit fd99e2c2ce33 · 2015-03-06T12:56:29.000+01:00
diff --git a/src/ScriptCs.Contracts/IRepl.cs b/src/ScriptCs.Contracts/IRepl.cs
@@ -7,7 +7,5 @@ public interface IRepl : IScriptExecutor
         Dictionary<string, IReplCommand> Commands { get; }
 
         string Buffer { get; }
-
-        void Quit();
     }
 }
diff --git a/src/ScriptCs.Core/Repl.cs b/src/ScriptCs.Core/Repl.cs
@@ -170,12 +170,6 @@ public override ScriptResult Execute(string script, params string[] scriptArgs)
             }
         }
 
-        public void Quit()
-        {
-            Terminate();
-            Environment.Exit(0);
-        }
-
         private static string GetInvalidCommandArgumentMessage(string argument)
         {
             return string.Format(CultureInfo.InvariantCulture, "Argument is not a valid expression: {0}", argument);
diff --git a/src/ScriptCs.Core/ReplCommands/ExitCommand.cs b/src/ScriptCs.Core/ReplCommands/ExitCommand.cs
@@ -29,13 +29,13 @@ public object Execute(IRepl repl, object[] args)
             while (!responseIsValid)
             {
                 _console.Write("Are you sure you wish to exit? (y/n): ");
-                response = _console.ReadLine() ?? string.Empty;
+                response = (_console.ReadLine() ?? string.Empty).ToLowerInvariant();
                 responseIsValid = response == "y" || response == "n";
             }
 
             if (response == "y")
             {
-                repl.Quit();
+                repl.Terminate();
             }
 
             return null;
diff --git a/src/ScriptCs.Hosting/ScriptConsole.cs b/src/ScriptCs.Hosting/ScriptConsole.cs
@@ -39,6 +39,7 @@ public void Exit()
         {
             ResetColor();
             Console.CancelKeyPress -= HandleCancelKeyPress;
+            Environment.Exit(0);
         }
 
         public void ResetColor()
diff --git a/src/ScriptCs/Program.cs b/src/ScriptCs/Program.cs
@@ -29,10 +29,6 @@ private static int Main(string[] args)
                 console.WriteLine(usage);
                 return 1;
             }
-            finally
-            {
-                console.Exit();
-            }
 
             var scriptServicesBuilder = ScriptServicesBuilderFactory.Create(arguments.CommandArguments, arguments.ScriptArguments);
             var factory = new CommandFactory(scriptServicesBuilder);
diff --git a/test/ScriptCs.Core.Tests/ReplCommands/ExitCommandTests.cs b/test/ScriptCs.Core.Tests/ReplCommands/ExitCommandTests.cs
@@ -53,7 +53,7 @@ public void ExitsWhenUserAnswersYes()
                 cmd.Execute(executor.Object, null);
 
                 // assert
-                executor.Verify(x => x.Quit());
+                executor.Verify(x => x.Terminate());
             }
 
             [Fact]
@@ -70,7 +70,7 @@ public void DoesNotExitWhenUserAnswersNo()
                 cmd.Execute(executor.Object, null);
 
                 // assert
-                executor.Verify(x => x.Quit(), Times.Never);
+                executor.Verify(x => x.Terminate(), Times.Never);
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,5 @@ public interface IRepl : IScriptExecutor`
`7`	`7`	`Dictionary<string, IReplCommand> Commands { get; }`
`8`	`8`
`9`	`9`	`string Buffer { get; }`
`10`		`-`
`11`		`- void Quit();`
`12`	`10`	`}`
`13`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -170,12 +170,6 @@ public override ScriptResult Execute(string script, params string[] scriptArgs)`
`170`	`170`	`}`
`171`	`171`	`}`
`172`	`172`
`173`		`- public void Quit()`
`174`		`- {`
`175`		`- Terminate();`
`176`		`- Environment.Exit(0);`
`177`		`- }`
`178`		`-`
`179`	`173`	`private static string GetInvalidCommandArgumentMessage(string argument)`
`180`	`174`	`{`
`181`	`175`	`return string.Format(CultureInfo.InvariantCulture, "Argument is not a valid expression: {0}", argument);`
Original file line number	Diff line number	Diff line change
`@@ -29,13 +29,13 @@ public object Execute(IRepl repl, object[] args)`
`29`	`29`	`while (!responseIsValid)`
`30`	`30`	`{`
`31`	`31`	`_console.Write("Are you sure you wish to exit? (y/n): ");`
`32`		`- response = _console.ReadLine() ?? string.Empty;`
	`32`	`+ response = (_console.ReadLine() ?? string.Empty).ToLowerInvariant();`
`33`	`33`	`responseIsValid = response == "y" \|\| response == "n";`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`if (response == "y")`
`37`	`37`	`{`
`38`		`- repl.Quit();`
	`38`	`+ repl.Terminate();`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ public void Exit()`
`39`	`39`	`{`
`40`	`40`	`ResetColor();`
`41`	`41`	`Console.CancelKeyPress -= HandleCancelKeyPress;`
	`42`	`+ Environment.Exit(0);`
`42`	`43`	`}`
`43`	`44`
`44`	`45`	`public void ResetColor()`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public void ExitsWhenUserAnswersYes()`
`53`	`53`	`cmd.Execute(executor.Object, null);`
`54`	`54`
`55`	`55`	`// assert`
`56`		`- executor.Verify(x => x.Quit());`
	`56`	`+ executor.Verify(x => x.Terminate());`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`[Fact]`
`@@ -70,7 +70,7 @@ public void DoesNotExitWhenUserAnswersNo()`
`70`	`70`	`cmd.Execute(executor.Object, null);`
`71`	`71`
`72`	`72`	`// assert`
`73`		`- executor.Verify(x => x.Quit(), Times.Never);`
	`73`	`+ executor.Verify(x => x.Terminate(), Times.Never);`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`	`}`