From 094f69a122e3c36fa43e409f3687d0747eaa7a9e Mon Sep 17 00:00:00 2001 From: Gabriel Augendre Date: Sun, 5 Dec 2021 20:34:26 +0100 Subject: [PATCH 1/7] Add docker context item --- functions/_tide_item_docker.fish | 10 ++++++++++ functions/_tide_remove_unusable_items.fish | 2 +- functions/tide/configure/configs/classic.fish | 3 +++ .../tide/configure/configs/classic_16color.fish | 2 ++ functions/tide/configure/configs/lean.fish | 3 +++ functions/tide/configure/configs/lean_16color.fish | 2 ++ functions/tide/configure/configs/rainbow.fish | 3 +++ .../tide/configure/configs/rainbow_16color.fish | 2 ++ tests/_tide_item_docker.test.fish | 13 +++++++++++++ 9 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 functions/_tide_item_docker.fish create mode 100644 tests/_tide_item_docker.test.fish diff --git a/functions/_tide_item_docker.fish b/functions/_tide_item_docker.fish new file mode 100644 index 00000000..5ea1f04d --- /dev/null +++ b/functions/_tide_item_docker.fish @@ -0,0 +1,10 @@ +function _tide_item_docker + set -l context (_tide_item_docker_replace_ignore_result (docker context show 2>/dev/null)) && + test -n "$context" && + _tide_print_item docker $tide_docker_icon' ' $context +end + +function _tide_item_docker_replace_ignore_result + string replace --regex '^default$' '' $argv + return 0 +end diff --git a/functions/_tide_remove_unusable_items.fish b/functions/_tide_remove_unusable_items.fish index d885cf45..ea0a4ba0 100644 --- a/functions/_tide_remove_unusable_items.fish +++ b/functions/_tide_remove_unusable_items.fish @@ -1,6 +1,6 @@ function _tide_remove_unusable_items # Remove tool-specific items for tools the machine doesn't have installed - for item in chruby git go kubectl node php rustc terraform virtual_env + for item in chruby git go kubectl node php rustc terraform virtual_env docker set -l cli_names $item switch $item case virtual_env diff --git a/functions/tide/configure/configs/classic.fish b/functions/tide/configure/configs/classic.fish index fcbe1c4c..c8f4f7d1 100644 --- a/functions/tide/configure/configs/classic.fish +++ b/functions/tide/configure/configs/classic.fish @@ -38,6 +38,9 @@ tide_jobs_icon '' tide_kubectl_bg_color 444444 tide_kubectl_color 326CE5 tide_kubectl_icon '⎈' +tide_docker_bg_color 444444 +tide_docker_color 2898E8 +tide_docker_icon '' tide_left_prompt_frame_enabled true tide_left_prompt_items pwd git newline tide_left_prompt_prefix '' diff --git a/functions/tide/configure/configs/classic_16color.fish b/functions/tide/configure/configs/classic_16color.fish index d3a505f9..b088154c 100644 --- a/functions/tide/configure/configs/classic_16color.fish +++ b/functions/tide/configure/configs/classic_16color.fish @@ -25,6 +25,8 @@ tide_jobs_bg_color black tide_jobs_color green tide_kubectl_bg_color black tide_kubectl_color blue +tide_docker_bg_color black +tide_docker_color blue tide_node_bg_color black tide_node_color green tide_os_bg_color black diff --git a/functions/tide/configure/configs/lean.fish b/functions/tide/configure/configs/lean.fish index ba459733..aa422a40 100644 --- a/functions/tide/configure/configs/lean.fish +++ b/functions/tide/configure/configs/lean.fish @@ -38,6 +38,9 @@ tide_jobs_icon '' tide_kubectl_bg_color normal tide_kubectl_color 326CE5 tide_kubectl_icon '⎈' +tide_docker_bg_color normal +tide_docker_color 2898E8 +tide_docker_icon '' tide_left_prompt_frame_enabled false tide_left_prompt_items pwd git newline character tide_left_prompt_prefix '' diff --git a/functions/tide/configure/configs/lean_16color.fish b/functions/tide/configure/configs/lean_16color.fish index ead6e6f7..10f6a565 100644 --- a/functions/tide/configure/configs/lean_16color.fish +++ b/functions/tide/configure/configs/lean_16color.fish @@ -25,6 +25,8 @@ tide_jobs_bg_color normal tide_jobs_color green tide_kubectl_bg_color normal tide_kubectl_color blue +tide_docker_bg_color normal +tide_docker_color blue tide_node_bg_color normal tide_node_color green tide_os_bg_color normal diff --git a/functions/tide/configure/configs/rainbow.fish b/functions/tide/configure/configs/rainbow.fish index 39afcbc7..1bbfb07a 100644 --- a/functions/tide/configure/configs/rainbow.fish +++ b/functions/tide/configure/configs/rainbow.fish @@ -38,6 +38,9 @@ tide_jobs_icon '' tide_kubectl_bg_color 326CE5 tide_kubectl_color 000000 tide_kubectl_icon '⎈' +tide_docker_bg_color 2898E8 +tide_docker_color 000000 +tide_docker_icon '' tide_left_prompt_frame_enabled true tide_left_prompt_items pwd git newline tide_left_prompt_prefix '' diff --git a/functions/tide/configure/configs/rainbow_16color.fish b/functions/tide/configure/configs/rainbow_16color.fish index c38b6c51..5cba62d6 100644 --- a/functions/tide/configure/configs/rainbow_16color.fish +++ b/functions/tide/configure/configs/rainbow_16color.fish @@ -25,6 +25,8 @@ tide_jobs_bg_color brblack tide_jobs_color green tide_kubectl_bg_color blue tide_kubectl_color black +tide_docker_bg_color blue +tide_docker_color black tide_node_bg_color green tide_node_color black tide_os_bg_color white diff --git a/tests/_tide_item_docker.test.fish b/tests/_tide_item_docker.test.fish new file mode 100644 index 00000000..2bb85a02 --- /dev/null +++ b/tests/_tide_item_docker.test.fish @@ -0,0 +1,13 @@ +# RUN: %fish %s + +function _docker + _tide_decolor (_tide_item_docker) +end + +set -lx tide_docker_icon  + +mock docker "context show" "printf default" +_docker # CHECK: + +mock docker "context show" "printf curr-context" +_docker # CHECK:  curr-context From 4c871ee9189d638fac1683d55797ad0da57d14bf Mon Sep 17 00:00:00 2001 From: Gabriel Augendre Date: Mon, 6 Dec 2021 18:07:03 +0100 Subject: [PATCH 2/7] Use docker context inspect instead of show The latter is not available on all systems. --- functions/_tide_item_docker.fish | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/_tide_item_docker.fish b/functions/_tide_item_docker.fish index 5ea1f04d..0a248b83 100644 --- a/functions/_tide_item_docker.fish +++ b/functions/_tide_item_docker.fish @@ -1,5 +1,5 @@ function _tide_item_docker - set -l context (_tide_item_docker_replace_ignore_result (docker context show 2>/dev/null)) && + set -l context (_tide_item_docker_replace_ignore_result (docker context inspect --format "{{.Name}}" 2>/dev/null)) && test -n "$context" && _tide_print_item docker $tide_docker_icon' ' $context end From b34b572e1b4d5ab5b7c59554e070b0c4aecb1923 Mon Sep 17 00:00:00 2001 From: Gabriel Augendre Date: Mon, 6 Dec 2021 18:08:35 +0100 Subject: [PATCH 3/7] Fix tests --- tests/_tide_item_docker.test.fish | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/_tide_item_docker.test.fish b/tests/_tide_item_docker.test.fish index 2bb85a02..019f91af 100644 --- a/tests/_tide_item_docker.test.fish +++ b/tests/_tide_item_docker.test.fish @@ -6,8 +6,8 @@ end set -lx tide_docker_icon  -mock docker "context show" "printf default" +mock docker "context inspect" "printf default" _docker # CHECK: -mock docker "context show" "printf curr-context" +mock docker "context inspect" "printf curr-context" _docker # CHECK:  curr-context From cbbcd52b5a0b8388ed596bff9ccf78b6c47cc05c Mon Sep 17 00:00:00 2001 From: Ilan Cosman Date: Fri, 10 Dec 2021 09:36:42 -0800 Subject: [PATCH 4/7] Slim down item --- functions/_tide_item_docker.fish | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/functions/_tide_item_docker.fish b/functions/_tide_item_docker.fish index 0a248b83..6bcc23f4 100644 --- a/functions/_tide_item_docker.fish +++ b/functions/_tide_item_docker.fish @@ -1,10 +1,4 @@ function _tide_item_docker - set -l context (_tide_item_docker_replace_ignore_result (docker context inspect --format "{{.Name}}" 2>/dev/null)) && - test -n "$context" && - _tide_print_item docker $tide_docker_icon' ' $context -end - -function _tide_item_docker_replace_ignore_result - string replace --regex '^default$' '' $argv - return 0 + docker context inspect --format '{{.Name}}' | read -l context + test "$context" != default && _tide_print_item docker $tide_docker_icon' ' $context end From bc2e09feeadc566eb1b62acfcea500cdd708394b Mon Sep 17 00:00:00 2001 From: Ilan Cosman Date: Fri, 10 Dec 2021 09:40:43 -0800 Subject: [PATCH 5/7] Fix docker colors --- functions/tide/configure/configs/classic.fish | 2 +- functions/tide/configure/configs/classic_16color.fish | 2 +- functions/tide/configure/configs/lean.fish | 2 +- functions/tide/configure/configs/lean_16color.fish | 2 +- functions/tide/configure/configs/rainbow.fish | 2 +- functions/tide/configure/configs/rainbow_16color.fish | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/functions/tide/configure/configs/classic.fish b/functions/tide/configure/configs/classic.fish index c8f4f7d1..3764f7ac 100644 --- a/functions/tide/configure/configs/classic.fish +++ b/functions/tide/configure/configs/classic.fish @@ -39,7 +39,7 @@ tide_kubectl_bg_color 444444 tide_kubectl_color 326CE5 tide_kubectl_icon '⎈' tide_docker_bg_color 444444 -tide_docker_color 2898E8 +tide_docker_color 2496ED tide_docker_icon '' tide_left_prompt_frame_enabled true tide_left_prompt_items pwd git newline diff --git a/functions/tide/configure/configs/classic_16color.fish b/functions/tide/configure/configs/classic_16color.fish index b088154c..06b9ad5b 100644 --- a/functions/tide/configure/configs/classic_16color.fish +++ b/functions/tide/configure/configs/classic_16color.fish @@ -26,7 +26,7 @@ tide_jobs_color green tide_kubectl_bg_color black tide_kubectl_color blue tide_docker_bg_color black -tide_docker_color blue +tide_docker_color brblue tide_node_bg_color black tide_node_color green tide_os_bg_color black diff --git a/functions/tide/configure/configs/lean.fish b/functions/tide/configure/configs/lean.fish index aa422a40..dc39a61a 100644 --- a/functions/tide/configure/configs/lean.fish +++ b/functions/tide/configure/configs/lean.fish @@ -39,7 +39,7 @@ tide_kubectl_bg_color normal tide_kubectl_color 326CE5 tide_kubectl_icon '⎈' tide_docker_bg_color normal -tide_docker_color 2898E8 +tide_docker_color 2496ED tide_docker_icon '' tide_left_prompt_frame_enabled false tide_left_prompt_items pwd git newline character diff --git a/functions/tide/configure/configs/lean_16color.fish b/functions/tide/configure/configs/lean_16color.fish index 10f6a565..f177b959 100644 --- a/functions/tide/configure/configs/lean_16color.fish +++ b/functions/tide/configure/configs/lean_16color.fish @@ -26,7 +26,7 @@ tide_jobs_color green tide_kubectl_bg_color normal tide_kubectl_color blue tide_docker_bg_color normal -tide_docker_color blue +tide_docker_color brblue tide_node_bg_color normal tide_node_color green tide_os_bg_color normal diff --git a/functions/tide/configure/configs/rainbow.fish b/functions/tide/configure/configs/rainbow.fish index 1bbfb07a..da7e111e 100644 --- a/functions/tide/configure/configs/rainbow.fish +++ b/functions/tide/configure/configs/rainbow.fish @@ -38,7 +38,7 @@ tide_jobs_icon '' tide_kubectl_bg_color 326CE5 tide_kubectl_color 000000 tide_kubectl_icon '⎈' -tide_docker_bg_color 2898E8 +tide_docker_bg_color 2496ED tide_docker_color 000000 tide_docker_icon '' tide_left_prompt_frame_enabled true diff --git a/functions/tide/configure/configs/rainbow_16color.fish b/functions/tide/configure/configs/rainbow_16color.fish index 5cba62d6..4bc229c1 100644 --- a/functions/tide/configure/configs/rainbow_16color.fish +++ b/functions/tide/configure/configs/rainbow_16color.fish @@ -25,7 +25,7 @@ tide_jobs_bg_color brblack tide_jobs_color green tide_kubectl_bg_color blue tide_kubectl_color black -tide_docker_bg_color blue +tide_docker_bg_color brblue tide_docker_color black tide_node_bg_color green tide_node_color black From e3ff6a7427081973f6b651997e7284a29291a2e4 Mon Sep 17 00:00:00 2001 From: Ilan Cosman Date: Fri, 10 Dec 2021 09:47:02 -0800 Subject: [PATCH 6/7] Use filled in icon --- functions/tide/configure/configs/classic.fish | 2 +- functions/tide/configure/configs/lean.fish | 2 +- functions/tide/configure/configs/rainbow.fish | 2 +- tests/_tide_item_docker.test.fish | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/functions/tide/configure/configs/classic.fish b/functions/tide/configure/configs/classic.fish index 3764f7ac..c298494a 100644 --- a/functions/tide/configure/configs/classic.fish +++ b/functions/tide/configure/configs/classic.fish @@ -40,7 +40,7 @@ tide_kubectl_color 326CE5 tide_kubectl_icon '⎈' tide_docker_bg_color 444444 tide_docker_color 2496ED -tide_docker_icon '' +tide_docker_icon '' tide_left_prompt_frame_enabled true tide_left_prompt_items pwd git newline tide_left_prompt_prefix '' diff --git a/functions/tide/configure/configs/lean.fish b/functions/tide/configure/configs/lean.fish index dc39a61a..72036c73 100644 --- a/functions/tide/configure/configs/lean.fish +++ b/functions/tide/configure/configs/lean.fish @@ -40,7 +40,7 @@ tide_kubectl_color 326CE5 tide_kubectl_icon '⎈' tide_docker_bg_color normal tide_docker_color 2496ED -tide_docker_icon '' +tide_docker_icon '' tide_left_prompt_frame_enabled false tide_left_prompt_items pwd git newline character tide_left_prompt_prefix '' diff --git a/functions/tide/configure/configs/rainbow.fish b/functions/tide/configure/configs/rainbow.fish index da7e111e..0fbd0a2b 100644 --- a/functions/tide/configure/configs/rainbow.fish +++ b/functions/tide/configure/configs/rainbow.fish @@ -40,7 +40,7 @@ tide_kubectl_color 000000 tide_kubectl_icon '⎈' tide_docker_bg_color 2496ED tide_docker_color 000000 -tide_docker_icon '' +tide_docker_icon '' tide_left_prompt_frame_enabled true tide_left_prompt_items pwd git newline tide_left_prompt_prefix '' diff --git a/tests/_tide_item_docker.test.fish b/tests/_tide_item_docker.test.fish index 019f91af..a268f1ca 100644 --- a/tests/_tide_item_docker.test.fish +++ b/tests/_tide_item_docker.test.fish @@ -4,10 +4,10 @@ function _docker _tide_decolor (_tide_item_docker) end -set -lx tide_docker_icon  +set -lx tide_docker_icon  mock docker "context inspect" "printf default" _docker # CHECK: mock docker "context inspect" "printf curr-context" -_docker # CHECK:  curr-context +_docker # CHECK:  curr-context From 33a93af9c7b25d18f1a245d38e96ec38dd579b2f Mon Sep 17 00:00:00 2001 From: Ilan Cosman Date: Fri, 10 Dec 2021 09:55:40 -0800 Subject: [PATCH 7/7] Use blue --- functions/tide/configure/configs/classic_16color.fish | 2 +- functions/tide/configure/configs/lean_16color.fish | 2 +- functions/tide/configure/configs/rainbow_16color.fish | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/functions/tide/configure/configs/classic_16color.fish b/functions/tide/configure/configs/classic_16color.fish index 06b9ad5b..b088154c 100644 --- a/functions/tide/configure/configs/classic_16color.fish +++ b/functions/tide/configure/configs/classic_16color.fish @@ -26,7 +26,7 @@ tide_jobs_color green tide_kubectl_bg_color black tide_kubectl_color blue tide_docker_bg_color black -tide_docker_color brblue +tide_docker_color blue tide_node_bg_color black tide_node_color green tide_os_bg_color black diff --git a/functions/tide/configure/configs/lean_16color.fish b/functions/tide/configure/configs/lean_16color.fish index f177b959..10f6a565 100644 --- a/functions/tide/configure/configs/lean_16color.fish +++ b/functions/tide/configure/configs/lean_16color.fish @@ -26,7 +26,7 @@ tide_jobs_color green tide_kubectl_bg_color normal tide_kubectl_color blue tide_docker_bg_color normal -tide_docker_color brblue +tide_docker_color blue tide_node_bg_color normal tide_node_color green tide_os_bg_color normal diff --git a/functions/tide/configure/configs/rainbow_16color.fish b/functions/tide/configure/configs/rainbow_16color.fish index 4bc229c1..5cba62d6 100644 --- a/functions/tide/configure/configs/rainbow_16color.fish +++ b/functions/tide/configure/configs/rainbow_16color.fish @@ -25,7 +25,7 @@ tide_jobs_bg_color brblack tide_jobs_color green tide_kubectl_bg_color blue tide_kubectl_color black -tide_docker_bg_color brblue +tide_docker_bg_color blue tide_docker_color black tide_node_bg_color green tide_node_color black