diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7f9e403c..8911f31c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -80,7 +80,9 @@ jobs: env: CODECLIMATE_API_HOST: https://codebeat.co/webhooks/code_coverage CODECLIMATE_REPO_TOKEN: ${{ secrets.CODECLIMATE_TOKEN }} - run: codeclimate-test-reporter < cover.out + run: | + sed -i'.original' 's#/v[0-9]\+/#/#g' cover.out + codeclimate-test-reporter < cover.out Aligo: name: Aligo diff --git a/Makefile b/Makefile index 17a9cb16..473a3cb2 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ ################################################################################ -# This Makefile generated by GoMakeGen 1.5.1 using next command: +# This Makefile generated by GoMakeGen 1.6.1 using next command: # gomakegen --mod . # # More info: https://kaos.sh/gomakegen @@ -10,7 +10,7 @@ export GO111MODULE=on .DEFAULT_GOAL := help -.PHONY = fmt vet all clean deps deps-test test gen-fuzz mod-init mod-update mod-vendor help +.PHONY = fmt vet all clean deps deps-test test gen-fuzz mod-init mod-update mod-download mod-vendor help ################################################################################ @@ -25,7 +25,7 @@ install: ## Install all binaries uninstall: ## Uninstall all binaries rm -f /usr/bin/bibop -deps: mod-update ## Download dependencies +deps: mod-download ## Download dependencies deps-test: deps ## Download dependencies for tests @@ -40,7 +40,11 @@ mod-init: ## Initialize new module go mod init go mod tidy -mod-update: ## Download modules to local cache +mod-update: ## Update modules to their latest versions + go get -u + go mod tidy + +mod-download: ## Download modules to local cache go mod download mod-vendor: ## Make vendored copy of dependencies @@ -58,8 +62,8 @@ clean: ## Remove generated files help: ## Show this info @echo -e '\n\033[1mSupported targets:\033[0m\n' @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) \ - | awk 'BEGIN {FS = ":.*?## "}; {printf " \033[33m%-12s\033[0m %s\n", $$1, $$2}' + | awk 'BEGIN {FS = ":.*?## "}; {printf " \033[33m%-14s\033[0m %s\n", $$1, $$2}' @echo -e '' - @echo -e '\033[90mGenerated by GoMakeGen 1.5.1\033[0m\n' + @echo -e '\033[90mGenerated by GoMakeGen 1.6.1\033[0m\n' ################################################################################ diff --git a/cli/cli.go b/cli/cli.go index a8649e17..fabcd0c5 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -37,7 +37,7 @@ import ( // Application info const ( APP = "bibop" - VER = "5.1.2" + VER = "5.1.3" DESC = "Utility for testing command-line tools" ) diff --git a/go.mod b/go.mod index 9d823713..587ec8ed 100644 --- a/go.mod +++ b/go.mod @@ -4,15 +4,15 @@ go 1.17 require ( github.com/buger/jsonparser v1.1.1 - github.com/essentialkaos/check v1.2.1 - github.com/essentialkaos/ek/v12 v12.43.0 + github.com/essentialkaos/check v1.3.0 + github.com/essentialkaos/ek/v12 v12.44.0 github.com/google/goterm v0.0.0-20200907032337-555d40f16ae2 ) require ( github.com/kr/pretty v0.3.0 // indirect github.com/kr/text v0.2.0 // indirect - github.com/rogpeppe/go-internal v1.6.1 // indirect - golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064 // indirect - golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 // indirect + github.com/rogpeppe/go-internal v1.8.1 // indirect + golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect + golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect ) diff --git a/go.sum b/go.sum index 7a8df449..17ce47ab 100644 --- a/go.sum +++ b/go.sum @@ -1,10 +1,11 @@ github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs= github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/essentialkaos/check v1.2.1 h1:avvyFy/1acUNwfxwuOLsHeCjfXtMygtbu0lVDr3nxFs= github.com/essentialkaos/check v1.2.1/go.mod h1:PhxzfJWlf5L/skuyhzBLIvjMB5Xu9TIyDIsqpY5MvB8= -github.com/essentialkaos/ek/v12 v12.43.0 h1:lnwrfGYQFJ3EjEF4ydW2qnshDcXCR2OnNRk0kwlFpFE= -github.com/essentialkaos/ek/v12 v12.43.0/go.mod h1:Cv/tOZshmFg4pMJnBkg4aW/WyYhzzc41qzZIfk5RSi4= +github.com/essentialkaos/check v1.3.0 h1:ria+8o22RCLdt2D/1SHQsEH5Mmy5S+iWHaGHrrbPUc0= +github.com/essentialkaos/check v1.3.0/go.mod h1:PhxzfJWlf5L/skuyhzBLIvjMB5Xu9TIyDIsqpY5MvB8= +github.com/essentialkaos/ek/v12 v12.44.0 h1:sJjccPnaYC2dD3sExBWwwH/35/TQ4DiQqgsH+IGuis4= +github.com/essentialkaos/ek/v12 v12.44.0/go.mod h1:uQUkpvaZHWR9aI8GfknZqOG5FC+G2PYJLFyMw9fdjbo= github.com/essentialkaos/go-linenoise/v3 v3.3.5/go.mod h1:g4X3LhT83XT4h7xwrCLclAdMkJvS9qWBQTGNdS6y4vo= github.com/google/goterm v0.0.0-20200907032337-555d40f16ae2 h1:CVuJwN34x4xM2aT4sIKhmeib40NeBPhRihNjQmpJsA4= github.com/google/goterm v0.0.0-20200907032337-555d40f16ae2/go.mod h1:nOFQdrUlIlx6M6ODdSpBj1NVA+VgLC6kmw60mkw34H4= @@ -15,16 +16,18 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= +github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064 h1:S25/rfnfsMVgORT4/J61MJ7rdyseOZOyvLIrZEZ7s6s= -golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg= +github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= +golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 h1:kUhD7nTDoI3fVd9G4ORWrbV5NY0liEs/Jg2pv5f+bBA= +golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 h1:OH54vjqzRWmbJ62fjuhxy7AxFFgoHN0/DPc/UrL8cAs= -golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0= +golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/render/renderer_terminal.go b/render/renderer_terminal.go index c61ff6d3..8fbf0bad 100644 --- a/render/renderer_terminal.go +++ b/render/renderer_terminal.go @@ -153,7 +153,9 @@ func (rr *TerminalRenderer) ActionStarted(a *recipe.Action) { // ActionFailed prints info about failed action func (rr *TerminalRenderer) ActionFailed(a *recipe.Action, err error) { - rr.syncChan <- _ANIMATION_STOP + if !isCI { + rr.syncChan <- _ANIMATION_STOP + } rr.renderTmpMessage( " {s-}└─{!} {r}✖ {!}"+rr.formatActionName(a)+" {s}%s{!}", @@ -169,7 +171,9 @@ func (rr *TerminalRenderer) ActionFailed(a *recipe.Action, err error) { // ActionDone prints info about successfully finished action func (rr *TerminalRenderer) ActionDone(a *recipe.Action, isLast bool) { - rr.syncChan <- _ANIMATION_STOP + if !isCI { + rr.syncChan <- _ANIMATION_STOP + } if isLast { rr.renderTmpMessage(