Merge pull request #4 from Format-C-eft/dev

refactoring

Author: Format-C-eft

.golangci.yaml

@@ -0,0 +1,55 @@
+# More info on config here: https://golangci-lint.run/usage/configuration/#config-file
+run:
+  concurrency: 8
+  timeout: 10m
+  issues-exit-code: 1
+  tests: true
+
+output:
+  formats:
+    - format: colored-line-number
+  print-issued-lines: true
+  print-linter-name: true
+
+linters-settings:
+  govet:
+    enable:
+      - shadow
+  dupl:
+    threshold: 100
+  goconst:
+    min-len:         2
+    min-occurrences: 2
+
+linters:
+  disable-all: true
+  enable:
+    - errcheck
+    - goconst
+    - goimports
+    - gosec
+    - gosimple
+    - govet
+    - ineffassign
+    - revive
+    - staticcheck
+    - unused
+
+issues:
+  exclude-dirs:
+    - bin
+    - vendor
+    - var
+    - tmp
+    - .cache
+  exclude-use-default: false
+  exclude:
+    - G104
+    - G115
+    - G204
+    - should have a package comment
+    - should have comment or be unexported
+    - comment on exported const
+    - should have comment \(or a comment on this block\)
+    - don't use an underscore in package name
+    - package-comments

.golangci.yml

@@ -1,51 +1,47 @@
+include build.mk
+
 export GO111MODULE=on
+# export GOSUMDB=off
+
+BUILD_ENV_PARAMS:=CGO_ENABLED=0
 
-ENV_PARAMS ?= CGO_ENABLED=0
-LOCAL_BIN := $(CURDIR)/bin
-LINT_BIN := $(LOCAL_BIN)/golangci-lint
+space := $(subst ,, )
+CURDIR_ESCAPE:=$(subst $(space),\ ,$(CURDIR))
 
-.PHONY: deps
-deps:
-	$(info Download dependencies...)
-	go mod download
+LOCAL_BIN:=$(CURDIR_ESCAPE)/bin
+LINT_BIN:=$(LOCAL_BIN)/golangci-lint
+LINT_VERSION:=1.60.3
 
+###### TEST ######
 .PHONY: test
 test:
-	$(info Running test...)
-	go test ./...
-
-.PHONY: .lint
-.lint:
-	$(info Running lint...)
-	$(LINT_BIN) run --new-from-rev=origin/master --config=.golangci.yaml ./...
-
-.PHONY: .lint-full
-.lint-full:
-	$(info Running lint-full...)
-	$(LINT_BIN) run --config=.golangci.yaml ./...
-
-.PHONY:  lint
-lint: install-lint .lint
-
-.PHONY: lint-full
-lint-full: install-lint .lint-full
+	go test ./... -count=1 -timeout=60s -v -short
+###### TEST ######
 
-LINT_TAG ?= 1.55.2
-install-lint: export GOBIN := $(LOCAL_BIN)
+###### LINT ######
+.PHONY: install-lint
 install-lint:
-	$(info Installing golangci-lint v$(LINT_TAG))
-	go install github.com/golangci/golangci-lint/cmd/golangci-lint@v$(LINT_TAG)
-	go mod tidy
-
-.PHONY: build
-build: build-linux build-darwin
-
-.PHONY: build-linux
-build-linux:
-	go mod download && CGO_ENABLED=0 \
-	GOOS=linux GOARCH=${GOARCH} go build -o ${LOCAL_BIN}/git-update-linux-${GOARCH} ./cmd/main.go;
-
-.PHONY: build-darwin
-build-darwin:
-	go mod download && CGO_ENABLED=0 \
-	GOOS=darwin GOARCH=${GOARCH} go build -o ${LOCAL_BIN}/git-update-darwin-${GOARCH} ./cmd/main.go;
+ifeq ($(wildcard $(LINT_BIN)),)
+	$(info Installing golangci-lint v$(LINT_VERSION))
+	GOBIN=$(LOCAL_BIN) go install github.com/golangci/golangci-lint/cmd/golangci-lint@v$(LINT_VERSION)
+# Устанавливаем текущий путь для исполняемого файла линтера.
+else
+	$(info Golangci-lint is already installed to $(LINT_VERSION))
+endif
+
+
+PHONY: lint
+lint: install-lint
+	$(info Running lint against changed files...)
+	$(LINT_BIN) run \
+		--new-from-rev=origin/master \
+		--config=.golangci.yml \
+		./...
+
+PHONY: lint-full
+lint-full: install-lint
+	$(info Running lint against all project files...)
+	$(LINT_BIN) run \
+		--config=.golangci.yml \
+		./...
+###### LINT ######

