From 4f4a96635abb04239102e4b72dc2a9c6f678dcd2 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Thu, 22 Dec 2022 15:51:13 -0400 Subject: Now showing stack-traces for runtime exceptions in Ruby. --- stdlib/source/program/aedifex/artifact.lux | 9 +++++---- stdlib/source/program/aedifex/artifact/snapshot.lux | 2 +- .../source/program/aedifex/artifact/snapshot/version/value.lux | 2 +- stdlib/source/program/aedifex/cli.lux | 2 +- stdlib/source/program/aedifex/command/build.lux | 5 +++-- stdlib/source/program/aedifex/dependency/resolution.lux | 2 +- stdlib/source/program/aedifex/local.lux | 5 +++-- stdlib/source/program/aedifex/metadata.lux | 7 ++++--- stdlib/source/program/aedifex/pom.lux | 2 +- stdlib/source/program/aedifex/profile.lux | 2 +- stdlib/source/program/aedifex/repository/local.lux | 7 ++++--- stdlib/source/program/aedifex/repository/origin.lux | 2 +- stdlib/source/program/aedifex/repository/remote.lux | 5 +++-- 13 files changed, 29 insertions(+), 23 deletions(-) (limited to 'stdlib/source/program') diff --git a/stdlib/source/program/aedifex/artifact.lux b/stdlib/source/program/aedifex/artifact.lux index 3b83909e0..d913d9db3 100644 --- a/stdlib/source/program/aedifex/artifact.lux +++ b/stdlib/source/program/aedifex/artifact.lux @@ -1,6 +1,6 @@ (.require [library - [lux (.except local) + [lux (.except local #version) [abstract [equivalence (.only Equivalence)] [order (.only Order)] @@ -14,7 +14,8 @@ [world ["[0]" file (.only Path)] [net - ["[0]" uri (.only URI)]]]]]) + [uri (.only URI) + ["[0]" path]]]]]]) (type .public Group Text) @@ -93,14 +94,14 @@ (def .public (bundle version artifact) (-> Version Artifact URI) - (let [/ uri.separator + (let [/ path.separator group (..directory / (the #group artifact)) name (the #name artifact)] (%.format group / name / version))) (def .public (uri version artifact) (-> Version Artifact URI) - (let [/ uri.separator] + (let [/ path.separator] (%.format (..bundle version artifact) / (..identity artifact)))) (def .public (local artifact) diff --git a/stdlib/source/program/aedifex/artifact/snapshot.lux b/stdlib/source/program/aedifex/artifact/snapshot.lux index df36e1d0d..6cde5e5f2 100644 --- a/stdlib/source/program/aedifex/artifact/snapshot.lux +++ b/stdlib/source/program/aedifex/artifact/snapshot.lux @@ -1,6 +1,6 @@ (.require [library - [lux (.except Type) + [lux (.except Type #Local) [abstract [equivalence (.only Equivalence)] [monad (.only do)]] diff --git a/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux b/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux index 51a571ab8..2fd32b251 100644 --- a/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux +++ b/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux @@ -1,6 +1,6 @@ (.require [library - [lux (.except) + [lux (.except #version) [abstract [equivalence (.only Equivalence)]] [data diff --git a/stdlib/source/program/aedifex/cli.lux b/stdlib/source/program/aedifex/cli.lux index 338c02aa0..ca2c60bfb 100644 --- a/stdlib/source/program/aedifex/cli.lux +++ b/stdlib/source/program/aedifex/cli.lux @@ -1,6 +1,6 @@ (.require [library - [lux (.except) + [lux (.except #Build) [abstract [equivalence (.only Equivalence)] [monad (.only do)]] diff --git a/stdlib/source/program/aedifex/command/build.lux b/stdlib/source/program/aedifex/command/build.lux index 71c87d8ce..189f57bbe 100644 --- a/stdlib/source/program/aedifex/command/build.lux +++ b/stdlib/source/program/aedifex/command/build.lux @@ -39,7 +39,8 @@ ["[0]" shell (.only Exit Process Shell)] ["[0]" console (.only Console)] [net - ["[0]" uri]]]]] + [uri + ["[0]" path]]]]]] ["[0]" /// ["[1]" profile] ["[1][0]" action] @@ -125,7 +126,7 @@ artifact (the ///dependency.#artifact dependency)] (|> artifact (///local.uri (the ///artifact.#version artifact)) - (text.replaced uri.separator /) + (text.replaced path.separator /) (format home /) (text.suffix (format "." (the ///dependency.#type dependency)))))) diff --git a/stdlib/source/program/aedifex/dependency/resolution.lux b/stdlib/source/program/aedifex/dependency/resolution.lux index 62a85a974..ae05fb4c1 100644 --- a/stdlib/source/program/aedifex/dependency/resolution.lux +++ b/stdlib/source/program/aedifex/dependency/resolution.lux @@ -1,6 +1,6 @@ (.require [library - [lux (.except all) + [lux (.except Tag all) ["[0]" debug] ["[0]" ffi (.only import)] [abstract diff --git a/stdlib/source/program/aedifex/local.lux b/stdlib/source/program/aedifex/local.lux index 157cb24eb..4ac42d6e7 100644 --- a/stdlib/source/program/aedifex/local.lux +++ b/stdlib/source/program/aedifex/local.lux @@ -6,11 +6,12 @@ ["%" \\format (.only format)]]] [world [net - ["[0]" uri (.only URI)]]]]] + [uri (.only URI) + ["[0]" path]]]]]] ["[0]" // ["[1][0]" artifact (.only Version Artifact)]]) -(def / uri.separator) +(def / path.separator) (def .public repository URI diff --git a/stdlib/source/program/aedifex/metadata.lux b/stdlib/source/program/aedifex/metadata.lux index 2608d146c..9f9cbfcc9 100644 --- a/stdlib/source/program/aedifex/metadata.lux +++ b/stdlib/source/program/aedifex/metadata.lux @@ -7,7 +7,8 @@ [world [file (.only Path)] [net - ["[0]" uri (.only URI)]]]]] + [uri (.only URI) + ["[0]" path]]]]]] ["[0]" // ["[1][0]" artifact (.only Artifact)]]) @@ -17,7 +18,7 @@ (def .public (remote_artifact_uri artifact) (-> Artifact URI) - (let [/ uri.separator] + (let [/ path.separator] (format (//artifact.directory / (the //artifact.#group artifact)) / (the //artifact.#name artifact) / (the //artifact.#version artifact) @@ -25,7 +26,7 @@ (def .public (remote_project_uri artifact) (-> Artifact URI) - (let [/ uri.separator] + (let [/ path.separator] (format (//artifact.directory / (the //artifact.#group artifact)) / (the //artifact.#name artifact) / ..remote_file))) diff --git a/stdlib/source/program/aedifex/pom.lux b/stdlib/source/program/aedifex/pom.lux index afcfc29f6..5e26bb060 100644 --- a/stdlib/source/program/aedifex/pom.lux +++ b/stdlib/source/program/aedifex/pom.lux @@ -1,6 +1,6 @@ (.require [library - [lux (.except) + [lux (.except Tag) [abstract [monad (.only do)]] [control diff --git a/stdlib/source/program/aedifex/profile.lux b/stdlib/source/program/aedifex/profile.lux index 674865cdd..55dfc915f 100644 --- a/stdlib/source/program/aedifex/profile.lux +++ b/stdlib/source/program/aedifex/profile.lux @@ -1,6 +1,6 @@ (.require [library - [lux (.except Info Source Module) + [lux (.except Info Source Module #info #target #configuration) [abstract [monoid (.only Monoid)] [equivalence (.only Equivalence)]] diff --git a/stdlib/source/program/aedifex/repository/local.lux b/stdlib/source/program/aedifex/repository/local.lux index 4223ddf39..8f3c1cfb7 100644 --- a/stdlib/source/program/aedifex/repository/local.lux +++ b/stdlib/source/program/aedifex/repository/local.lux @@ -14,7 +14,8 @@ [environment (.only Environment)] ["[0]" file] [net - ["[0]" uri (.only URI)]]]]] + [uri (.only URI) + ["[0]" path]]]]]] ["[0]" // (.only) ["/[1]" // ["[1][0]" local] @@ -24,12 +25,12 @@ (-> (Environment Async) (file.System Async) file.Path) (let [/ (of fs separator)] (|> ///local.repository - (text.replaced uri.separator /) + (text.replaced path.separator /) (format (of environment home) /)))) (def (path /) (-> Text (-> URI file.Path)) - (text.replaced uri.separator /)) + (text.replaced path.separator /)) (def (absolute_path environment fs) (-> (Environment Async) (file.System Async) (-> URI file.Path)) diff --git a/stdlib/source/program/aedifex/repository/origin.lux b/stdlib/source/program/aedifex/repository/origin.lux index e8b9c22a4..c813b7680 100644 --- a/stdlib/source/program/aedifex/repository/origin.lux +++ b/stdlib/source/program/aedifex/repository/origin.lux @@ -1,6 +1,6 @@ (.require [library - [lux (.except) + [lux (.except #Local) [abstract [equivalence (.only Equivalence)]] [data diff --git a/stdlib/source/program/aedifex/repository/remote.lux b/stdlib/source/program/aedifex/repository/remote.lux index 9386c214f..61972682a 100644 --- a/stdlib/source/program/aedifex/repository/remote.lux +++ b/stdlib/source/program/aedifex/repository/remote.lux @@ -21,6 +21,7 @@ [net (.only URL) [uri (.only URI)] ["[0]" http + ["[0]" response (.only Response)] ["[1]" client] ["[1]/[0]" status] ["@[1]" /]]]]]] @@ -62,7 +63,7 @@ address) (def (download uri) (do [! (try.with io.monad)] - [[status message] (is (IO (Try (@http.Response IO))) + [[status message] (is (IO (Try (Response IO))) (http.get (format address uri) (http.headers ..base_headers) {.#None} @@ -78,7 +79,7 @@ (def (upload uri content) (do (try.with io.monad) - [[status message] (is (IO (Try (@http.Response IO))) + [[status message] (is (IO (Try (Response IO))) (http.put (format address uri) (http.headers (when identity {.#None} -- cgit v1.2.3