Merge pull request #111 from essentialkaos/develop

Version 1.1.4
essentialkaos · Jun 22, 2024 · 1ef9d6b · 1ef9d6b
2 parents 5c3462b + 944c3ed
commit 1ef9d6b
Show file tree

Hide file tree

Showing 9 changed files with 109 additions and 43 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -14,6 +14,12 @@ updates:
       - "andyone"
     reviewers:
       - "andyone"
+    groups:
+      all:
+        applies-to: version-updates
+        update-types:
+          - "minor"
+          - "patch"
 
   - package-ecosystem: "github-actions"
     directory: "/"

diff --git a/.github/images/card.svg b/.github/images/card.svg
diff --git a/.github/images/license.svg b/.github/images/license.svg
diff --git a/.github/images/usage.svg b/.github/images/usage.svg
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 ################################################################################
 
-# This Makefile generated by GoMakeGen 3.0.0 using next command:
+# This Makefile generated by GoMakeGen 3.0.2 using next command:
 # gomakegen --mod .
 #
 # More info: https://kaos.sh/gomakegen
@@ -25,15 +25,15 @@ GITREV ?= $(shell test -s $(MAKEDIR)/.git && git rev-parse --short HEAD)
 all: fz ## Build all binaries
 
 fz:
-	@echo "[37m[1/1][0m [36;1mBuilding fz…[0m"
+	@echo "[36;1mBuilding fz…[0m"
 	@go build $(VERBOSE_FLAG) -ldflags="-X main.gitrev=$(GITREV)" fz.go
 
 install: ## Install all binaries
-	@echo "[37m[1/1][0m [36;1mInstalling binaries…[0m"
+	@echo "[36;1mInstalling binaries…[0m"
 	@cp fz /usr/bin/fz
 
 uninstall: ## Uninstall all binaries
-	@echo "[37m[1/1][0m [36;1mRemoving installed binaries…[0m"
+	@echo "[36;1mRemoving installed binaries…[0m"
 	@rm -f /usr/bin/fz
 
 init: mod-init ## Initialize new module
@@ -45,16 +45,16 @@ update: mod-update ## Update dependencies to the latest versions
 vendor: mod-vendor ## Make vendored copy of dependencies
 
 test: ## Run tests
-	@echo "[37m[1/1][0m [36;1mStarting tests…[0m"
+	@echo "[36;1mStarting tests…[0m"
 ifdef COVERAGE_FILE ## Save coverage data into file (String)
-		@go test $(VERBOSE_FLAG) -covermode=count -coverprofile=$(COVERAGE_FILE) ./gofuzz
+	@go test $(VERBOSE_FLAG) -covermode=count -coverprofile=$(COVERAGE_FILE) ./gofuzz
 else
-		@go test $(VERBOSE_FLAG) -covermode=count ./gofuzz
+	@go test $(VERBOSE_FLAG) -covermode=count ./gofuzz
 endif
 
 gen-fuzz: ## Generate archives for fuzz testing
 	@which go-fuzz-build &>/dev/null || go get -u -v github.com/dvyukov/go-fuzz/go-fuzz-build
-	@echo "[37m[1/1][0m [36;1mGenerating fuzzing data…[0m"
+	@echo "[36;1mGenerating fuzzing data…[0m"
 	@go-fuzz-build -o gofuzz-fuzz.zip github.com/essentialkaos/fz/gofuzz
 
 mod-init:
@@ -94,23 +94,23 @@ endif
 	@test -d vendor && rm -rf vendor && go mod vendor $(VERBOSE_FLAG) || :
 
 mod-download:
-	@echo "[37m[1/1][0m [36;1mDownloading dependencies…[0m"
+	@echo "[36;1mDownloading dependencies…[0m"
 	@go mod download
 
 mod-vendor:
-	@echo "[37m[1/1][0m [36;1mVendoring dependencies…[0m"
+	@echo "[36;1mVendoring dependencies…[0m"
 	@rm -rf vendor && go mod vendor $(VERBOSE_FLAG) || :
 
 fmt: ## Format source code with gofmt
-	@echo "[37m[1/1][0m [36;1mFormatting sources…[0m"
+	@echo "[36;1mFormatting sources…[0m"
 	@find . -name "*.go" -exec gofmt -s -w {} \;
 
 vet: ## Runs 'go vet' over sources
-	@echo "[37m[1/1][0m [36;1mRunning 'go vet' over sources…[0m"
+	@echo "[36;1mRunning 'go vet' over sources…[0m"
 	@go vet -composites=false -printfuncs=LPrintf,TLPrintf,TPrintf,log.Debug,log.Info,log.Warn,log.Error,log.Critical,log.Print ./...
 
 clean: ## Remove generated files
-	@echo "[37m[1/1][0m [36;1mRemoving built binaries…[0m"
+	@echo "[36;1mRemoving built binaries…[0m"
 	@rm -f fz
 
 help: ## Show this info
@@ -122,6 +122,6 @@ help: ## Show this info
 		| sed 's/ifdef //' \
 		| awk 'BEGIN {FS = " .*?## "}; {printf "  \033[32m%-13s\033[0m  %s\n", $$1, $$2}'
 	@echo -e ''
-	@echo -e '\033[90mGenerated by GoMakeGen 3.0.0\033[0m\n'
+	@echo -e '\033[90mGenerated by GoMakeGen 3.0.2\033[0m\n'
 
 ################################################################################
