From e3786dee1d84a5fe13e8e29ca36029d14162c354 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Tue, 28 Jul 2020 02:17:12 +0300 Subject: [PATCH 1/2] Minor UI improvements --- cli/cli.go | 2 +- cli/executor/executor.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cli/cli.go b/cli/cli.go index c88d09ff..e93d5adb 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -34,7 +34,7 @@ import ( // Application info const ( APP = "bibop" - VER = "2.1.0" + VER = "2.1.1" DESC = "Utility for testing command-line tools" ) diff --git a/cli/executor/executor.go b/cli/executor/executor.go index f4bc6324..eb41746f 100644 --- a/cli/executor/executor.go +++ b/cli/executor/executor.go @@ -241,7 +241,7 @@ func runCommand(e *Executor, c *recipe.Command) bool { for index, action := range c.Actions { if !e.config.Quiet { renderTmpMessage( - " {s-}┖╴{!} {s~-}● {!}"+formatActionName(action)+" {s}%s{!} {s-}[%s]{!}", + " {s-}┖─{!} {s~-}● {!}"+formatActionName(action)+" {s}%s{!} {s-}[%s]{!}", formatActionArgs(action), formatDuration(time.Since(e.start), false), ) @@ -251,14 +251,14 @@ func runCommand(e *Executor, c *recipe.Command) bool { if !e.config.Quiet { if err != nil { - renderTmpMessage(" {s-}┖╴{!} {r}✖ {!}"+formatActionName(action)+" {s}%s{!}", formatActionArgs(action)) + renderTmpMessage(" {s-}┖─{!} {r}✖ {!}"+formatActionName(action)+" {s}%s{!}", formatActionArgs(action)) fmtc.NewLine() fmtc.Printf(" {r}%v{!}\n", err) } else { if index+1 == len(c.Actions) { - renderTmpMessage(" {s-}┖╴{!} {g}✔ {!}"+formatActionName(action)+" {s}%s{!}", formatActionArgs(action)) + renderTmpMessage(" {s-}┖─{!} {g}✔ {!}"+formatActionName(action)+" {s}%s{!}", formatActionArgs(action)) } else { - renderTmpMessage(" {s-}┠╴{!} {g}✔ {!}"+formatActionName(action)+" {s}%s{!}", formatActionArgs(action)) + renderTmpMessage(" {s-}┠─{!} {g}✔ {!}"+formatActionName(action)+" {s}%s{!}", formatActionArgs(action)) } fmtc.NewLine() From 803e0a8a0e1c1aee0c5c062c4c0e0af00232b394 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Tue, 28 Jul 2020 02:23:14 +0300 Subject: [PATCH 2/2] Update ek to the latest version --- Makefile | 6 +++--- action/backup.go | 2 +- action/common.go | 2 +- action/fs.go | 8 ++++---- action/http.go | 2 +- action/io.go | 2 +- action/libs.go | 4 ++-- action/service.go | 2 +- action/system.go | 10 +++++----- action/users.go | 2 +- cli/cli.go | 24 ++++++++++++------------ cli/executor/executor.go | 22 +++++++++++----------- cli/executor/validators.go | 8 ++++---- parser/parser.go | 4 ++-- recipe/recipe.go | 2 +- recipe/runtime_variables.go | 6 +++--- 16 files changed, 53 insertions(+), 53 deletions(-) diff --git a/Makefile b/Makefile index 66fab987..1308fb1d 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ ################################################################################ -# This Makefile generated by GoMakeGen 1.3.0 using next command: +# This Makefile generated by GoMakeGen 1.3.1 using next command: # gomakegen . # # More info: https://kaos.sh/gomakegen @@ -27,7 +27,7 @@ git-config: ## Configure git redirects for stable import path services git config --global http.https://pkg.re.followRedirects true deps: git-config ## Download dependencies - go get -d -v pkg.re/essentialkaos/ek.v11 + go get -d -v pkg.re/essentialkaos/ek.v12 deps-test: git-config ## Download dependencies for tests go get -d -v pkg.re/check.v1 @@ -53,6 +53,6 @@ help: ## Show this info @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) \ | awk 'BEGIN {FS = ":.*?## "}; {printf " \033[33m%-12s\033[0m %s\n", $$1, $$2}' @echo -e '' - @echo -e '\033[90mGenerated by GoMakeGen 1.3.0\033[0m\n' + @echo -e '\033[90mGenerated by GoMakeGen 1.3.1\033[0m\n' ################################################################################ diff --git a/action/backup.go b/action/backup.go index b01230ab..93436cee 100644 --- a/action/backup.go +++ b/action/backup.go @@ -12,7 +12,7 @@ import ( "hash/crc32" "os" - "pkg.re/essentialkaos/ek.v11/fsutil" + "pkg.re/essentialkaos/ek.v12/fsutil" "github.com/essentialkaos/bibop/recipe" ) diff --git a/action/common.go b/action/common.go index 7b411463..6c2095fd 100644 --- a/action/common.go +++ b/action/common.go @@ -13,7 +13,7 @@ import ( "syscall" "time" - "pkg.re/essentialkaos/ek.v11/mathutil" + "pkg.re/essentialkaos/ek.v12/mathutil" "github.com/essentialkaos/bibop/recipe" ) diff --git a/action/fs.go b/action/fs.go index 7c353b35..db70f717 100644 --- a/action/fs.go +++ b/action/fs.go @@ -14,10 +14,10 @@ import ( "os" "strconv" - "pkg.re/essentialkaos/ek.v11/fsutil" - "pkg.re/essentialkaos/ek.v11/hash" - "pkg.re/essentialkaos/ek.v11/strutil" - "pkg.re/essentialkaos/ek.v11/system" + "pkg.re/essentialkaos/ek.v12/fsutil" + "pkg.re/essentialkaos/ek.v12/hash" + "pkg.re/essentialkaos/ek.v12/strutil" + "pkg.re/essentialkaos/ek.v12/system" "github.com/essentialkaos/bibop/recipe" ) diff --git a/action/http.go b/action/http.go index fac629c5..3570e265 100644 --- a/action/http.go +++ b/action/http.go @@ -11,7 +11,7 @@ import ( "fmt" "strings" - "pkg.re/essentialkaos/ek.v11/req" + "pkg.re/essentialkaos/ek.v12/req" "github.com/essentialkaos/bibop/recipe" ) diff --git a/action/io.go b/action/io.go index 9bc4e855..dbf1aaf5 100644 --- a/action/io.go +++ b/action/io.go @@ -15,7 +15,7 @@ import ( "strings" "time" - "pkg.re/essentialkaos/ek.v11/mathutil" + "pkg.re/essentialkaos/ek.v12/mathutil" "github.com/essentialkaos/bibop/output" "github.com/essentialkaos/bibop/recipe" diff --git a/action/libs.go b/action/libs.go index 2176880a..2c03ca0e 100644 --- a/action/libs.go +++ b/action/libs.go @@ -13,8 +13,8 @@ import ( "path/filepath" "strings" - "pkg.re/essentialkaos/ek.v11/fsutil" - "pkg.re/essentialkaos/ek.v11/strutil" + "pkg.re/essentialkaos/ek.v12/fsutil" + "pkg.re/essentialkaos/ek.v12/strutil" "github.com/essentialkaos/bibop/recipe" ) diff --git a/action/service.go b/action/service.go index 593778c0..58b60253 100644 --- a/action/service.go +++ b/action/service.go @@ -10,7 +10,7 @@ package action import ( "fmt" - "pkg.re/essentialkaos/ek.v11/initsystem" + "pkg.re/essentialkaos/ek.v12/initsystem" "github.com/essentialkaos/bibop/recipe" ) diff --git a/action/system.go b/action/system.go index e22d0c39..2faa61c2 100644 --- a/action/system.go +++ b/action/system.go @@ -17,11 +17,11 @@ import ( "syscall" "time" - "pkg.re/essentialkaos/ek.v11/env" - "pkg.re/essentialkaos/ek.v11/fsutil" - "pkg.re/essentialkaos/ek.v11/mathutil" - "pkg.re/essentialkaos/ek.v11/pid" - "pkg.re/essentialkaos/ek.v11/signal" + "pkg.re/essentialkaos/ek.v12/env" + "pkg.re/essentialkaos/ek.v12/fsutil" + "pkg.re/essentialkaos/ek.v12/mathutil" + "pkg.re/essentialkaos/ek.v12/pid" + "pkg.re/essentialkaos/ek.v12/signal" "github.com/essentialkaos/bibop/recipe" ) diff --git a/action/users.go b/action/users.go index ae8f0c2e..8c7d03d3 100644 --- a/action/users.go +++ b/action/users.go @@ -10,7 +10,7 @@ package action import ( "fmt" - "pkg.re/essentialkaos/ek.v11/system" + "pkg.re/essentialkaos/ek.v12/system" "github.com/essentialkaos/bibop/recipe" ) diff --git a/cli/cli.go b/cli/cli.go index e93d5adb..464d6071 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -12,17 +12,17 @@ import ( "os" "path/filepath" - "pkg.re/essentialkaos/ek.v11/fmtc" - "pkg.re/essentialkaos/ek.v11/fmtutil" - "pkg.re/essentialkaos/ek.v11/fsutil" - "pkg.re/essentialkaos/ek.v11/options" - "pkg.re/essentialkaos/ek.v11/req" - "pkg.re/essentialkaos/ek.v11/strutil" - "pkg.re/essentialkaos/ek.v11/usage" - "pkg.re/essentialkaos/ek.v11/usage/completion/bash" - "pkg.re/essentialkaos/ek.v11/usage/completion/fish" - "pkg.re/essentialkaos/ek.v11/usage/completion/zsh" - "pkg.re/essentialkaos/ek.v11/usage/update" + "pkg.re/essentialkaos/ek.v12/fmtc" + "pkg.re/essentialkaos/ek.v12/fmtutil" + "pkg.re/essentialkaos/ek.v12/fsutil" + "pkg.re/essentialkaos/ek.v12/options" + "pkg.re/essentialkaos/ek.v12/req" + "pkg.re/essentialkaos/ek.v12/strutil" + "pkg.re/essentialkaos/ek.v12/usage" + "pkg.re/essentialkaos/ek.v12/usage/completion/bash" + "pkg.re/essentialkaos/ek.v12/usage/completion/fish" + "pkg.re/essentialkaos/ek.v12/usage/completion/zsh" + "pkg.re/essentialkaos/ek.v12/usage/update" "github.com/essentialkaos/bibop/cli/executor" "github.com/essentialkaos/bibop/parser" @@ -34,7 +34,7 @@ import ( // Application info const ( APP = "bibop" - VER = "2.1.1" + VER = "2.2.0" DESC = "Utility for testing command-line tools" ) diff --git a/cli/executor/executor.go b/cli/executor/executor.go index eb41746f..157cf978 100644 --- a/cli/executor/executor.go +++ b/cli/executor/executor.go @@ -17,17 +17,17 @@ import ( "strings" "time" - "pkg.re/essentialkaos/ek.v11/errutil" - "pkg.re/essentialkaos/ek.v11/fmtc" - "pkg.re/essentialkaos/ek.v11/fmtutil" - "pkg.re/essentialkaos/ek.v11/fsutil" - "pkg.re/essentialkaos/ek.v11/log" - "pkg.re/essentialkaos/ek.v11/passwd" - "pkg.re/essentialkaos/ek.v11/sliceutil" - "pkg.re/essentialkaos/ek.v11/strutil" - "pkg.re/essentialkaos/ek.v11/system" - "pkg.re/essentialkaos/ek.v11/terminal/window" - "pkg.re/essentialkaos/ek.v11/tmp" + "pkg.re/essentialkaos/ek.v12/errutil" + "pkg.re/essentialkaos/ek.v12/fmtc" + "pkg.re/essentialkaos/ek.v12/fmtutil" + "pkg.re/essentialkaos/ek.v12/fsutil" + "pkg.re/essentialkaos/ek.v12/log" + "pkg.re/essentialkaos/ek.v12/passwd" + "pkg.re/essentialkaos/ek.v12/sliceutil" + "pkg.re/essentialkaos/ek.v12/strutil" + "pkg.re/essentialkaos/ek.v12/system" + "pkg.re/essentialkaos/ek.v12/terminal/window" + "pkg.re/essentialkaos/ek.v12/tmp" "github.com/essentialkaos/bibop/action" "github.com/essentialkaos/bibop/output" diff --git a/cli/executor/validators.go b/cli/executor/validators.go index ae5c2302..545933ad 100644 --- a/cli/executor/validators.go +++ b/cli/executor/validators.go @@ -13,10 +13,10 @@ import ( "regexp" "strings" - "pkg.re/essentialkaos/ek.v11/fsutil" - "pkg.re/essentialkaos/ek.v11/sliceutil" - "pkg.re/essentialkaos/ek.v11/strutil" - "pkg.re/essentialkaos/ek.v11/system" + "pkg.re/essentialkaos/ek.v12/fsutil" + "pkg.re/essentialkaos/ek.v12/sliceutil" + "pkg.re/essentialkaos/ek.v12/strutil" + "pkg.re/essentialkaos/ek.v12/system" "github.com/essentialkaos/bibop/recipe" ) diff --git a/parser/parser.go b/parser/parser.go index 00c6eb89..aa90721b 100644 --- a/parser/parser.go +++ b/parser/parser.go @@ -15,8 +15,8 @@ import ( "regexp" "strings" - "pkg.re/essentialkaos/ek.v11/fsutil" - "pkg.re/essentialkaos/ek.v11/strutil" + "pkg.re/essentialkaos/ek.v12/fsutil" + "pkg.re/essentialkaos/ek.v12/strutil" "github.com/essentialkaos/bibop/recipe" ) diff --git a/recipe/recipe.go b/recipe/recipe.go index 6bc5c890..24c82e4b 100644 --- a/recipe/recipe.go +++ b/recipe/recipe.go @@ -13,7 +13,7 @@ import ( "strconv" "strings" - "pkg.re/essentialkaos/ek.v11/strutil" + "pkg.re/essentialkaos/ek.v12/strutil" ) // ////////////////////////////////////////////////////////////////////////////////// // diff --git a/recipe/runtime_variables.go b/recipe/runtime_variables.go index 589c5c88..e90d752b 100644 --- a/recipe/runtime_variables.go +++ b/recipe/runtime_variables.go @@ -11,9 +11,9 @@ import ( "strconv" "time" - "pkg.re/essentialkaos/ek.v11/fsutil" - "pkg.re/essentialkaos/ek.v11/netutil" - "pkg.re/essentialkaos/ek.v11/system" + "pkg.re/essentialkaos/ek.v12/fsutil" + "pkg.re/essentialkaos/ek.v12/netutil" + "pkg.re/essentialkaos/ek.v12/system" ) // ////////////////////////////////////////////////////////////////////////////////// //