diff options
Diffstat (limited to 'stdlib/source/program/aedifex/dependency')
| -rw-r--r-- | stdlib/source/program/aedifex/dependency/deployment.lux | 12 | ||||
| -rw-r--r-- | stdlib/source/program/aedifex/dependency/resolution.lux | 48 |
2 files changed, 30 insertions, 30 deletions
diff --git a/stdlib/source/program/aedifex/dependency/deployment.lux b/stdlib/source/program/aedifex/dependency/deployment.lux index 69d85ef9a..49688ae20 100644 --- a/stdlib/source/program/aedifex/dependency/deployment.lux +++ b/stdlib/source/program/aedifex/dependency/deployment.lux @@ -47,11 +47,11 @@ deploy_hash (is (All (_ h) (-> (Codec Text (Hash h)) Extension (Hash h) (Async (Try Any)))) (function (_ codec extension hash) (|> hash - (# codec encoded) - (# utf8.codec encoded) - (# repository upload (format artifact extension)))))] + (at codec encoded) + (at utf8.codec encoded) + (at repository upload (format artifact extension)))))] (do [! (try.with async.monad)] - [_ (# repository upload artifact data)] + [_ (at repository upload artifact data)] (case status {///dependency/status.#Unverified} (in []) @@ -131,7 +131,7 @@ status])) snapshot (///metadata/snapshot.read repository artifact) - snapshot (# ! in (..update_snapshot [artifact type] now snapshot)) + snapshot (at ! in (..update_snapshot [artifact type] now snapshot)) _ (///metadata/snapshot.write repository artifact snapshot) project (///metadata/artifact.read repository artifact) _ (|> project @@ -146,4 +146,4 @@ (|> (dictionary.entries resolution) (monad.each ! (function (_ [dependency package]) (..one repository dependency package))) - (# ! each (set.of_list ///artifact.hash))))) + (at ! each (set.of_list ///artifact.hash))))) diff --git a/stdlib/source/program/aedifex/dependency/resolution.lux b/stdlib/source/program/aedifex/dependency/resolution.lux index 568973c47..b79f6c5d9 100644 --- a/stdlib/source/program/aedifex/dependency/resolution.lux +++ b/stdlib/source/program/aedifex/dependency/resolution.lux @@ -82,19 +82,19 @@ (Exception [Artifact Extension Text]) (Async (Try (Maybe (Hash h)))))) (do async.monad - [?actual (# repository download (///repository/remote.uri version_template artifact extension))] + [?actual (at repository download (///repository/remote.uri version_template artifact extension))] (case ?actual {try.#Success actual} (in (do [! try.monad] - [output (# ! each (|>> ffi.as_string java/lang/String::trim ffi.of_string) - (# utf8.codec decoded actual)) + [output (at ! each (|>> ffi.as_string java/lang/String::trim ffi.of_string) + (at utf8.codec decoded actual)) actual (|> output (text.all_split_by " ") list.head (maybe.else output) - (# codec decoded)) + (at codec decoded)) _ (exception.assertion exception [artifact extension output] - (# ///hash.equivalence = (hash library) actual))] + (at ///hash.equivalence = (hash library) actual))] (in {.#Some actual}))) {try.#Failure error} @@ -103,7 +103,7 @@ (def: (hashed repository version_template artifact extension) (-> (Repository Async) Version Artifact Extension (Async (Try [Binary Status]))) (do (try.with async.monad) - [data (# repository download (///repository/remote.uri version_template artifact extension)) + [data (at repository download (///repository/remote.uri version_template artifact extension)) ?sha-1 (..verified_hash data repository version_template artifact (format extension ///artifact/extension.sha-1) ///hash.sha-1 ///hash.sha-1_codec ..sha-1_does_not_match) @@ -135,14 +135,14 @@ artifact (has ///artifact.#version artifact_version artifact)] [pom_data pom_status] (..hashed repository version_template artifact ///artifact/extension.pom) library_&_status (..hashed repository version_template artifact extension)] - (# async.monad in - (do try.monad - [pom (# utf8.codec decoded pom_data) - pom (# xml.codec decoded pom) - profile (<xml>.result ///pom.parser (list pom))] - (in [///package.#origin {///repository/origin.#Remote ""} - ///package.#library library_&_status - ///package.#pom [pom pom_data pom_status]])))))) + (at async.monad in + (do try.monad + [pom (at utf8.codec decoded pom_data) + pom (at xml.codec decoded pom) + profile (<xml>.result ///pom.parser (list pom))] + (in [///package.#origin {///repository/origin.#Remote ""} + ///package.#library library_&_status + ///package.#pom [pom pom_data pom_status]])))))) (type: .public Resolution (Dictionary Dependency Package)) @@ -163,12 +163,12 @@ (template [<sigil> <name> <doing> <at>] [(def: (<name> console repository artifact) (-> (Console Async) (Repository Async) Artifact (Async (Try Any))) - (# console write (format "[" <sigil> "]" - " " <doing> - " " (///artifact.format artifact) - " " <at> - " " (%.text (# repository description)) - text.new_line)))] + (at console write (format "[" <sigil> "]" + " " <doing> + " " (///artifact.format artifact) + " " <at> + " " (%.text (at repository description)) + text.new_line)))] ["?" announce_fetching "Fetching" "from"] ["O" announce_success "Found" "at"] @@ -181,7 +181,7 @@ {.#End} (|> dependency (exception.except ..cannot_resolve) - (# async.monad in)) + (at async.monad in)) {.#Item repository alternatives} (do [! async.monad] @@ -210,8 +210,8 @@ resolution resolution]) (case dependencies {.#End} - (# async.monad in - [successes failures resolution]) + (at async.monad in + [successes failures resolution]) {.#Item head tail} (case (the [//.#artifact ///artifact.#version] head) @@ -232,7 +232,7 @@ {try.#Success package} (do ! [.let [redundant? (is (Predicate Dependency) - (predicate.or (# //.equivalence = head) + (predicate.or (at //.equivalence = head) (dictionary.key? resolution))) sub_dependencies (|> package ///package.dependencies |