Fixes #1412. Allow spaces in paths (#1424)

Author: jmgomez

src/nimblepkg/download.nim

@@ -17,19 +17,19 @@ type
 
 proc updateSubmodules(dir: string) =
   discard tryDoCmdEx(
-    &"git -C {dir} submodule update --init --recursive --depth 1")
+    &"git -C {dir.quoteShell} submodule update --init --recursive --depth 1")
 
 proc doCheckout*(meth: DownloadMethod, downloadDir, branch: string, options: Options) =
   case meth
   of DownloadMethod.git:
     # Force is used here because local changes may appear straight after a clone
     # has happened. Like in the case of git on Windows where it messes up the
     # damn line endings.
-    discard tryDoCmdEx(&"git -C {downloadDir} checkout --force {branch}")
+    discard tryDoCmdEx(&"git -C {downloadDir.quoteShell} checkout --force {branch}")
     if not options.ignoreSubmodules:
       downloadDir.updateSubmodules
   of DownloadMethod.hg:
-    discard tryDoCmdEx(&"hg --cwd {downloadDir} checkout {branch}")
+    discard tryDoCmdEx(&"hg --cwd {downloadDir.quoteShell} checkout {branch}")
 
 proc doClone(meth: DownloadMethod, url, downloadDir: string, branch = "",
              onlyTip = true, options: Options) =
@@ -41,14 +41,14 @@ proc doClone(meth: DownloadMethod, url, downloadDir: string, branch = "",
       branchArg = if branch == "": "" else: &"-b {branch}"
     discard tryDoCmdEx(
        "git clone --config core.autocrlf=false --config core.eol=lf " &
-      &"{submoduleFlag} {depthArg} {branchArg} {url} {downloadDir}")
+      &"{submoduleFlag} {depthArg} {branchArg} {url} {downloadDir.quoteShell}")
     if not options.ignoreSubmodules:
       downloadDir.updateSubmodules
   of DownloadMethod.hg:
     let
       tipArg = if onlyTip: "-r tip " else: ""
       branchArg = if branch == "": "" else: &"-b {branch}"
-    discard tryDoCmdEx(&"hg clone {tipArg} {branchArg} {url} {downloadDir}")
+    discard tryDoCmdEx(&"hg clone {tipArg} {branchArg} {url} {downloadDir.quoteShell}")
 
 proc gitFetchTags*(repoDir: string, downloadMethod: DownloadMethod, options: Options) =
   case downloadMethod:
@@ -157,12 +157,12 @@ proc cloneSpecificRevision(downloadMethod: DownloadMethod,
   of DownloadMethod.git:
     let downloadDir = downloadDir.quoteShell
     createDir(downloadDir)
-    discard tryDoCmdEx(&"git -C {downloadDir} init")
-    discard tryDoCmdEx(&"git -C {downloadDir} config core.autocrlf false")
-    discard tryDoCmdEx(&"git -C {downloadDir} remote add origin {url}")
+    discard tryDoCmdEx(&"git -C {downloadDir.quoteShell} init")
+    discard tryDoCmdEx(&"git -C {downloadDir.quoteShell} config core.autocrlf false")
+    discard tryDoCmdEx(&"git -C {downloadDir.quoteShell} remote add origin {url}")
     discard tryDoCmdEx(
-      &"git -C {downloadDir} fetch --depth 1 origin {vcsRevision}")
-    discard tryDoCmdEx(&"git -C {downloadDir} reset --hard FETCH_HEAD")
+      &"git -C {downloadDir.quoteShell} fetch --depth 1 origin {vcsRevision}")
+    discard tryDoCmdEx(&"git -C {downloadDir.quoteShell} reset --hard FETCH_HEAD")
     if not options.ignoreSubmodules:
       downloadDir.updateSubmodules
   of DownloadMethod.hg:
@@ -296,10 +296,10 @@ proc getTarCmdLine(downloadDir, filePath: string): string =
   when defined(Windows):
     let downloadDir = downloadDir.replace('\\', '/')
     let filePath = filePath.replace('\\', '/')
-    &"{getTarExePath()} -C {downloadDir} -xf {filePath} --strip-components 1 " &
+    &"{getTarExePath()} -C {downloadDir.quoteShell} -xf {filePath} --strip-components 1 " &
      "--force-local"
   else:
-    &"tar -C {downloadDir} -xf {filePath} --strip-components 1"
+    &"tar -C {downloadDir.quoteShell} -xf {filePath} --strip-components 1"
 
 proc doDownloadTarball(url, downloadDir, version: string, queryRevision: bool):
     Sha1Hash =

src/nimblepkg/publish.nim

@@ -252,7 +252,7 @@ proc vcsFindCommits*(repoDir, nimbleFile: string, downloadMethod: DownloadMethod
   var output: string
   case downloadMethod:
     of DownloadMethod.git:
-      output = tryDoCmdEx(&"git -C {repoDir} log --format=\"%H %s\" -- $2")
+      output = tryDoCmdEx(&"git -C {repoDir.quoteShell} log --format=\"%H %s\" -- $2")
     of DownloadMethod.hg:
       assert false, "hg not supported"
 
@@ -264,7 +264,7 @@ proc vcsFindCommits*(repoDir, nimbleFile: string, downloadMethod: DownloadMethod
 proc vcsDiff*(commit: Sha1Hash, repoDir, nimbleFile: string, downloadMethod: DownloadMethod): seq[string] =
   case downloadMethod:
     of DownloadMethod.git:
-      let (output, exitCode) = doCmdEx(&"git -C {repoDir} diff {commit}~ {commit} {nimbleFile}")
+      let (output, exitCode) = doCmdEx(&"git -C {repoDir.quoteShell} diff {commit}~ {commit} {nimbleFile}")
       if exitCode != QuitSuccess:
         return @[]
       else:
@@ -275,7 +275,7 @@ proc vcsDiff*(commit: Sha1Hash, repoDir, nimbleFile: string, downloadMethod: Dow
 proc createTag*(tag: string, commit: Sha1Hash, message, repoDir, nimbleFile: string, downloadMethod: DownloadMethod): bool =
   case downloadMethod:
     of DownloadMethod.git:
-      let (output, code) = doCmdEx(&"git -C {repoDir} tag -a {tag.quoteShell()} {commit} -m {message.quoteShell()}")
+      let (output, code) = doCmdEx(&"git -C {repoDir.quoteShell} tag -a {tag.quoteShell()} {commit} -m {message.quoteShell()}")
       result = code == QuitSuccess
       if not result:
         displayError(&"Failed to create tag {tag.quoteShell()} with error {output}")

tests/tissues.nim

@@ -414,4 +414,14 @@ suite "issues":
       check exitCode == QuitSuccess
       check output.contains(message)
     removeDir("testDir-1251")
+  
+  test "issue #1412. Should be able to install packages in a nimbleDir with spaces in the path":
+    cd "gitversions":
+      when defined(windows):
+        createDir("nimbledir spaces")
+        let (_, exitCode) = execNimble("install", "results", "--nimbleDir:nimbledir spaces")
+        check exitCode == QuitSuccess
+        removeDir("nimbledir spaces")
+      else:
+        discard