First-class programs instead of having a "lux program" extension.

2 files changed, 16 insertions, 14 deletions

diff --git a/stdlib/source/program/aedifex/command/deploy/release.lux b/stdlib/source/program/aedifex/command/deploy/release.lux
index e30c115d2..d7394d7a3 100644
--- a/stdlib/source/program/aedifex/command/deploy/release.lux
+++ b/stdlib/source/program/aedifex/command/deploy/release.lux
@@ -3,7 +3,6 @@
   [lux (.except)
    ["[0]" ffi (.only import)]
    [abstract
-    [predicate (.only Predicate)]
     ["[0]" monad (.only do)]]
    [control
     ["[0]" pipe]
@@ -11,8 +10,8 @@
     ["[0]" io (.only IO)]
     [concurrency
      ["[0]" async (.only Async)]]
-    [parser
-     ["[0]" environment]]]
+    [function
+     [predicate (.only Predicate)]]]
    [data
     [binary (.only Binary)]
     ["[0]" text (.only)
@@ -34,7 +33,9 @@
       ["[0]" packager
        ["[1]" jvm]]]]]
    [world
-    [program (.only Program)]
+    ["[0]" environment
+     [/ (.only Environment)]
+     ["[1]" \\parser]]
     [console (.only Console)]
     ["[0]" shell (.only Shell)]
     ["[0]" file]]]]
@@ -112,8 +113,8 @@
   (Predicate Artifact)
   (|>> //snapshot.snapshot? not))
 
-(def (install_dummies! program local fs artifact)
-  (-> (Program Async) (Repository Async) (file.System Async) Artifact (Async (Try Any)))
+(def (install_dummies! environment local fs artifact)
+  (-> (Environment Async) (Repository Async) (file.System Async) Artifact (Async (Try Any)))
   (do (try.with async.monad)
     [.let [$artifact (////artifact.uri (the ////artifact.#version artifact) artifact)]
      _ (at local upload (..jar $artifact) ..dummy_jar)
@@ -144,13 +145,13 @@
      _ (..release_unsigned_artifact! local remote signature)]
     (in [])))
 
-(def .public (do! program shell console local remote fs artifact profile)
-  (-> (Program Async) (Shell Async) (Console Async) (Repository Async) (Repository Async) (file.System Async) Artifact (Command Any))
+(def .public (do! environment shell console local remote fs artifact profile)
+  (-> (Environment Async) (Shell Async) (Console Async) (Repository Async) (Repository Async) (file.System Async) Artifact (Command Any))
   (do [! ////action.monad]
     [_ (///install.do! console fs local profile)
-     _ (install_dummies! program local fs artifact)
-     .let [working_directory (at program directory)
-           @root (////repository/local.root program fs)
+     _ (install_dummies! environment local fs artifact)
+     .let [working_directory (at environment directory)
+           @root (////repository/local.root environment fs)
            $bundle (////artifact.bundle (the ////artifact.#version artifact) artifact)
            / (at fs separator)
            @local (%.format @root / $bundle)]
diff --git a/stdlib/source/program/aedifex/command/deploy/snapshot.lux b/stdlib/source/program/aedifex/command/deploy/snapshot.lux
index eec503275..bd253bfcd 100644
--- a/stdlib/source/program/aedifex/command/deploy/snapshot.lux
+++ b/stdlib/source/program/aedifex/command/deploy/snapshot.lux
@@ -2,15 +2,16 @@
  [library
   [lux (.except)
    [abstract
-    [monad (.only do)]
-    [predicate (.only Predicate)]]
+    [monad (.only do)]]
    [control
+    [function
+     [predicate (.only Predicate)]]
     [concurrency
      ["[0]" async (.only Async)]]]
    [data
     ["[0]" binary
      ["[1]" \\format]]
-    ["[0]" text
+    ["[0]" text (.only)
      [encoding
       ["[0]" utf8]]]
     [collection