From 02d27daeacac74785c2b0f4d1ce03d432377a36e Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Tue, 29 Dec 2020 23:29:54 -0400
Subject: Unified repository abstraction for Aedifex.

---
 stdlib/source/program/aedifex/command/deps.lux | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'stdlib/source/program/aedifex/command/deps.lux')

diff --git a/stdlib/source/program/aedifex/command/deps.lux b/stdlib/source/program/aedifex/command/deps.lux
index 315c6375c..71dffeec1 100644
--- a/stdlib/source/program/aedifex/command/deps.lux
+++ b/stdlib/source/program/aedifex/command/deps.lux
@@ -7,7 +7,9 @@
      ["." promise (#+ Promise)]]]
    [data
     [collection
-     ["." set (#+ Set)]]]
+     ["." set (#+ Set)]
+     ["." list ("#\." fold)]
+     ["." dictionary]]]
    [world
     [program (#+ Program)]
     ["." file]
@@ -20,16 +22,18 @@
     [repository (#+ Repository)]
     ["#" profile]
     ["#." action (#+ Action)]
-    ["#." cache]
     ["#." dependency #_
-     ["#/." resolution (#+ Resolution)]]]])
+     ["#/." resolution (#+ Resolution)]
+     ["#/." deployment]]]])
 
-(def: #export (do! program console fs repositories profile)
-  (-> (Program Promise) (Console Promise) (file.System Promise) (List (Repository Promise)) (Command Resolution))
+(def: #export (do! console local remotes profile)
+  (-> (Console Promise) (Repository Promise) (List (Repository Promise)) (Command Resolution))
   (do ///action.monad
     [#let [dependencies (set.to_list (get@ #///.dependencies profile))]
-     cache (///cache.read_all program fs dependencies ///dependency/resolution.empty)
-     resolution (///dependency/resolution.all repositories dependencies cache)
-     cached (///cache.write_all program fs resolution)
+     cache (///dependency/resolution.all (list local) dependencies ///dependency/resolution.empty)
+     resolution (///dependency/resolution.all remotes dependencies cache)
+     cached (|> (dictionary.keys cache)
+                (list\fold dictionary.remove resolution)
+                (///dependency/deployment.all local))
      _ (console.write_line //clean.success console)]
     (wrap resolution)))
-- 
cgit v1.2.3