Merge pull request #47 from aquilax/monorepo

Restructured to monorepo

.github/workflows/go.yml

@@ -16,10 +16,10 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.17
+        go-version: 1.18
 
     - name: Build
-      run: go build -v ./...
+      run: go build -v $(go list -m)
 
     - name: Test
-      run: go test -v ./...
+      run: go test -v $(go list -m -f '{{.String}}/...')

.gitignore

@@ -22,7 +22,7 @@ _testmain.go
 *.exe
 *.test
 *.prof
-hranoprovod-cli
+/hranoprovod-cli
 .vscode
 dist/
 snap-token.txt

.goreleaser.yml

@@ -9,7 +9,7 @@ builds:
     - linux
   goarch:
     - amd64
-  main: ./hranoprovod/
+  dir: ./cmd/hranoprovod-cli
   binary: hranoprovod-cli
 
 archives:

Dockerfile

@@ -1,18 +1,20 @@
-FROM golang:alpine AS builder
+FROM golang:alpine3.15 AS builder
 
 RUN apk update && apk add --no-cache git
 
-WORKDIR .
+RUN mkdir /build
+
+WORKDIR /build
 
 COPY . .
 
 ENV GOPATH /tmp
 
-RUN go get -d -v
+RUN cd cmd/hranoprovod-cli && go get -d -v
 
 ENV CGO_ENABLED 0
 
-RUN go build -o /go/bin/hranoprovod-cli
+RUN cd cmd/hranoprovod-cli && go build -o /go/bin/hranoprovod-cli
 
 
 FROM scratch

Makefile

@@ -5,18 +5,20 @@ unexport HR_LOGFILE
 unexport HR_CONFIG
 unexport HR_DATE_FORMAT
 
+GO=go1.18
 SHELL=/bin/bash
 TARGET=hranoprovod-cli
 MDEXEC=mdexec
 SRC=$(shell find . -type f -name '*.go' -not -path "./vendor/*")
 DOC_TARGETS=${TARGET} docs/command-line.md docs/usage.md README.md docs/usage.cast
+MODULES=$(shell ${GO} list -m)
 
 .DEFAULT_GOAL: $(TARGET)
 
 all: $(TARGET) docs
 
 $(TARGET): $(SRC)
-	go build -o $(TARGET) hranoprovod/main.go
+	$(GO) build -o $(TARGET) github.com/aquilax/hranoprovod-cli/v3/cmd/hranoprovod-cli
 
 docs: $(TARGET) docs/command-line.md docs/usage.md README.md
 
@@ -30,7 +32,7 @@ README.md: $(TARGET) documentation/README.md
 	$(MDEXEC) documentation/README.md > $@
 
 test:
-	go test -v ./...
+	$(GO) test -v $(MODULES)
 
 test-release:
 	goreleaser --snapshot --skip-publish --rm-dist
@@ -43,10 +45,10 @@ documentation/usage.cast: $(TARGET) scripts/usage.sh
 
 cast: $(TARGET) documentation/usage.cast
 
-snapshots:
-	UPDATE_SNAPSHOTS=1 go test ./...
-
 coverage:
-	go test -race -coverprofile=coverage.out -covermode=atomic ./...
-	go tool cover -func=coverage.out
+	$(GO) test -race -coverprofile=coverage.out -covermode=atomic $(MODULES)
+	$(GO) tool cover -func=coverage.out
 	rm coverage.out
+
+docker:
+	docker build .

README.md

@@ -21,17 +21,14 @@ hranoprovod can be installed using a plugin as follows:
 
 First make sure you have go (golang) installed.
 
-    http://golang.org/
+    https://go.dev/
 
 Clone the repository and build/install the tool:
 
     git clone https://github.com/aquilax/hranoprovod-cli.git
-    cd hranoprovod-cli
+    cd hranoprovod-cli/cmd/hranoprovod-cli/
     go install
 
-### snap
-
-[![Get it from the Snap Store](https://snapcraft.io/static/images/badges/en/snap-store-black.svg)](https://snapcraft.io/hranoprovod-cli)
 
 ## Docker
 
@@ -78,8 +75,8 @@ COMMANDS:
    csv            Generates csv exports
    stats          Provide stats information
    summary        Show summary for date
-   gen            Generate documentation
    print          Print log
+   gen            Generate documentation
    help, h        Shows a list of commands or help for one command
 
 GLOBAL OPTIONS: