From 230174b3c327c3f217cdcf8fce07d5d9ddea1033 Mon Sep 17 00:00:00 2001 From: Jack Wills <32690432+mrjackwills@users.noreply.github.com> Date: Sat, 19 Apr 2025 07:20:52 +0000 Subject: [PATCH 1/4] tests: fixed version String Fix the version to `0.00.000` in test mode --- src/ui/draw_blocks/mod.rs | 6 +++++- ...rror__tests__draw_blocks_error_docker_connect_error.snap | 2 +- ...ker__ui__draw_blocks__help__tests__draw_blocks_help.snap | 2 +- ...blocks__help__tests__draw_blocks_help_custom_colors.snap | 2 +- ...ests__draw_blocks_help_custom_keymap_one_definition.snap | 2 +- ...sts__draw_blocks_help_custom_keymap_two_definitions.snap | 2 +- ...lp__tests__draw_blocks_help_one_and_two_definitions.snap | 2 +- ...blocks__help__tests__draw_blocks_help_show_timezone.snap | 2 +- ...ts__tests__draw_blocks_ports_custom_colors_state-4.snap} | 1 - 9 files changed, 12 insertions(+), 9 deletions(-) rename src/ui/draw_blocks/snapshots/{oxker__ui__draw_blocks__ports__tests__draw_blocks_ports_custom_colors_state-4.snap.new => oxker__ui__draw_blocks__ports__tests__draw_blocks_ports_custom_colors_state-4.snap} (96%) diff --git a/src/ui/draw_blocks/mod.rs b/src/ui/draw_blocks/mod.rs index 2a705b0..f729c90 100644 --- a/src/ui/draw_blocks/mod.rs +++ b/src/ui/draw_blocks/mod.rs @@ -35,13 +35,17 @@ a8" "8a `Y8, ,8P' 88 ,a8" a8P_____88 88P' "Y8 `"YbbdP"' 8P' `Y8 88 `Y8a `"Ybbd8"' 88 "#; pub const NAME: &str = env!("CARGO_PKG_NAME"); -pub const VERSION: &str = env!("CARGO_PKG_VERSION"); pub const REPO: &str = env!("CARGO_PKG_REPOSITORY"); pub const DESCRIPTION: &str = env!("CARGO_PKG_DESCRIPTION"); pub const MARGIN: &str = " "; pub const RIGHT_ARROW: &str = "▶ "; pub const CIRCLE: &str = "⚪ "; +#[cfg(not(test))] +pub const VERSION: &str = env!("CARGO_PKG_VERSION"); +#[cfg(test)] +pub const VERSION: &str = "0.00.000"; + pub const CONSTRAINT_50_50: [Constraint; 2] = [Constraint::Percentage(50), Constraint::Percentage(50)]; pub const CONSTRAINT_100: [Constraint; 1] = [Constraint::Percentage(100)]; diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__error__tests__draw_blocks_error_docker_connect_error.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__error__tests__draw_blocks_error_docker_connect_error.snap index 050fc2f..629c56a 100644 --- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__error__tests__draw_blocks_error_docker_connect_error.snap +++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__error__tests__draw_blocks_error_docker_connect_error.snap @@ -7,7 +7,7 @@ expression: setup.terminal.backend() "│ │" "│ Unable to access docker daemon │" "│ │" -"│ oxker::v0.10.0 closing in 04 seconds │" +"│ oxker::v0.00.000 closing in 04 seconds │" "│ │" "╰────────────────────────────────────────────╯" " " diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help.snap index 2d2ff4a..01c97c2 100644 --- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help.snap +++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help.snap @@ -3,7 +3,7 @@ source: src/ui/draw_blocks/help.rs expression: setup.terminal.backend() --- " " -" ╭ 0.10.0 ───────────────────────────────────────────────────────────────────────────╮ " +" ╭ 0.00.000 ─────────────────────────────────────────────────────────────────────────╮ " " │ │ " " │ 88 │ " " │ 88 │ " diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_colors.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_colors.snap index 2d2ff4a..01c97c2 100644 --- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_colors.snap +++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_colors.snap @@ -3,7 +3,7 @@ source: src/ui/draw_blocks/help.rs expression: setup.terminal.backend() --- " " -" ╭ 0.10.0 ───────────────────────────────────────────────────────────────────────────╮ " +" ╭ 0.00.000 ─────────────────────────────────────────────────────────────────────────╮ " " │ │ " " │ 88 │ " " │ 88 │ " diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_one_definition.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_one_definition.snap index eb31006..52a69ec 100644 --- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_one_definition.snap +++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_one_definition.snap @@ -3,7 +3,7 @@ source: src/ui/draw_blocks/help.rs expression: setup.terminal.backend() --- " " -" ╭ 0.10.0 ────────────────────────────────────────────────────────────────────────────────────╮ " +" ╭ 0.00.000 ──────────────────────────────────────────────────────────────────────────────────╮ " " │ │ " " │ 88 │ " " │ 88 │ " diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_two_definitions.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_two_definitions.snap index af0f4d3..1e0241e 100644 --- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_two_definitions.snap +++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_two_definitions.snap @@ -3,7 +3,7 @@ source: src/ui/draw_blocks/help.rs expression: setup.terminal.backend() --- " " -" ╭ 0.10.0 ──────────────────────────────────────────────────────────────────────────────────────────────────╮ " +" ╭ 0.00.000 ────────────────────────────────────────────────────────────────────────────────────────────────╮ " " │ │ " " │ 88 │ " " │ 88 │ " diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_one_and_two_definitions.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_one_and_two_definitions.snap index 9411081..7278795 100644 --- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_one_and_two_definitions.snap +++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_one_and_two_definitions.snap @@ -3,7 +3,7 @@ source: src/ui/draw_blocks/help.rs expression: setup.terminal.backend() --- " " -" ╭ 0.10.0 ──────────────────────────────────────────────────────────────────────────────────────────────────╮ " +" ╭ 0.00.000 ────────────────────────────────────────────────────────────────────────────────────────────────╮ " " │ │ " " │ 88 │ " " │ 88 │ " diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_show_timezone.snap b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_show_timezone.snap index 7a205e9..ea369da 100644 --- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_show_timezone.snap +++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_show_timezone.snap @@ -3,7 +3,7 @@ source: src/ui/draw_blocks/help.rs expression: setup.terminal.backend() --- " " -" ╭ 0.10.0 ───────────────────────────────────────────────────────────────────────────╮ " +" ╭ 0.00.000 ─────────────────────────────────────────────────────────────────────────╮ " " │ │ " " │ 88 │ " " │ 88 │ " diff --git a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__ports__tests__draw_blocks_ports_custom_colors_state-4.snap.new b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__ports__tests__draw_blocks_ports_custom_colors_state-4.snap similarity index 96% rename from src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__ports__tests__draw_blocks_ports_custom_colors_state-4.snap.new rename to src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__ports__tests__draw_blocks_ports_custom_colors_state-4.snap index b95ceea..704a66e 100644 --- a/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__ports__tests__draw_blocks_ports_custom_colors_state-4.snap.new +++ b/src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__ports__tests__draw_blocks_ports_custom_colors_state-4.snap @@ -1,6 +1,5 @@ --- source: src/ui/draw_blocks/ports.rs -assertion_line: 381 expression: setup.terminal.backend() --- "╭─────────── ports ────────────╮" From 1345ecb1a2b17ad3d288f2de2058c0777b84f93b Mon Sep 17 00:00:00 2001 From: Jack Wills <32690432+mrjackwills@users.noreply.github.com> Date: Sat, 19 Apr 2025 16:00:38 +0000 Subject: [PATCH 2/4] chore: dependencies updated --- Cargo.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5d1571f..331e6df 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -234,9 +234,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.36" +version = "4.5.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2df961d8c8a0d08aa9945718ccf584145eee3f3aa06cddbeac12933781102e04" +checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071" dependencies = [ "clap_builder", "clap_derive", @@ -244,9 +244,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.36" +version = "4.5.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "132dbda40fb6753878316a489d5a1242a8ef2f0d9e47ba01c951ea8aa7d013a5" +checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2" dependencies = [ "anstream", "anstyle", @@ -1595,9 +1595,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.2" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +checksum = "c28b4eafe8a2d82f83559ef5941afff1ccba3da8e375c8f148efd75df181bf4f" dependencies = [ "libc", ] From 47e685ee8adf47a07cd53574048175e1b8d9d523 Mon Sep 17 00:00:00 2001 From: Jack Wills <32690432+mrjackwills@users.noreply.github.com> Date: Sat, 19 Apr 2025 16:02:51 +0000 Subject: [PATCH 3/4] docs: changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 73cf283..2c1fa75 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +### Chores ++ dependencies updated, [1345ecb1a2b17ad3d288f2de2058c0777b84f93b] + +### Tests ++ use a fixed version String, `0.00.000`, in tests, [230174b3c327c3f217cdcf8fce07d5d9ddea1033] + # v0.10.1 ### 2025-04-18 From fcebfaede8489c6199f290d3ad41933b496e4dc2 Mon Sep 17 00:00:00 2001 From: Jack Wills <32690432+mrjackwills@users.noreply.github.com> Date: Sat, 19 Apr 2025 16:52:11 +0000 Subject: [PATCH 4/4] chore: release v0.10.2 --- .github/release-body.md | 18 +++--------------- CHANGELOG.md | 7 +++++-- Cargo.lock | 2 +- Cargo.toml | 2 +- 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/.github/release-body.md b/.github/release-body.md index cae1958..6c315b1 100644 --- a/.github/release-body.md +++ b/.github/release-body.md @@ -1,21 +1,9 @@ -### 2025-04-18 +### 2025-04-19 ### Chores -+ dependencies updated, [8f959c5408995527485e817514c3f4a10bca31bd], [69d1801ea1e71e7d84c00fb2142ba27577e3bb73], [188490e13fd1255eecb305ac0a99a7a1913e0294] -+ Rust 1.86.0 linting, [9acf60334c5224faa9ee4ecf7030b2e9b13b7d67] - -### Docs -+ comment typo, [723b220c6aa6393b8eebd84a6ddba69f35dc18b8] - -### Fixes -+ github workflow update, [997eebca20a2883dcfcb35009dd4d7b0d438dec6] -+ config merging, [a468827f02c5243b9bd4e0183fed16854ae6c851] - -### Refactors -+ rename ChartType to ChartVariant, [bca67116f3b71451156a39a7b0957568b26fa183], [d0caa9271b6f92f52ccfe3dec69708efe54e5170] -+ rename FileType to FileFormat, [848f64d0da429e547a2f6c8de62e4da5f5c9a187] ++ dependencies updated, [1345ecb1a2b17ad3d288f2de2058c0777b84f93b] ### Tests -+ Use insta, closes #57, [9362d7b481ea22eab6f902dc7f3c10150c7ddf22] ++ use a fixed version String, `0.00.000`, in tests, [230174b3c327c3f217cdcf8fce07d5d9ddea1033] see CHANGELOG.md for more details diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c1fa75..85652ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,11 @@ +# v0.10.2 +### 2025-04-19 + ### Chores -+ dependencies updated, [1345ecb1a2b17ad3d288f2de2058c0777b84f93b] ++ dependencies updated, [1345ecb1](https://github.com/mrjackwills/oxker/commit/1345ecb1a2b17ad3d288f2de2058c0777b84f93b) ### Tests -+ use a fixed version String, `0.00.000`, in tests, [230174b3c327c3f217cdcf8fce07d5d9ddea1033] ++ use a fixed version String, `0.00.000`, in tests, [230174b3](https://github.com/mrjackwills/oxker/commit/230174b3c327c3f217cdcf8fce07d5d9ddea1033) # v0.10.1 ### 2025-04-18 diff --git a/Cargo.lock b/Cargo.lock index 331e6df..4571690 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1200,7 +1200,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "oxker" -version = "0.10.1" +version = "0.10.2" dependencies = [ "anyhow", "bollard", diff --git a/Cargo.toml b/Cargo.toml index 699e9f1..e325408 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "oxker" -version = "0.10.1" +version = "0.10.2" edition = "2024" authors = ["Jack Wills "] description = "A simple tui to view & control docker containers"