Makefile

@@ -0,0 +1,35 @@
+GO_VERSION_SHORT:=$(shell echo `go version` | sed -E 's/.* go(.*) .*/\1/g')
+ifneq ("1.23","$(shell printf "$(GO_VERSION_SHORT)\n1.23" | sort -V | head -1)")
+	$(error NEED GO VERSION >= 1.23. Found: $(GO_VERSION_SHORT))
+endif
+
+##################### PROJECT RELATED VARIABLES #####################
+ifndef GIT_BRANCH
+	GIT_BRANCH:=$(shell git rev-parse --abbrev-ref HEAD)
+endif
+
+#GIT_BRANCH:=$(shell git branch 2> /dev/null | grep '*' | cut -f2 -d' ')
+ifndef GIT_HASH
+	GIT_HASH:=$(shell git log --format="%h" -n 1 2> /dev/null)
+endif
+
+ifndef BUILD_TS
+	BUILD_TS:=$(shell date +%FT%T%z)
+endif
+
+LDFLAGS = -X 'github.com/Format-C-eft/git-update/internal/config.branch=$(GIT_BRANCH)'\
+          -X 'github.com/Format-C-eft/git-update/internal/config.commitHash=$(GIT_HASH)'\
+          -X 'github.com/Format-C-eft/git-update/internal/config.timeBuild=$(BUILD_TS)'
+
+
+.PHONY: .build
+.build:
+	$(info Building...)
+	$(BUILD_ENV_PARAMS) go build -ldflags "$(LDFLAGS)" -o ./bin/git-update ./cmd/git-update
+
+.PHONY: build
+build: .bin-deps .build
+
+.PHONY: .bin-deps
+.bin-deps:
+	$(info Installing binary dependencies...)

build.mk

@@ -0,0 +1,27 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/Format-C-eft/git-update/internal/cmd"
+	"github.com/Format-C-eft/git-update/internal/config"
+)
+
+func main() {
+	if config.FlagVersion {
+		showVersion()
+		return
+	}
+
+	if errRun := cmd.Run(); errRun != nil {
+		fmt.Println(errRun.Error())
+		return
+	}
+}
+
+func showVersion() {
+	fmt.Printf("Name - '%s'\n", config.GetVersion().Name)
+	fmt.Printf("Branch - '%s'\n", config.GetVersion().Branch)
+	fmt.Printf("Commit hash - '%s'\n", config.GetVersion().CommitHash)
+	fmt.Printf("Time build - '%s'\n", config.GetVersion().TimeBuild)
+}

cmd/git-update/main.go

@@ -1,10 +1,3 @@
 module github.com/Format-C-eft/git-update
 
-go 1.22
-
-require github.com/spf13/cobra v1.8.0
-
-require (
-	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
-)
+go 1.23

cmd/main.go

@@ -1,10 +0,0 @@
-github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
-github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=
-github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

go.mod

@@ -4,27 +4,17 @@ import (
 	"fmt"
 	"strings"
 	"time"
+
+	"github.com/Format-C-eft/git-update/internal/config"
 )
 
 const (
-	LayoutDateFormat = "15:04:05.999"
+	layoutDateFormat = "15:04:05.999"
 	gitStatusOk      = "nothing to commit, working tree clean"
 )
 
-var (
-	flagDir           string
-	flagAll           bool
-	flagCheckout      bool
-	flagFetch         bool
-	flagPull          bool
-	flagResetHard     bool
-	flagDefaultBranch string
-
-	flagExecuteTimeout *time.Duration
-)
-
 type (
-	resultLogChan struct {
+	resultLog struct {
 		dir  string
 		logs []logs
 	}
@@ -35,19 +25,26 @@ type (
 	}
 )
 
-func (r *resultLogChan) AddLog(message string) {
+func (r *resultLog) AddLog(message string, verboseMessage string) {
 	r.logs = append(r.logs, logs{
 		Time:     time.Now(),
 		messages: message,
 	})
+
+	if verboseMessage != "" && config.FlagVerbose {
+		r.logs = append(r.logs, logs{
+			Time:     time.Now(),
+			messages: "verbose: " + verboseMessage,
+		})
+	}
 }
 
-func (r *resultLogChan) String() string {
+func (r *resultLog) String() string {
 	result := make([]string, 0, len(r.logs))
 	for _, l := range r.logs {
 		result = append(result, fmt.Sprintf(
 			"%s: %s: %s",
-			l.Time.Format(LayoutDateFormat),
+			l.Time.Format(layoutDateFormat),
 			r.dir,
 			l.messages,
 		),