Honor deps dir for 'atlas init --deps=deps'

src/atlas.nim

@@ -11,7 +11,7 @@
 
 import std / [parseopt, strutils, os, osproc, tables, sets, json, jsonutils]
 import versions, context, osutils, packagesjson, gitops, nimenv, lockfiles,
   depgraphs, confighandler, configutils, cloner, nimblechecksums, reporters,
   nimbleparser, pkgurls
 
 from std/terminal import isatty
@@ -382,7 +382,7 @@
           c.currentDir = getCurrentDir() / val
       of "deps":
         if val.len > 0:
-          c.depsDir = val
+          c.origDepsDir = val
           explicitDepsDirOverride = true
         else:
           writeHelp()
@@ -435,8 +435,8 @@
     elif action notin ["search", "list"]:
       fatal "No workspace found. Run `atlas init` if you want this current directory to be your workspace."
 
-  if not explicitDepsDirOverride and action notin ["init", "tag"] and c.depsDir.len == 0:
-    c.depsDir = c.workspace
+  if not explicitDepsDirOverride and action notin ["init", "tag"] and c.origDepsDir.len == 0:
+    c.origDepsDir = ""
   if action != "tag":
     createDir(c.depsDir)
 

src/confighandler.nim

@@ -52,7 +52,7 @@ type
     graph: JsonNode
 
 proc writeDefaultConfigFile*(c: var AtlasContext) =
-  let config = JsonConfig(resolver: $SemVer, graph: newJNull())
+  let config = JsonConfig(deps: c.origDepsDir, resolver: $SemVer, graph: newJNull())
   let configFile = c.workspace / AtlasWorkspace
   writeFile(configFile, pretty %*config)
 
@@ -67,9 +67,7 @@ proc readConfig*(c: var AtlasContext) =
   try:
     let m = j.to(JsonConfig)
     if m.deps.len > 0:
-      c.depsDir = m.deps
       c.origDepsDir = m.deps
-      #absoluteDepsDir(c.workspace, m.deps)
     if m.overrides.len > 0:
       c.overridesFile = m.overrides
       parseOverridesFile(c, m.overrides)

src/context.nim

@@ -40,19 +40,26 @@ type
     IgnoreUrls
 
   AtlasContext* = object of Reporter
-    projectDir*, workspace*, depsDir*, currentDir*: string
+    projectDir*, workspace*, origDepsDir*, currentDir*: string
     flags*: set[Flag]
     #urlMapping*: Table[string, Package] # name -> url mapping
     overrides*: Patterns
     defaultAlgo*: ResolutionAlgorithm
     plugins*: PluginInfo
     overridesFile*: string
     pluginsFile*: string
-    origDepsDir*: string
 
 
 proc `==`*(a, b: CfgPath): bool {.borrow.}
 
+proc depsDir*(c: AtlasContext): string =
+  if c.origDepsDir == "":
+    c.workspace
+  elif c.origDepsDir.isAbsolute:
+    c.origDepsDir
+  else:
+    (c.workspace / c.origDepsDir).absolutePath
+
 proc displayName(c: AtlasContext; p: string): string =
   if p == c.workspace:
     p.absolutePath

src/depgraphs.nim

@@ -271,8 +271,7 @@ proc pkgUrlToDirname(c: var AtlasContext; g: var DepGraph; d: Dependency): (stri
     if d.isTopLevel:
       dest = c.workspace
     else:
-      let depsDir = if d.isRoot: c.workspace else: c.depsDir
-      dest = depsDir / d.pkg.projectName
+      dest = c.depsDir / d.pkg.projectName
   result = (dest, if dirExists(dest): DoNothing else: DoClone)
 
 proc toDestDir*(g: DepGraph; d: Dependency): string =

tests/unittests.nim

@@ -30,7 +30,7 @@ let
 
 proc initBasicWorkspace(typ: type AtlasContext): AtlasContext =
   result.workspace = currentSourcePath().parentDir / "ws_basic"
-  result.depsDir = result.workspace
+  result.origDepsDir = result.workspace
 
 when false:
   suite "urls and naming":