From 1da38795866074a0d723a1dc1d647287bd37c766 Mon Sep 17 00:00:00 2001 From: JesusPerez Date: Thu, 23 Sep 2021 15:45:25 +0100 Subject: [PATCH 1/4] chore: add rel_env to create releases --- rel_env | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 rel_env diff --git a/rel_env b/rel_env new file mode 100644 index 0000000..4cbc21c --- /dev/null +++ b/rel_env @@ -0,0 +1,10 @@ + +export TARGET_REPO=LibreCloud/CloudMandala +export SOURCE_PATH="." +export SOURCE_NAME=$(yj -tj < "$SOURCE_PATH/Cargo.toml" | jq -r '.package.name') +export SOURCE_TITLE="CloudMandala" +export BUILD_SOURCE="$SOURCE_PATH/target/release/$SOURCE_NAME" + +export TAG=$(yj -tj < "$SOURCE_PATH/Cargo.toml" | jq -r '.package.version') +export REV_TAG="master" +export DFLT_BUILD_ARGS="darwin amd64 MacOS" From 133df507b474701c25eea841169f8e08361704d9 Mon Sep 17 00:00:00 2001 From: JesusPerez Date: Tue, 25 Jan 2022 19:33:25 +0000 Subject: [PATCH 2/4] chore: fix links --- Cargo.toml | 30 +++++++++++++++--------------- README.md | 6 ++---- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c19fe51..05af766 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "cloudmandala" -version = "0.1.2" +version = "0.1.3" authors = ["JesusPerez "] -edition = "2018" +edition = "2021" [dependencies] @@ -16,15 +16,15 @@ anyhow = "1.0.40" # argonautica = "0.2.0" # ## -blake3 = "0.3.7" +blake3 = "1.3.0" base64 = "0.13.0" base64-stream = "1.2.5" captcha = "0.0.8" chrono = "0.4" dotenv = "0.15.0" debug_stub_derive = "0.3.0" -env_logger = "0.8.2" -envmnt = "0.9.0" +env_logger = "0.9.0" +envmnt = "0.9.1" error-chain = "0.12.4" failure = "0.1.8" futures = "0.3.12" @@ -47,17 +47,17 @@ qstring = "0.7.2" rand = "0.8.3" #redis = { version = "0.19.0", features = [ "tokio-comp", "cluster"] } regex = "1.5.4" -reqwest = "0.11.3" -rfm = "0.8.0" +reqwest = "0.11.9" +rfm = "1.0.2" sanitize-filename = "0.3.0" serde = { version = "1.0", features = ["derive"] } #serde_cbor = "0.11.1" serde_derive = "1.0" -serde_dhall = "0.10.0" +serde_dhall = "0.11.0" serde_json = "1.0" -serde_yaml = "0.8.17" +serde_yaml = "0.8.23" -slab = "0.4.3" +slab = "0.4.5" # sqlx = { version = "0.4.0-beta.1", default-features = false, features = [ "mysql", "macros", "runtime-actix" ] } #sqlx = {version = "0.5.1", default-features = false, features = ["macros","runtime-tokio-rustls","sqlite", "mysql", "postgres", "decimal", "chrono"]} @@ -79,10 +79,10 @@ toml = "0.5" uuid = { version = "0.8", features = ["serde", "v5"] } pretty_env_logger = "0.4" -tkdr = { path = "../lib/tkdr" } -key_of_life = { path = "../lib/key_of_life" } +tkdr = { path = "../rust_lib/tkdr" } +key_of_life = { path = "../rust_lib/key_of_life" } -clds = { path = "../lib/clds" } +clds = { path = "../rust_lib/clds" } # https://nnethercote.github.io/perf-book/build-configuration.html [profile.release] @@ -92,9 +92,9 @@ codegen-units = 1 opt-level = "z" [dev-dependencies] -tracing-subscriber = "0.2.18" +tracing-subscriber = "0.3.6" [build-dependencies] -envmnt = "0.9.0" +envmnt = "0.9.1" [features] # Nothing by default diff --git a/README.md b/README.md index 0a87dc6..35c78ad 100644 --- a/README.md +++ b/README.md @@ -4,15 +4,13 @@ ## Declarative command line interface, to create and maintain open, free and sustainable Clouds - This was created to: - ## Inspiration A [Mandala](https://en.wikipedia.org/wiki/Mandala) is a geometric configuration of symbols. In various spiritual traditions, [mandalas](https://en.wikipedia.org/wiki/Mandala) may be employed for focusing attention of practitioners and adepts, as a spiritual guidance tool, for establishing a sacred space and as an aid to meditation and trance induction. -[Clouds](https://en.wikipedia.org/wiki/Cloud) sometime look like some kind of sacred or mystical spaces. +[Clouds](https://en.wikipedia.org/wiki/Cloud) sometime look like some kind of sacred or mystical spaces. A [Sea of Clouds](https://es.m.wikipedia.org/wiki/Archivo:Sea_of_Clouds_Ody.JPG) or [this Clouds view](https://images.rove.me/w_1920,q_85/qolqoyoa8loeqt6v9ihv/canary-islands-sea-of-clouds.jpg) by example. ## Requirements for build @@ -36,7 +34,7 @@ cargo build ```bash ``` -#### Run examples +### Run examples Use evironment variables like this: From 3fb4125ddb34254f2e1fdb2e4d9c7ab4ca44f340 Mon Sep 17 00:00:00 2001 From: JesusPerez Date: Tue, 25 Jan 2022 19:37:22 +0000 Subject: [PATCH 3/4] chore: vers 0.1.3 rust 2021 and dependencies update --- Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Cargo.toml b/Cargo.toml index 05af766..4f3c8b3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,6 +4,7 @@ version = "0.1.3" authors = ["JesusPerez "] edition = "2021" + [dependencies] log = "0.4" From 055fef7b160c7cb4981ce2964869377367ec302b Mon Sep 17 00:00:00 2001 From: JesusPerez Date: Tue, 25 Jan 2022 19:37:41 +0000 Subject: [PATCH 4/4] chore: vers 0.1.3 rust 2021 and dependencies update --- src/app.rs | 4 ++-- src/clouds.rs | 2 +- src/helpers.rs | 14 ++++++++------ 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/app.rs b/src/app.rs index 963d3e7..2998ba8 100644 --- a/src/app.rs +++ b/src/app.rs @@ -23,7 +23,7 @@ use crate::helpers::{BoilerplateOpts, HELP_TEMPLATE}; // use crate::validators::path_readable_file; use crate::clouds::{on_cloud}; use crate::defs::{BxDynResult}; -use clds::clouds::on_clouds::clear_specs; +use clds::clouds::utils::clear_specs; use tkdr::crypt_lib::{encrypt, decrypt}; use tkdr::tera_lib::{hash_from_data, data_templated, hash_content}; @@ -64,7 +64,7 @@ pub const KEY_PATH: &str = ".k"; /// the top-level help output's list of subcommands. #[derive(StructOpt, Debug)] #[structopt(template = HELP_TEMPLATE, - about = "Coder is a command utility to manage keys (generation,encrypt,hash) and make content with Tera templates", + about = "CloudMandala Declarative command line interface, to create and maintain open, free and sustainable Clouds", global_setting = structopt::clap::AppSettings::ColoredHelp)] pub struct CliOpts { #[allow(clippy::missing_docs_in_private_items)] // StructOpt compile-time errors if we doc this diff --git a/src/clouds.rs b/src/clouds.rs index d965e55..0f979be 100644 --- a/src/clouds.rs +++ b/src/clouds.rs @@ -23,7 +23,7 @@ use clds::clouds::defs::{ TskSrvc, MainResourcesConfig, }; -use clds::clouds::on_clouds::env_cloud; +use clds::clouds::utils::env_cloud; use clds::tsksrvcs::run_tsksrvcs_on_providers; use crate::defs::{load_key}; diff --git a/src/helpers.rs b/src/helpers.rs index d67ee0f..28dd510 100644 --- a/src/helpers.rs +++ b/src/helpers.rs @@ -14,16 +14,18 @@ pub const HELP_TEMPLATE: &str = "{bin} {version} {about} -TskSrvcs: -- Create a Random Key -- Hash content Blake3 -- Encrypt/Decrypt XChaCha20Poly1305 and random nonce -- Tera template with json-data +A Mandala is a geometric configuration of symbols. +In various spiritual traditions, mandalas may be employed +for focusing attention of practitioners and adepts, as a spiritual guidance tool, +for establishing a sacred space and as an aid to meditation and trance induction. + +Clouds sometime look like some kind of sacred or mystical spaces. + +More info: cloudmandala.librecloud.online USAGE: {usage} - {all-args} ";