quote --configfile and added test

seesharper · seesharper · commit f5326117d1c3 · 2019-06-21T16:36:03.000+02:00
diff --git a/src/Dotnet.Script.DependencyModel/Context/DotnetRestorer.cs b/src/Dotnet.Script.DependencyModel/Context/DotnetRestorer.cs
@@ -46,7 +46,7 @@ string CreateConfigFileArgument()
             {
                 return string.IsNullOrWhiteSpace(projectFileInfo.NuGetConfigFile)
                     ? string.Empty
-                    : $"--configfile {projectFileInfo.NuGetConfigFile}";
+                    : $"--configfile \"{projectFileInfo.NuGetConfigFile}\"";
 
             }
         }
diff --git a/src/Dotnet.Script.Tests/ScriptExecutionTests.cs b/src/Dotnet.Script.Tests/ScriptExecutionTests.cs
@@ -391,7 +391,7 @@ public void ShouldHandleLocalNuGetConfigWithRelativePath()
 
             using (var packageLibraryFolder = new DisposableFolder())
             {
-                CreateTestPackage(packageLibraryFolder);
+                CreateTestPackage(packageLibraryFolder.Path);
 
                 string pathToScriptFile = CreateTestScript(packageLibraryFolder.Path);
 
@@ -407,7 +407,7 @@ public void ShouldHandleLocalNuGetConfigWithRelativePathInParentFolder()
 
             using (var packageLibraryFolder = new DisposableFolder())
             {
-                CreateTestPackage(packageLibraryFolder);
+                CreateTestPackage(packageLibraryFolder.Path);
 
                 var scriptFolder = Path.Combine(packageLibraryFolder.Path, "ScriptFolder");
                 Directory.CreateDirectory(scriptFolder);
@@ -418,6 +418,26 @@ public void ShouldHandleLocalNuGetConfigWithRelativePathInParentFolder()
             }
         }
 
+        [Fact]
+        public void ShouldHandleLocalNuGetFileWhenPathContainsSpace()
+        {
+            TestPathUtils.RemovePackageFromGlobalNugetCache("NuGetConfigTestLibrary");
+
+            using (var packageLibraryFolder = new DisposableFolder())
+            {
+                var packageLibraryFolderPath = Path.Combine(packageLibraryFolder.Path, "library folder");
+                Directory.CreateDirectory(packageLibraryFolderPath);
+
+                CreateTestPackage(packageLibraryFolderPath);
+
+                string pathToScriptFile = CreateTestScript(packageLibraryFolderPath);
+
+                var result = ScriptTestRunner.Default.Execute($"\"{pathToScriptFile}\"");
+                Assert.Contains("Success", result.output);
+            }
+        }
+
+
         private static string CreateTestScript(string scriptFolder)
         {
             string script = @"
@@ -429,11 +449,16 @@ private static string CreateTestScript(string scriptFolder)
             return pathToScriptFile;
         }
 
-        private static void CreateTestPackage(DisposableFolder packageLibraryFolder)
+        private static void CreateTestPackage(string packageLibraryFolder)
+        {
+            ProcessHelper.RunAndCaptureOutput("dotnet", "new classlib -n NuGetConfigTestLibrary", packageLibraryFolder);
+            var projectFolder = Path.Combine(packageLibraryFolder, "NuGetConfigTestLibrary");
+            ProcessHelper.RunAndCaptureOutput("dotnet", $"pack -o \"{Path.Combine(packageLibraryFolder, "packagePath")}\"", projectFolder);
+            CreateNuGetConfig(packageLibraryFolder);
+        }
+
+        private static void CreateNuGetConfig(string packageLibraryFolder)
         {
-            ProcessHelper.RunAndCaptureOutput("dotnet", "new classlib -n NuGetConfigTestLibrary", packageLibraryFolder.Path);
-            var projectFolder = Path.Combine(packageLibraryFolder.Path, "NuGetConfigTestLibrary");
-            ProcessHelper.RunAndCaptureOutput("dotnet", $"pack -o {Path.Combine(packageLibraryFolder.Path, "packagePath")}", projectFolder);
             string nugetConfig = @"
 <configuration>
     <packageSources>
@@ -442,7 +467,7 @@ private static void CreateTestPackage(DisposableFolder packageLibraryFolder)
     </packageSources>
 ></configuration>
                 ";
-            File.WriteAllText(Path.Combine(packageLibraryFolder.Path, "NuGet.Config"), nugetConfig);
+            File.WriteAllText(Path.Combine(packageLibraryFolder, "NuGet.Config"), nugetConfig);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ string CreateConfigFileArgument()`
`46`	`46`	`{`
`47`	`47`	`return string.IsNullOrWhiteSpace(projectFileInfo.NuGetConfigFile)`
`48`	`48`	`? string.Empty`
`49`		`- : $"--configfile {projectFileInfo.NuGetConfigFile}";`
	`49`	`+ : $"--configfile \"{projectFileInfo.NuGetConfigFile}\"";`
`50`	`50`
`51`	`51`	`}`
`52`	`52`	`}`