Better snapshot deployments for Aedifex.

1 files changed, 66 insertions, 63 deletions

diff --git a/stdlib/source/program/aedifex.lux b/stdlib/source/program/aedifex.lux
index a86e634a2..0c04ff7bb 100644
--- a/stdlib/source/program/aedifex.lux
+++ b/stdlib/source/program/aedifex.lux
@@ -1,6 +1,6 @@
 (.using
  [library
-  [lux "*"
+  [lux {"-" local}
    [program {"+" program:}]
    ["[0]" debug]
    [abstract
@@ -146,6 +146,10 @@
               (maybe.trusted (text.clip 0 (-- (text.size it)) it))
               it)))))
 
+(def: program (program.async program.default))
+(def: fs (file.async file.default))
+(def: local (/repository/local.repository ..program ..fs))
+
 (program: [[profiles operation] /cli.command]
   (do [! io.monad]
     [console (# ! each (|>> (try.else ..write_only) console.async)
@@ -163,68 +167,67 @@
           (..fail! error)
 
           {try.#Success profile}
-          (let [program (program.async program.default)]
-            (case operation
-              {/cli.#Version}
-              (in [])
-              
-              {/cli.#Clean}
-              (..command
-               (/command/clean.do! console (file.async file.default) profile))
-
-              {/cli.#POM}
-              (..command
-               (/command/pom.do! console (file.async file.default) profile))
-              
-              {/cli.#Install}
-              (..command
-               (let [fs (file.async file.default)]
-                 (/command/install.do! console fs (/repository/local.repository program fs) profile)))
-
-              {/cli.#Deploy repository identity}
-              (..command
-               (case (the /.#identity profile)
-                 {.#Some artifact}
-                 (case (dictionary.value repository (the /.#deploy_repositories profile))
-                   {.#Some repository}
-                   (/command/deploy.do! console
-                                        (/repository.async (/repository/remote.repository http.default {.#Some identity} repository))
-                                        (file.async file.default)
-                                        artifact
-                                        profile)
-                   
-                   {.#None}
-                   (async#in (exception.except ..cannot_find_repository [repository (the /.#deploy_repositories profile)])))
+          (case operation
+            {/cli.#Version}
+            (in [])
+            
+            {/cli.#Clean}
+            (..command
+             (/command/clean.do! console (file.async file.default) profile))
+
+            {/cli.#POM}
+            (..command
+             (/command/pom.do! console (file.async file.default) profile))
+            
+            {/cli.#Install}
+            (..command
+             (/command/install.do! console ..fs ..local profile))
+
+            {/cli.#Deploy repository identity}
+            (..command
+             (case (the /.#identity profile)
+               {.#Some artifact}
+               (case (dictionary.value repository (the /.#deploy_repositories profile))
+                 {.#Some remote}
+                 (/command/deploy.do! console
+                                      ..local
+                                      (/repository.async (/repository/remote.repository http.default {.#Some identity} remote))
+                                      (file.async file.default)
+                                      artifact
+                                      profile)
                  
                  {.#None}
-                 (async#in (exception.except /.no_identity []))))
-              
-              {/cli.#Dependencies}
-              (..command
-               (/command/deps.do! console
-                                  (/repository/local.repository program (file.async file.default))
-                                  (..repositories profile)
-                                  (|>> (/repository/remote.repository http.default {.#None})
-                                       /repository.async)
-                                  profile))
-
-              {/cli.#Compilation compilation}
-              (case compilation
-                {/cli.#Build} (..command
-                               (..with_dependencies program console /command/build.do! profile))
-                {/cli.#Test} (..command
-                              (..with_dependencies program console /command/test.do! profile)))
-
-              {/cli.#Auto auto}
-              (do !
-                [?watcher watch.default]
-                (case ?watcher
-                  {try.#Failure error}
-                  (..fail! error)
-                  
-                  {try.#Success watcher}
-                  (..command
-                   (case auto
-                     {/cli.#Build} (..with_dependencies program console (/command/auto.do! /command/auto.delay watcher /command/build.do!) profile)
-                     {/cli.#Test} (..with_dependencies program console (/command/auto.do! /command/auto.delay watcher /command/test.do!) profile)))))))
+                 (async#in (exception.except ..cannot_find_repository [repository (the /.#deploy_repositories profile)])))
+               
+               {.#None}
+               (async#in (exception.except /.no_identity []))))
+            
+            {/cli.#Dependencies}
+            (..command
+             (/command/deps.do! console
+                                (/repository/local.repository ..program (file.async file.default))
+                                (..repositories profile)
+                                (|>> (/repository/remote.repository http.default {.#None})
+                                     /repository.async)
+                                profile))
+
+            {/cli.#Compilation compilation}
+            (case compilation
+              {/cli.#Build} (..command
+                             (..with_dependencies ..program console /command/build.do! profile))
+              {/cli.#Test} (..command
+                            (..with_dependencies ..program console /command/test.do! profile)))
+
+            {/cli.#Auto auto}
+            (do !
+              [?watcher watch.default]
+              (case ?watcher
+                {try.#Failure error}
+                (..fail! error)
+                
+                {try.#Success watcher}
+                (..command
+                 (case auto
+                   {/cli.#Build} (..with_dependencies ..program console (/command/auto.do! /command/auto.delay watcher /command/build.do!) profile)
+                   {/cli.#Test} (..with_dependencies ..program console (/command/auto.do! /command/auto.delay watcher /command/test.do!) profile))))))
           )))))