diff --git a/README.md b/README.md
@@ -1,14 +1,14 @@
-<p align="center"><a href="#readme"><img src="https://gh.kaos.st/fz.svg"/></a></p>
+<p align="center"><a href="#readme"><img src=".github/images/card.svg"/></a></p>
 
 <p align="center">
   <a href="https://kaos.sh/w/fz/ci"><img src="https://kaos.sh/w/fz/ci.svg" alt="GitHub Actions CI Status" /></a>
   <a href="https://kaos.sh/w/fz/codeql"><img src="https://kaos.sh/w/fz/codeql.svg" alt="GitHub Actions CodeQL Status" /></a>
   <a href="https://kaos.sh/r/fz"><img src="https://kaos.sh/r/fz.svg" alt="GoReportCard" /></a>
   <a href="https://kaos.sh/b/fz"><img src="https://kaos.sh/b/64a79279-c198-422c-862c-d4e735358ac1.svg" alt="Codebeat badge" /></a>
-  <a href="#license"><img src="https://gh.kaos.st/apache2.svg"></a>
+  <a href="#license"><img src=".github/images/license.svg"/></a>
 </p>
 
-<p align="center"><a href="#usage-demo">Demo</a> • <a href="#installation">Installation</a> • <a href="#command-line-completion">Completions</a> • <a href="#man-documentation">Man documentation</a> • <a href="#usage">Usage</a> • <a href="#build-status">Build Status</a> • <a href="#license">License</a></p>
+<p align="center"><a href="#usage-demo">Demo</a> • <a href="#installation">Installation</a> • <a href="#command-line-completion">Completions</a> • <a href="#man-documentation">Man documentation</a> • <a href="#usage">Usage</a> • <a href="#ci-status">CI Status</a> • <a href="#license">License</a></p>
 
 <br/>
 
@@ -22,7 +22,7 @@
 
 #### From source
 
-To build the `fz` from scratch, make sure you have a working Go 1.19+ workspace (_[instructions](https://go.dev/doc/install)_), then:
+To build the `fz` from scratch, make sure you have a working Go 1.21+ workspace (_[instructions](https://go.dev/doc/install)_), then:
 
 ```
 go install github.com/essentialkaos/fz@latest
@@ -67,22 +67,9 @@ fz --generate-man | sudo gzip > /usr/share/man/man1/fz.1.gz
 
 ### Usage
 
-```
-Usage: go-fuzz … |& fz {options}
-
-Options
-
-  --no-color, -nc    Disable colors in output
-  --help, -h         Show this help message
-  --version, -v      Show version
-
-Examples
-
-  go-fuzz -bin app-fuzz.zip |& fz
-  Run fuzz test for app-fuzz.zip
-```
+<img src=".github/images/usage.svg" />
 
-### Build Status
+### CI Status
 
 | Branch | Status |
 |--------|--------|

diff --git a/cli/cli.go b/cli/cli.go
@@ -41,7 +41,7 @@ import (
 // App info
 const (
 	APP  = "fz"
-	VER  = "1.1.3"
+	VER  = "1.1.4"
 	DESC = "Tool for formatting go-fuzz output"
 )
 

diff --git a/go.mod b/go.mod
@@ -4,13 +4,13 @@ go 1.18
 
 require (
 	github.com/essentialkaos/check v1.4.0
-	github.com/essentialkaos/ek/v12 v12.118.0
+	github.com/essentialkaos/ek/v12 v12.127.0
 )
 
 require (
-	github.com/essentialkaos/depsy v1.1.0 // indirect
+	github.com/essentialkaos/depsy v1.3.0 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/rogpeppe/go-internal v1.11.0 // indirect
-	golang.org/x/sys v0.19.0 // indirect
+	golang.org/x/sys v0.21.0 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -1,10 +1,10 @@
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1nkuKk=
 github.com/essentialkaos/check v1.4.0/go.mod h1:LMKPZ2H+9PXe7Y2gEoKyVAwUqXVgx7KtgibfsHJPus0=
-github.com/essentialkaos/depsy v1.1.0 h1:U6dp687UkQwXlZU17Hg2KMxbp3nfZAoZ8duaeUFYvJI=
-github.com/essentialkaos/depsy v1.1.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8=
-github.com/essentialkaos/ek/v12 v12.118.0 h1:fosk+jCK9GrrnPiua1O6PQSwrlQ25arwespB6fnbi9g=
-github.com/essentialkaos/ek/v12 v12.118.0/go.mod h1:VVCk0ZA3CB5lPkQ7bUHo/mOBs02jkjMRlLS8ES2TQpw=
+github.com/essentialkaos/depsy v1.3.0 h1:CN7bRgBU2jGTHSkg/Sh38eDUn7cvmaTp2sxFt2HpFeU=
+github.com/essentialkaos/depsy v1.3.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8=
+github.com/essentialkaos/ek/v12 v12.127.0 h1:fU5A+QbIZ7NTq1K5jGVwAWwuLtBUhsIKuRWYT78hE+Q=
+github.com/essentialkaos/ek/v12 v12.127.0/go.mod h1:71IJ7m82hgjrvWnhL+z0vIhguxz47/rfVma5/CeI5Fw=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -13,5 +13,5 @@ github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsK
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
-golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
-golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
+golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=