From 88028fce40ec8161c4d309a557e3fed5b423cc1f Mon Sep 17 00:00:00 2001 From: Philipp Reiter Date: Mon, 21 Oct 2024 14:58:29 +0200 Subject: [PATCH] wireman: Bump to v0.2 --- Cargo.lock | 78 ++++++++++++++------------- wireman/CHANGELOG.md | 4 ++ wireman/Cargo.toml | 14 ++--- wireman/src/view/reflection_dialog.rs | 6 +-- wireman/src/widgets/help.rs | 7 +-- 5 files changed, 60 insertions(+), 49 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 76b3a93..a4a5f4f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -89,9 +89,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "37bf3594c4c988a53154954629820791dde498571819ae4ca50ca811e060cc95" [[package]] name = "arboard" @@ -307,9 +307,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.30" +version = "1.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945" +checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f" dependencies = [ "shlex", ] @@ -548,9 +548,9 @@ dependencies = [ [[package]] name = "edtui" -version = "0.8.5" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a43def1c144641785b02a955524bedb6cd2b9f9411634bf3cd35da0935856534" +checksum = "6569ac69f80b357c680fa4d92163e521a8ea7549b3407473e9246f3ae11ded3a" dependencies = [ "arboard", "edtui-jagged", @@ -953,9 +953,9 @@ dependencies = [ [[package]] name = "image" -version = "0.25.2" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" +checksum = "bc144d44a31d753b02ce64093d532f55ff8dc4ebf2ffb8a63c0dda691385acae" dependencies = [ "bytemuck", "byteorder-lite", @@ -984,6 +984,12 @@ dependencies = [ "hashbrown 0.15.0", ] +[[package]] +name = "indoc" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" + [[package]] name = "instability" version = "0.3.2" @@ -1038,9 +1044,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.159" +version = "0.2.161" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" [[package]] name = "libredox" @@ -1510,9 +1516,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.87" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" +checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9" dependencies = [ "unicode-ident", ] @@ -1642,23 +1648,23 @@ dependencies = [ [[package]] name = "ratatui" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdef7f9be5c0122f890d58bdf4d964349ba6a6161f705907526d891efabba57d" +checksum = "eabd94c2f37801c20583fc49dd5cd6b0ba68c716787c2dd6ed18571e1e63117b" dependencies = [ "bitflags 2.6.0", "cassowary", "compact_str", "crossterm", + "indoc", "instability", "itertools", "lru", "paste", "strum", - "strum_macros", "unicode-segmentation", "unicode-truncate", - "unicode-width 0.1.14", + "unicode-width 0.2.0", ] [[package]] @@ -1723,9 +1729,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.14" +version = "0.23.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8" +checksum = "5fbb44d7acc4e873d613422379f69f237a1b141928c02f6bc6ccfddddc2d7993" dependencies = [ "log", "once_cell", @@ -1821,9 +1827,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ "itoa", "memchr", @@ -1970,9 +1976,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.79" +version = "2.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021" dependencies = [ "proc-macro2", "quote", @@ -2302,9 +2308,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tui-widget-list" -version = "0.12.2" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d523011019b6af3065b61c56408490d473ca9656778c29bfb18c5d2c1053630" +checksum = "dd80265ccaaad37d8e315c2ca1ba40dd30bced081ba4fbe22fa0584fd9c1ca3f" dependencies = [ "ratatui", ] @@ -2650,7 +2656,7 @@ dependencies = [ [[package]] name = "wireman" -version = "0.1.4" +version = "0.2.0" dependencies = [ "arboard", "crossterm", @@ -2664,31 +2670,31 @@ dependencies = [ "tokio", "tui-widget-list", "unicode-width 0.1.14", - "wireman-config 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "wireman-config 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "wireman-core 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "wireman-event-handler 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "wireman-logger 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "wireman-theme 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "wireman-theme 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wireman-config" -version = "0.1.3" +version = "0.2.0" dependencies = [ "clap", "serde", "shellexpand", "thiserror", "toml", - "wireman-logger 0.1.0", - "wireman-theme 0.1.4", + "wireman-logger 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wireman-theme 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "wireman-config" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43416b01d6b8dc465ac9912b159171dddd2a544248a89c330e65e6cfd4bf1f60" +checksum = "5713e6d80276c4c9755a4f58adf381e9d81aca035d93295e33489099080438ed" dependencies = [ "clap", "serde", @@ -2696,7 +2702,7 @@ dependencies = [ "thiserror", "toml", "wireman-logger 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "wireman-theme 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "wireman-theme 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2777,7 +2783,7 @@ dependencies = [ [[package]] name = "wireman-theme" -version = "0.1.4" +version = "0.2.0" dependencies = [ "cssparser", "once_cell", @@ -2790,9 +2796,9 @@ dependencies = [ [[package]] name = "wireman-theme" -version = "0.1.4" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d6e63de4d2c03fc04bd75bed76f8e34ac4337bb22f6b05a931ba6c30229589a" +checksum = "20744059e630bb8ca5ea31b467c1ef9e9971c334893a9e9586f98dd7b2798c0a" dependencies = [ "cssparser", "once_cell", diff --git a/wireman/CHANGELOG.md b/wireman/CHANGELOG.md index 065f43d..2050051 100644 --- a/wireman/CHANGELOG.md +++ b/wireman/CHANGELOG.md @@ -1,3 +1,7 @@ +0.2.0 - 21 Okt 2024 +=================== +- Bump ratatui version (v0.29) + 0.1.5 - 07 Sep 2024 =================== - Resize request and response windows with `+`/`-` diff --git a/wireman/Cargo.toml b/wireman/Cargo.toml index 6eb0134..341576d 100644 --- a/wireman/Cargo.toml +++ b/wireman/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wireman" -version = "0.1.4" +version = "0.2.0" edition = "2021" authors = ["preiter "] description = "A TUI based gRPC client" @@ -14,20 +14,20 @@ rust-version = "1.70.0" # core = { package = "wireman-core", path = "../wireman-core", version = "0.1.2" } # config = { package = "wireman-config", path = "../wireman-config", version = "0.1.1" } # logger = { package = "wireman-logger", path = "../wireman-logger", version = "0.1.0" } -# theme = { package = "wireman-theme", path = "../wireman-theme", version = "0.1.0" } +# theme = { package = "wireman-theme", path = "../wireman-theme", version = "0.2.0" } # event-handler = { package = "wireman-event-handler", path = "../wireman-event-handler", version = "0.1.0" } core = { package = "wireman-core", version = "0.1.2" } -config = { package = "wireman-config", version = "0.1" } +config = { package = "wireman-config", version = "0.2" } logger = { package = "wireman-logger", version = "0.1" } -theme = { package = "wireman-theme", version = "0.1" } +theme = { package = "wireman-theme", version = "0.2" } event-handler = { package = "wireman-event-handler", version = "0.1" } -tui-widget-list = { version = "0.12.2" } -edtui = "0.8" +tui-widget-list = { version = "0.13" } +edtui = "0.9" # edtui = { package = "edtui", path = "../../edtui", version = "0.8.4" } crossterm = { version = "0.28", features = ["events", "event-stream"] } -ratatui = { package = "ratatui", version = "0.28", features = ["unstable"] } +ratatui = { package = "ratatui", version = "0.29", features = ["unstable"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" unicode-width = "0.1" diff --git a/wireman/src/view/reflection_dialog.rs b/wireman/src/view/reflection_dialog.rs index 42f0b31..8ab233a 100644 --- a/wireman/src/view/reflection_dialog.rs +++ b/wireman/src/view/reflection_dialog.rs @@ -8,8 +8,8 @@ use ratatui::text::Line; use ratatui::widgets::{Paragraph, Wrap}; use ratatui::{ buffer::Buffer, - layout::{Alignment, Direction, Rect}, - widgets::{block::Title, Block, Borders, Widget}, + layout::{Direction, Rect}, + widgets::{Block, Borders, Widget}, }; use theme::Theme; @@ -36,7 +36,7 @@ impl Widget for ReflectionDialog { let block = Block::default() .borders(Borders::ALL) .style(style) - .title(Title::from("Reflection Settings").alignment(Alignment::Center)) + .title_top(Line::from("Reflection Settings").centered()) .title_style(title_style); let inner_area = block.inner(area); block.render(area, buf); diff --git a/wireman/src/widgets/help.rs b/wireman/src/widgets/help.rs index 4106b45..47bfd7e 100644 --- a/wireman/src/widgets/help.rs +++ b/wireman/src/widgets/help.rs @@ -1,7 +1,8 @@ use crate::context::HelpContext; use ratatui::{ - prelude::{Alignment, Buffer, Constraint, Rect}, - widgets::{block::Title, Block, Borders, Cell, Row, Table, Widget}, + prelude::{Buffer, Constraint, Rect}, + text::Line, + widgets::{Block, Borders, Cell, Row, Table, Widget}, }; use theme::Theme; @@ -26,7 +27,7 @@ impl Widget for HelpDialog { let style = theme.help_dialog.style; let block = Block::default() .borders(Borders::ALL) - .title(Title::from("Help").alignment(Alignment::Center)); + .title_top(Line::from("Help").centered()); let mut rows = Vec::new(); for (key, msg) in self.key_map { rows.push(Row::new(vec![