Merge pull request #12 from essentialkaos/develop

Version 1.1.1

Makefile

@@ -1,7 +1,14 @@
 ################################################################################
 
+# This Makefile generated by GoMakeGen 1.1.0 using next command:
+# gomakegen .
+#
+# More info: https://kaos.sh/gomakegen
+
+################################################################################
+
 .DEFAULT_GOAL := help
-.PHONY = fmt all clean deps gen-fuzz deps-test test help
+.PHONY = fmt all clean git-config deps deps-test test gen-fuzz help
 
 ################################################################################
 
@@ -10,10 +17,10 @@ all: bibop ## Build all binaries
 bibop: ## Build bibop binary
 	go build bibop.go
 
-install: ## Install binaries
+install: ## Install all binaries
 	cp bibop /usr/bin/bibop
 
-uninstall: ## Uninstall binaries
+uninstall: ## Uninstall all binaries
 	rm -f /usr/bin/bibop
 
 git-config: ## Configure git redirects for stable import path services
@@ -22,26 +29,27 @@ git-config: ## Configure git redirects for stable import path services
 deps: git-config ## Download dependencies
 	go get -d -v pkg.re/essentialkaos/ek.v10
 
-deps-test: ## Download dependencies for tests
-	git config --global http.https://pkg.re.followRedirects true
+deps-test: git-config ## Download dependencies for tests
 	go get -d -v pkg.re/check.v1
 
 test: ## Run tests
 	go test -covermode=count ./parser ./recipe
 
-fmt: ## Format source code with gofmt
-	find . -name "*.go" -exec gofmt -s -w {} \;
-
 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
 	go-fuzz-build -o parser-fuzz.zip github.com/essentialkaos/bibop/parser
 
+fmt: ## Format source code with gofmt
+	find . -name "*.go" -exec gofmt -s -w {} \;
+
 clean: ## Remove generated files
 	rm -f bibop
 
 help: ## Show this info
-	@echo -e '\nSupported targets:\n'
+	@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}'
 	@echo -e ''
+	@echo -e '\033[90mGenerated by GoMakeGen 1.1.0\033[0m\n'
 
 ################################################################################

action/backup.go

@@ -109,5 +109,5 @@ func BackupRestore(action *recipe.Action, tmpDir string) error {
 // calcCRC32Q calculate CRC32 checksum
 func calcCRC32Q(data string) string {
 	table := crc32.MakeTable(0xD5828281)
-	return fmt.Sprint("%08x", crc32.Checksum([]byte(data), table))
+	return fmt.Sprintf("%08x", crc32.Checksum([]byte(data), table))
 }

action/http.go

@@ -100,11 +100,11 @@ func HTTPHeader(action *recipe.Action) error {
 	switch {
 	case !action.Negative && !isHeaderPresent:
 		return fmt.Errorf(
-			"HTTP request returns different header (%d ≠ %d)",
+			"HTTP request returns different header (%s ≠ %s)",
 			fmtValue(resp.Header.Get(headerName)), headerValue,
 		)
 	case action.Negative && isHeaderPresent:
-		return fmt.Errorf("HTTP request return invalid header (%d)", headerValue)
+		return fmt.Errorf("HTTP request return invalid header (%s)", headerValue)
 	}
 
 	return nil

action/system.go

@@ -98,9 +98,9 @@ func WaitPID(action *recipe.Action) error {
 
 	switch action.Negative {
 	case false:
-		return fmt.Errorf("Timeout (%g sec) reached, and PID file %s didn't appear", pidFile)
+		return fmt.Errorf("Timeout (%g sec) reached, and PID file %s didn't appear", timeout, pidFile)
 	default:
-		return fmt.Errorf("Timeout (%g sec) reached, and PID file %s still exists", pidFile)
+		return fmt.Errorf("Timeout (%g sec) reached, and PID file %s still exists", timeout, pidFile)
 	}
 }
 

cli/cli.go

@@ -29,7 +29,7 @@ import (
 // Application info
 const (
 	APP  = "bibop"
-	VER  = "1.1.0"
+	VER  = "1.1.1"
 	DESC = "Utility for testing command-line tools"
 )