Use quotes around output folder

seesharper · seesharper · commit 92bcc446798d · 2019-06-21T15:23:01.000+02:00
diff --git a/src/Dotnet.Script.Core/ScriptPublisher.cs b/src/Dotnet.Script.Core/ScriptPublisher.cs
@@ -85,7 +85,7 @@ public void CreateExecutable<TReturn, THost>(ScriptContext context, LogFactory l
 
             var commandRunner = new CommandRunner(logFactory);
             // todo: may want to add ability to return dotnet.exe errors
-            var exitcode = commandRunner.Execute("dotnet", $"publish \"{tempProjectPath}\" -c Release -r {runtimeIdentifier} -o {context.WorkingDirectory}");
+            var exitcode = commandRunner.Execute("dotnet", $"publish \"{tempProjectPath}\" -c Release -r {runtimeIdentifier} -o \"{context.WorkingDirectory}\"");
             if (exitcode != 0)
             {
                 throw new Exception($"dotnet publish failed with result '{exitcode}'");
diff --git a/src/Dotnet.Script.Tests/ScriptPublisherTests.cs b/src/Dotnet.Script.Tests/ScriptPublisherTests.cs
@@ -160,18 +160,20 @@ public void SimplePublishDllFromCurrentDirectoryTest()
         public void SimplePublishDllToOtherFolderTest()
         {
             using (var workspaceFolder = new DisposableFolder())
-            using (var publishFolder = new DisposableFolder())
             {
-                var code = @"WriteLine(""hello world"");";
-                var mainPath = Path.Combine(workspaceFolder.Path, "main.csx");
-                File.WriteAllText(mainPath, code);
-                var publishResult = ScriptTestRunner.Default.Execute($"publish {mainPath} --dll -o {publishFolder.Path}", workspaceFolder.Path);
-                Assert.Equal(0, publishResult.exitCode);
+                using (var publishFolder = new DisposableFolder())
+                {
+                    var code = @"WriteLine(""hello world"");";
+                    var mainPath = Path.Combine(workspaceFolder.Path, "main.csx");
+                    File.WriteAllText(mainPath, code);
+                    var publishResult = ScriptTestRunner.Default.Execute($"publish {mainPath} --dll -o {publishFolder.Path}", workspaceFolder.Path);
+                    Assert.Equal(0, publishResult.exitCode);
 
-                var dllPath = Path.Combine(publishFolder.Path, "main.dll");
-                var dllRunResult = ScriptTestRunner.Default.Execute($"exec {dllPath}", publishFolder.Path);
+                    var dllPath = Path.Combine(publishFolder.Path, "main.dll");
+                    var dllRunResult = ScriptTestRunner.Default.Execute($"exec {dllPath}", publishFolder.Path);
 
-                Assert.Equal(0, dllRunResult.exitCode);
+                    Assert.Equal(0, dllRunResult.exitCode);
+                }
             }
         }
 
@@ -219,7 +221,7 @@ public void ShouldHandleReferencingAssemblyFromScriptFolder()
         {
             using (var workspaceFolder = new DisposableFolder())
             {
-                ProcessHelper.RunAndCaptureOutput($"dotnet",$" new classlib -n MyCustomLibrary -o {workspaceFolder.Path}");
+                ProcessHelper.RunAndCaptureOutput($"dotnet", $" new classlib -n MyCustomLibrary -o {workspaceFolder.Path}");
                 ProcessHelper.RunAndCaptureOutput($"dotnet", $" build -o {workspaceFolder.Path}", workspaceFolder.Path);
                 var code = $@"#r ""MyCustomLibrary.dll"" {Environment.NewLine} WriteLine(""hello world"");";
                 var mainPath = Path.Combine(workspaceFolder.Path, "main.csx");
@@ -231,6 +233,27 @@ public void ShouldHandleReferencingAssemblyFromScriptFolder()
             }
         }
 
+        [Fact]
+        public void ShouldHandleSpaceInPublishFolder()
+        {
+            using (var workspaceFolder = new DisposableFolder())
+            {
+                var code = @"WriteLine(""hello world"");";
+                var mainPath = Path.Combine(workspaceFolder.Path, "main.csx");
+                File.WriteAllText(mainPath, code);
+
+                var publishResult = ScriptTestRunner.Default.Execute(@"publish main.csx -o ""publish folder""", workspaceFolder.Path);
+
+                Assert.Equal(0, publishResult.exitCode);
+
+                var exePath = Path.Combine(workspaceFolder.Path, "publish folder", "script");
+                var executableRunResult = _commandRunner.Execute(exePath);
+
+                Assert.Equal(0, executableRunResult);
+            }
+        }
+
+
         private LogFactory GetLogFactory()
         {
             return TestOutputHelper.CreateTestLogFactory();

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public void CreateExecutable<TReturn, THost>(ScriptContext context, LogFactory l`
`85`	`85`
`86`	`86`	`var commandRunner = new CommandRunner(logFactory);`
`87`	`87`	`// todo: may want to add ability to return dotnet.exe errors`
`88`		`- var exitcode = commandRunner.Execute("dotnet", $"publish \"{tempProjectPath}\" -c Release -r {runtimeIdentifier} -o {context.WorkingDirectory}");`
	`88`	`+ var exitcode = commandRunner.Execute("dotnet", $"publish \"{tempProjectPath}\" -c Release -r {runtimeIdentifier} -o \"{context.WorkingDirectory}\"");`
`89`	`89`	`if (exitcode != 0)`
`90`	`90`	`{`
`91`	`91`	`throw new Exception($"dotnet publish failed with result '{exitcode}'");`