build: bump r3bl_tuify from 0.1.27 to 0.2.0

Bumps [r3bl_tuify](https://github.com/r3bl-org/r3bl-open-core) from 0.1.27 to 0.2.0. - [Release notes](https://github.com/r3bl-org/r3bl-open-core/releases) - [Changelog](https://github.com/r3bl-org/r3bl-open-core/blob/main/CHANGELOG.md) - [Commits](https://github.com/r3bl-org/r3bl-open-core/commits) --- updated-dependencies: - dependency-name: r3bl_tuify dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
build-trust · Nov 12, 2024 · c28f6df · c28f6df
1 parent f2479cc
commit c28f6df
Show file tree

Hide file tree

Showing 8 changed files with 247 additions and 180 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/NOTICE.md b/NOTICE.md
@@ -71,6 +71,7 @@ This file contains attributions for any 3rd-party open source code used in this
 | aya-log-common | MIT, Apache-2.0 | https://crates.io/crates/aya-log-common |
 | aya-obj | MIT, Apache-2.0 | https://crates.io/crates/aya-obj |
 | backtrace | MIT, Apache-2.0 | https://crates.io/crates/backtrace |
+| backtrace-ext | MIT, Apache-2.0 | https://crates.io/crates/backtrace-ext |
 | bare-metal | MIT, Apache-2.0 | https://crates.io/crates/bare-metal |
 | base16ct | Apache-2.0, MIT | https://crates.io/crates/base16ct |
 | base64 | MIT, Apache-2.0 | https://crates.io/crates/base64 |
@@ -174,6 +175,7 @@ This file contains attributions for any 3rd-party open source code used in this
 | derive_builder_core | MIT, Apache-2.0 | https://crates.io/crates/derive_builder_core |
 | derive_builder_macro | MIT, Apache-2.0 | https://crates.io/crates/derive_builder_macro |
 | dialoguer | MIT | https://crates.io/crates/dialoguer |
+| diff | MIT, Apache-2.0 | https://crates.io/crates/diff |
 | digest | MIT, Apache-2.0 | https://crates.io/crates/digest |
 | dlib | MIT | https://crates.io/crates/dlib |
 | doc-comment | MIT | https://crates.io/crates/doc-comment |
@@ -230,6 +232,7 @@ This file contains attributions for any 3rd-party open source code used in this
 | futures-sink | MIT, Apache-2.0 | https://crates.io/crates/futures-sink |
 | futures-task | MIT, Apache-2.0 | https://crates.io/crates/futures-task |
 | futures-util | MIT, Apache-2.0 | https://crates.io/crates/futures-util |
+| fxhash | Apache-2.0, MIT | https://crates.io/crates/fxhash |
 | gcd | MIT, Apache-2.0 | https://crates.io/crates/gcd |
 | generic-array | MIT | https://crates.io/crates/generic-array |
 | gethostname | Apache-2.0 | https://crates.io/crates/gethostname |
@@ -274,7 +277,6 @@ This file contains attributions for any 3rd-party open source code used in this
 | iovec | MIT, Apache-2.0 | https://crates.io/crates/iovec |
 | ipnet | MIT, Apache-2.0 | https://crates.io/crates/ipnet |
 | is-docker | MIT | https://crates.io/crates/is-docker |
-| is-terminal | MIT | https://crates.io/crates/is-terminal |
 | is-wsl | MIT | https://crates.io/crates/is-wsl |
 | is_ci | ISC | https://crates.io/crates/is_ci |
 | is_terminal_polyfill | MIT, Apache-2.0 | https://crates.io/crates/is_terminal_polyfill |
@@ -292,6 +294,7 @@ This file contains attributions for any 3rd-party open source code used in this
 | jpeg-decoder | MIT, Apache-2.0 | https://crates.io/crates/jpeg-decoder |
 | js-sys | MIT, Apache-2.0 | https://crates.io/crates/js-sys |
 | kafka-protocol | MIT, Apache-2.0 | https://crates.io/crates/kafka-protocol |
+| kv | ISC | https://crates.io/crates/kv |
 | kv-log-macro | MIT, Apache-2.0 | https://crates.io/crates/kv-log-macro |
 | lazy-bytes-cast | BSL-1.0 | https://crates.io/crates/lazy-bytes-cast |
 | lazy_static | MIT, Apache-2.0 | https://crates.io/crates/lazy_static |
@@ -369,8 +372,8 @@ This file contains attributions for any 3rd-party open source code used in this
 | owo-colors | MIT | https://crates.io/crates/owo-colors |
 | p256 | Apache-2.0, MIT | https://crates.io/crates/p256 |
 | parking | Apache-2.0, MIT | https://crates.io/crates/parking |
-| parking_lot | MIT, Apache-2.0 | https://crates.io/crates/parking_lot |
-| parking_lot_core | MIT, Apache-2.0 | https://crates.io/crates/parking_lot_core |
+| parking_lot | Apache-2.0, MIT | https://crates.io/crates/parking_lot |
+| parking_lot_core | Apache-2.0, MIT | https://crates.io/crates/parking_lot_core |
 | paste | MIT, Apache-2.0 | https://crates.io/crates/paste |
 | pathdiff | MIT, Apache-2.0 | https://crates.io/crates/pathdiff |
 | pem-rfc7468 | Apache-2.0, MIT | https://crates.io/crates/pem-rfc7468 |
@@ -396,6 +399,7 @@ This file contains attributions for any 3rd-party open source code used in this
 | portable-atomic | Apache-2.0, MIT | https://crates.io/crates/portable-atomic |
 | powerfmt | MIT, Apache-2.0 | https://crates.io/crates/powerfmt |
 | ppv-lite86 | MIT, Apache-2.0 | https://crates.io/crates/ppv-lite86 |
+| pretty_assertions | MIT, Apache-2.0 | https://crates.io/crates/pretty_assertions |
 | prettyplease | MIT, Apache-2.0 | https://crates.io/crates/prettyplease |
 | primeorder | Apache-2.0, MIT | https://crates.io/crates/primeorder |
 | proc-macro2 | MIT, Apache-2.0 | https://crates.io/crates/proc-macro2 |
@@ -404,9 +408,8 @@ This file contains attributions for any 3rd-party open source code used in this
 | quick-xml | MIT | https://crates.io/crates/quick-xml |
 | quote | MIT, Apache-2.0 | https://crates.io/crates/quote |
 | r3bl_ansi_color | Apache-2.0 | https://crates.io/crates/r3bl_ansi_color |
-| r3bl_rs_utils_core | Apache-2.0 | https://crates.io/crates/r3bl_rs_utils_core |
-| r3bl_rs_utils_macro | Apache-2.0 | https://crates.io/crates/r3bl_rs_utils_macro |
-| r3bl_simple_logger | Apache-2.0 | https://crates.io/crates/r3bl_simple_logger |
+| r3bl_core | Apache-2.0 | https://crates.io/crates/r3bl_core |
+| r3bl_macro | Apache-2.0 | https://crates.io/crates/r3bl_macro |
 | r3bl_tui | Apache-2.0 | https://crates.io/crates/r3bl_tui |
 | r3bl_tuify | Apache-2.0 | https://crates.io/crates/r3bl_tuify |
 | radix_trie | MIT | https://crates.io/crates/radix_trie |
@@ -479,6 +482,7 @@ This file contains attributions for any 3rd-party open source code used in this
 | size-of | MIT, Apache-2.0 | https://crates.io/crates/size-of |
 | size-of-derive | MIT, Apache-2.0 | https://crates.io/crates/size-of-derive |
 | slab | MIT | https://crates.io/crates/slab |
+| sled | MIT, Apache-2.0 | https://crates.io/crates/sled |
 | smallvec | MIT, Apache-2.0 | https://crates.io/crates/smallvec |
 | smawk | MIT | https://crates.io/crates/smawk |
 | smithay-client-toolkit | MIT | https://crates.io/crates/smithay-client-toolkit |
@@ -518,7 +522,6 @@ This file contains attributions for any 3rd-party open source code used in this
 | sysinfo | MIT | https://crates.io/crates/sysinfo |
 | tempfile | MIT, Apache-2.0 | https://crates.io/crates/tempfile |
 | termbg | MIT, Apache-2.0 | https://crates.io/crates/termbg |
-| termcolor | Unlicense, MIT | https://crates.io/crates/termcolor |
 | terminal_size | MIT, Apache-2.0 | https://crates.io/crates/terminal_size |
 | textwrap | MIT | https://crates.io/crates/textwrap |
 | thiserror | MIT, Apache-2.0 | https://crates.io/crates/thiserror |
@@ -641,6 +644,7 @@ This file contains attributions for any 3rd-party open source code used in this
 | xml-rs | MIT | https://crates.io/crates/xml-rs |
 | xmlparser | MIT, Apache-2.0 | https://crates.io/crates/xmlparser |
 | yaml-rust | MIT, Apache-2.0 | https://crates.io/crates/yaml-rust |
+| yansi | MIT, Apache-2.0 | https://crates.io/crates/yansi |
 | zerocopy | BSD-2-Clause, Apache-2.0, MIT | https://crates.io/crates/zerocopy |
 | zerocopy-derive | BSD-2-Clause, Apache-2.0, MIT | https://crates.io/crates/zerocopy-derive |
 | zeroize | Apache-2.0, MIT | https://crates.io/crates/zeroize |

diff --git a/implementations/rust/ockam/ockam_api/Cargo.toml b/implementations/rust/ockam/ockam_api/Cargo.toml
@@ -86,9 +86,9 @@ opentelemetry-otlp = { version = "0.26.0", features = ["logs", "metrics", "trace
 opentelemetry-semantic-conventions = { version = "0.26.0", features = ["semconv_experimental"] }
 opentelemetry_sdk = { version = "0.26.0", features = ["logs", "metrics", "trace", "rt-tokio", "rt-tokio-current-thread", "testing", "logs_level_enabled"], default-features = false }
 petname = { version = "2.0.2", default-features = false, features = ["default-rng", "default-words"] }
-r3bl_rs_utils_core = "0.9"
-r3bl_tui = "0.5"
-r3bl_tuify = "0.1"
+r3bl_core = "0.10.0"
+r3bl_tui = "0.6.0"
+r3bl_tuify = "0.2.0"
 rand = "0.8"
 regex = "1.10.6"
 reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls-native-roots"] }

diff --git a/implementations/rust/ockam/ockam_api/src/ui/colors.rs b/implementations/rust/ockam/ockam_api/src/ui/colors.rs
@@ -1,8 +1,8 @@
 use colorful::{core::color_string::CString, Colorful, RGB};
 use colors_transform::{Color, Rgb};
-use r3bl_rs_utils_core::UnicodeString;
-use r3bl_tui::{
-    ColorWheel, ColorWheelConfig, ColorWheelSpeed, GradientGenerationPolicy, TextColorizationPolicy,
+use r3bl_core::{
+    ColorWheel, ColorWheelConfig, ColorWheelSpeed, GradientGenerationPolicy,
+    TextColorizationPolicy, UnicodeString,
 };
 use std::fmt::Display;
 

diff --git a/implementations/rust/ockam/ockam_api/src/ui/terminal/fmt.rs b/implementations/rust/ockam/ockam_api/src/ui/terminal/fmt.rs
@@ -9,15 +9,15 @@ pub const INDENTATION: &str = "  ";
 
 pub fn get_separator_width() -> usize {
     // If we can't get the terminal width, use the default width
-    let mut terminal_width = r3bl_tuify::get_terminal_width();
+    let mut terminal_width = r3bl_core::get_terminal_width();
     if terminal_width == 0 {
-        terminal_width = r3bl_tuify::DEFAULT_WIDTH;
+        terminal_width = r3bl_core::DEFAULT_WIDTH
     }
     // Make sure the separator width is at least twice the length of the padding.
     // We want to show a small separator even if the terminal is too narrow.
     let terminal_width = std::cmp::max(terminal_width, 2 * PADDING.len());
     // Limit the separator width to the default width
-    std::cmp::min(terminal_width - PADDING.len(), r3bl_tuify::DEFAULT_WIDTH)
+    std::cmp::min(terminal_width - PADDING.len(), r3bl_core::DEFAULT_WIDTH)
 }
 
 #[test]

diff --git a/implementations/rust/ockam/ockam_api/src/ui/terminal/mod.rs b/implementations/rust/ockam/ockam_api/src/ui/terminal/mod.rs
@@ -14,8 +14,8 @@ use indicatif::{ProgressBar, ProgressDrawTarget, ProgressStyle};
 use jaq_interpret::{Ctx, FilterT, ParseCtx, RcIter, Val};
 use miette::{miette, IntoDiagnostic};
 use ockam_core::env::get_env_with_default;
-use r3bl_rs_utils_core::{ch, ChUnit};
-use r3bl_tuify::{get_size, select_from_list, SelectionMode, StyleSheet};
+use r3bl_core::{ch, get_size};
+use r3bl_tuify::{select_from_list, SelectionMode, StyleSheet};
 use serde::Serialize;
 use std::fmt::Write as _;
 use std::fmt::{Debug, Display};

diff --git a/implementations/rust/ockam/ockam_command/Cargo.toml b/implementations/rust/ockam/ockam_command/Cargo.toml
@@ -81,8 +81,8 @@ once_cell = "1.19"
 open = "5.3.0"
 opentelemetry = { version = "0.26.0", features = ["metrics", "trace"] }
 pem-rfc7468 = { version = "0.7.0", features = ["std"] }
-r3bl_rs_utils_core = "0.9.12"
-r3bl_tui = "0.5.8"
+r3bl_core = "0.10.0"
+r3bl_tui = "0.6.0"
 rand = "0.8"
 regex = "1.10.6"
 reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls-native-roots", "blocking"] }
@@ -100,7 +100,7 @@ tokio = { version = "1.41.0", features = ["full"] }
 tokio-retry = "0.3"
 tracing = { version = "0.1", default-features = false }
 url = "2.5.2"
-which = "6.0.2"
+which = "7.0.0"
 
 [dev-dependencies]
 assert_cmd = "2"

diff --git a/implementations/rust/ockam/ockam_command/src/enroll/command.rs b/implementations/rust/ockam/ockam_command/src/enroll/command.rs
@@ -6,9 +6,9 @@ use std::sync::Arc;
 use clap::Args;
 use colorful::Colorful;
 use miette::{miette, IntoDiagnostic, WrapErr};
-use r3bl_rs_utils_core::UnicodeString;
-use r3bl_tui::{
-    ColorWheel, ColorWheelConfig, ColorWheelSpeed, GradientGenerationPolicy, TextColorizationPolicy,
+use r3bl_core::{
+    ColorWheel, ColorWheelConfig, ColorWheelSpeed, GradientGenerationPolicy,
+    TextColorizationPolicy, UnicodeString,
 };
 use tokio::sync::Mutex;
 use tokio::try_join;