niko/oxkerclone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: merge release-v0.10.3 into main

Browse Source
This commit is contained in:
Jack Wills
2025-04-22 16:11:52 +00:00
parent e158522fd0 6df2882e5a
commit 4d62a9b533
9 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/release-body.md
+3 -3
View File
@@ -1,9 +1,9 @@
### 2025-04-19 ### 2025-04-22
### Chores ### Chores
+ dependencies updated, [1345ecb1a2b17ad3d288f2de2058c0777b84f93b] + dependencies updated, [bbfd2462a1f45008587b488e8c6049ee76da72f2]
### Tests ### Tests
+ use a fixed version String, `0.00.000`, in tests, [230174b3c327c3f217cdcf8fce07d5d9ddea1033] + fix tests for MacOS, closes #61, [cfc2decd8d237f1ac3f0bdb2b3d5581684064448]
see <a href='https://github.com/mrjackwills/oxker/blob/main/CHANGELOG.md'>CHANGELOG.md</a> for more details see <a href='https://github.com/mrjackwills/oxker/blob/main/CHANGELOG.md'>CHANGELOG.md</a> for more details
CHANGELOG.md
+9
View File
@@ -1,3 +1,12 @@
# <a href='https://github.com/mrjackwills/oxker/releases/tag/v0.10.3'>v0.10.3</a>
### 2025-04-22
### Chores
+ dependencies updated, [bbfd2462](https://github.com/mrjackwills/oxker/commit/bbfd2462a1f45008587b488e8c6049ee76da72f2)
### Tests
+ fix tests for MacOS, closes [#61](https://github.com/mrjackwills/oxker/issues/61), [cfc2decd](https://github.com/mrjackwills/oxker/commit/cfc2decd8d237f1ac3f0bdb2b3d5581684064448)
# <a href='https://github.com/mrjackwills/oxker/releases/tag/v0.10.2'>v0.10.2</a> # <a href='https://github.com/mrjackwills/oxker/releases/tag/v0.10.2'>v0.10.2</a>
### 2025-04-19 ### 2025-04-19
Cargo.lock
Generated
+7 -7
View File
@@ -992,9 +992,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
[[package]] [[package]]
name = "jiff" name = "jiff"
version = "0.2.8" version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5ad87c89110f55e4cd4dc2893a9790820206729eaf221555f742d540b0724a0" checksum = "5a064218214dc6a10fbae5ec5fa888d80c45d611aba169222fc272072bf7aef6"
dependencies = [ dependencies = [
"jiff-static", "jiff-static",
"jiff-tzdb", "jiff-tzdb",
@@ -1008,9 +1008,9 @@ dependencies = [
[[package]] [[package]]
name = "jiff-static" name = "jiff-static"
version = "0.2.8" version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d076d5b64a7e2fe6f0743f02c43ca4a6725c0f904203bfe276a5b3e793103605" checksum = "199b7932d97e325aff3a7030e141eafe7f2c6268e1d1b24859b753a627f45254"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@@ -1200,7 +1200,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]] [[package]]
name = "oxker" name = "oxker"
version = "0.10.2" version = "0.10.3"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bollard", "bollard",
@@ -1595,9 +1595,9 @@ dependencies = [
[[package]] [[package]]
name = "signal-hook-registry" name = "signal-hook-registry"
version = "1.4.3" version = "1.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c28b4eafe8a2d82f83559ef5941afff1ccba3da8e375c8f148efd75df181bf4f" checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410"
dependencies = [ dependencies = [
"libc", "libc",
] ]
Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "oxker" name = "oxker"
version = "0.10.2" version = "0.10.3"
edition = "2024" edition = "2024"
authors = ["Jack Wills <email@mrjackwills.com>"] authors = ["Jack Wills <email@mrjackwills.com>"]
description = "A simple tui to view & control docker containers" description = "A simple tui to view & control docker containers"
src/config/keymap_parser.rs
+6 -2
View File
@@ -215,6 +215,8 @@ impl From<Option<ConfigKeymap>> for Keymap {
impl Keymap { impl Keymap {
/// Try to parse a &[String] into a Vec of keycodes, at most the output will have 2 entries /// Try to parse a &[String] into a Vec of keycodes, at most the output will have 2 entries
/// This might fail on MacOS due to Backspace and Delete working in a different manner as to how they work on Linux & Windows
/// I think that on MacOS `Del` becomes `Fwd Del`, and `Backspace` becomes `Delete`
fn try_parse_keycode(input: &[String]) -> Option<Vec<KeyCode>> { fn try_parse_keycode(input: &[String]) -> Option<Vec<KeyCode>> {
let mut output = vec![]; let mut output = vec![];
@@ -245,8 +247,10 @@ impl Keymap {
"f10" => Some(KeyCode::F(10)), "f10" => Some(KeyCode::F(10)),
"f11" => Some(KeyCode::F(11)), "f11" => Some(KeyCode::F(11)),
"f12" => Some(KeyCode::F(12)), "f12" => Some(KeyCode::F(12)),
// Might fail on MacOS, see note above
"backspace" => Some(KeyCode::Backspace), "backspace" => Some(KeyCode::Backspace),
"backtab" => Some(KeyCode::BackTab), "backtab" => Some(KeyCode::BackTab),
// Might fail on MacOS, see note above
"delete" => Some(KeyCode::Delete), "delete" => Some(KeyCode::Delete),
"down" => Some(KeyCode::Down), "down" => Some(KeyCode::Down),
"end" => Some(KeyCode::End), "end" => Some(KeyCode::End),
@@ -394,7 +398,7 @@ mod tests {
sort_by_id: gen_v(("[", "]")), sort_by_id: gen_v(("[", "]")),
sort_by_image: gen_v(("A", "B")), sort_by_image: gen_v(("A", "B")),
sort_by_rx: gen_v(("C", "D")), sort_by_rx: gen_v(("C", "D")),
sort_by_tx: gen_v(("backspace", "TAB")), sort_by_tx: gen_v(("insert", "TAB")),
sort_reset: gen_v(("up", "down")), sort_reset: gen_v(("up", "down")),
toggle_help: gen_v(("home", "end")), toggle_help: gen_v(("home", "end")),
toggle_mouse_capture: gen_v(("pagedown", "PAGEUP")), toggle_mouse_capture: gen_v(("pagedown", "PAGEUP")),
@@ -426,7 +430,7 @@ mod tests {
sort_by_id: (KeyCode::Char('['), Some(KeyCode::Char(']'))), sort_by_id: (KeyCode::Char('['), Some(KeyCode::Char(']'))),
sort_by_image: (KeyCode::Char('A'), Some(KeyCode::Char('B'))), sort_by_image: (KeyCode::Char('A'), Some(KeyCode::Char('B'))),
sort_by_rx: (KeyCode::Char('C'), Some(KeyCode::Char('D'))), sort_by_rx: (KeyCode::Char('C'), Some(KeyCode::Char('D'))),
sort_by_tx: (KeyCode::Backspace, Some(KeyCode::Tab)), sort_by_tx: (KeyCode::Insert, Some(KeyCode::Tab)),
sort_reset: (KeyCode::Up, Some(KeyCode::Down)), sort_reset: (KeyCode::Up, Some(KeyCode::Down)),
toggle_help: (KeyCode::Home, Some(KeyCode::End)), toggle_help: (KeyCode::Home, Some(KeyCode::End)),
toggle_mouse_capture: (KeyCode::PageDown, Some(KeyCode::PageUp)), toggle_mouse_capture: (KeyCode::PageDown, Some(KeyCode::PageUp)),
src/ui/draw_blocks/help.rs
+4 -4
View File
@@ -581,7 +581,7 @@ mod tests {
sort_by_id: (KeyCode::Char('/'), None), sort_by_id: (KeyCode::Char('/'), None),
sort_by_image: (KeyCode::Char(','), None), sort_by_image: (KeyCode::Char(','), None),
sort_by_rx: (KeyCode::Char('.'), None), sort_by_rx: (KeyCode::Char('.'), None),
sort_by_tx: (KeyCode::Backspace, None), sort_by_tx: (KeyCode::Insert, None),
sort_reset: (KeyCode::Up, None), sort_reset: (KeyCode::Up, None),
toggle_help: (KeyCode::Home, None), toggle_help: (KeyCode::Home, None),
toggle_mouse_capture: (KeyCode::PageDown, None), toggle_mouse_capture: (KeyCode::PageDown, None),
@@ -626,9 +626,9 @@ mod tests {
sort_by_id: (KeyCode::Char('/'), Some(KeyCode::Char('='))), sort_by_id: (KeyCode::Char('/'), Some(KeyCode::Char('='))),
sort_by_image: (KeyCode::Char(','), Some(KeyCode::Char('\\'))), sort_by_image: (KeyCode::Char(','), Some(KeyCode::Char('\\'))),
sort_by_rx: (KeyCode::Char('.'), Some(KeyCode::Char(']'))), sort_by_rx: (KeyCode::Char('.'), Some(KeyCode::Char(']'))),
sort_by_tx: (KeyCode::Backspace, Some(KeyCode::BackTab)), sort_by_tx: (KeyCode::Insert, Some(KeyCode::BackTab)),
sort_reset: (KeyCode::Up, Some(KeyCode::Down)), sort_reset: (KeyCode::Up, Some(KeyCode::Down)),
toggle_help: (KeyCode::Home, Some(KeyCode::Delete)), toggle_help: (KeyCode::Home, Some(KeyCode::End)),
toggle_mouse_capture: (KeyCode::PageDown, Some(KeyCode::PageUp)), toggle_mouse_capture: (KeyCode::PageDown, Some(KeyCode::PageUp)),
}; };
@@ -671,7 +671,7 @@ mod tests {
sort_by_id: (KeyCode::Char('/'), Some(KeyCode::Char('='))), sort_by_id: (KeyCode::Char('/'), Some(KeyCode::Char('='))),
sort_by_image: (KeyCode::Char(','), None), sort_by_image: (KeyCode::Char(','), None),
sort_by_rx: (KeyCode::Char('.'), Some(KeyCode::Char(']'))), sort_by_rx: (KeyCode::Char('.'), Some(KeyCode::Char(']'))),
sort_by_tx: (KeyCode::Backspace, None), sort_by_tx: (KeyCode::Insert, None),
sort_reset: (KeyCode::Up, Some(KeyCode::Down)), sort_reset: (KeyCode::Up, Some(KeyCode::Down)),
toggle_help: (KeyCode::Home, None), toggle_help: (KeyCode::Home, None),
toggle_mouse_capture: (KeyCode::PageDown, Some(KeyCode::PageUp)), toggle_mouse_capture: (KeyCode::PageDown, Some(KeyCode::PageUp)),
src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_one_definition.snap
+1 -1
View File
@@ -39,7 +39,7 @@ expression: setup.terminal.backend()
" │ ( / ) sort containers by id │ " " │ ( / ) sort containers by id │ "
" │ ( , ) sort containers by image │ " " │ ( , ) sort containers by image │ "
" │ ( . ) sort containers by rx │ " " │ ( . ) sort containers by rx │ "
" │ ( Backspace ) sort containers by tx │ " " │ ( Insert ) sort containers by tx │ "
" │ ( a ) close dialog │ " " │ ( a ) close dialog │ "
" │ ( k ) quit at any time │ " " │ ( k ) quit at any time │ "
" │ │ " " │ │ "
src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_custom_keymap_two_definitions.snap
+2 -2
View File
@@ -26,7 +26,7 @@ expression: setup.terminal.backend()
" │ ( u ) or ( v ) scroll list to start │ " " │ ( u ) or ( v ) scroll list to start │ "
" │ ( enter ) send docker container command │ " " │ ( enter ) send docker container command │ "
" │ ( g ) or ( h ) exec into a container │ " " │ ( g ) or ( h ) exec into a container │ "
" │ ( Home ) or ( Del ) toggle this help information - or click heading │ " " │ ( Home ) or ( End ) toggle this help information - or click heading │ "
" │ ( m ) or ( n ) save logs to file │ " " │ ( m ) or ( n ) save logs to file │ "
" │ ( Page Down ) or ( Page Up ) toggle mouse capture - if disabled, text on screen can be selected & copied │ " " │ ( Page Down ) or ( Page Up ) toggle mouse capture - if disabled, text on screen can be selected & copied │ "
" │ ( i ) or ( j ) enter filter mode │ " " │ ( i ) or ( j ) enter filter mode │ "
@@ -39,7 +39,7 @@ expression: setup.terminal.backend()
" │ ( / ) or ( = ) sort containers by id │ " " │ ( / ) or ( = ) sort containers by id │ "
" │ ( , ) or ( \ ) sort containers by image │ " " │ ( , ) or ( \ ) sort containers by image │ "
" │ ( . ) or ( ] ) sort containers by rx │ " " │ ( . ) or ( ] ) sort containers by rx │ "
" │ ( Backspace ) or ( Back Tab ) sort containers by tx │ " " │ ( Insert ) or ( Back Tab ) sort containers by tx │ "
" │ ( a ) or ( b ) close dialog │ " " │ ( a ) or ( b ) close dialog │ "
" │ ( k ) or ( l ) quit at any time │ " " │ ( k ) or ( l ) quit at any time │ "
" │ │ " " │ │ "
src/ui/draw_blocks/snapshots/oxker__ui__draw_blocks__help__tests__draw_blocks_help_one_and_two_definitions.snap
+1 -1
View File
@@ -39,7 +39,7 @@ expression: setup.terminal.backend()
" │ ( / ) or ( = ) sort containers by id │ " " │ ( / ) or ( = ) sort containers by id │ "
" │ ( , ) sort containers by image │ " " │ ( , ) sort containers by image │ "
" │ ( . ) or ( ] ) sort containers by rx │ " " │ ( . ) or ( ] ) sort containers by rx │ "
" │ ( Backspace ) sort containers by tx │ " " │ ( Insert ) sort containers by tx │ "
" │ ( a ) or ( b ) close dialog │ " " │ ( a ) or ( b ) close dialog │ "
" │ ( k ) quit at any time │ " " │ ( k ) quit at any time │ "
" │ │ " " │ │ "