Merge pull request #237 from moul/dev/moul/chiutil

feat: make chiutil go-importable

Makefile

@@ -4,10 +4,6 @@ GOBINS =	./cmd/depviz
 #GOBINS += ./tools/sed-i-github-issues
 DOCKER_IMAGE ?=	moul/depviz
 
-
-all: test install
-
-
 PRE_INSTALL_STEPS += generate
 PRE_TEST_STEPS += generate
 PRE_BUILD_STEPS += generate
@@ -51,6 +47,7 @@ gen.sum: $(GEN_DEPS)
 	    -xec 'make generate_local'; \
 	    make tidy \
 	)
+	@rm -f gen.sum.tmp
 
 
 PROTOC_OPTS = -I ./vendor/github.com/grpc-ecosystem/grpc-gateway:./api:./vendor:/protobuf
@@ -62,7 +59,7 @@ generate_local:
 	    --gogofaster_out="plugins=grpc:$(GOPATH)/src" \
 	    "$$proto" \
 	); done
-	goimportbs -w ./pkg ./cmd ./internal
+	goimports -w ./pkg ./cmd ./internal
 	shasum $(GEN_DEPS) | sort > gen.sum.tmp
 	mv gen.sum.tmp gen.sum
 

internal/dvserver/server.go

@@ -25,8 +25,8 @@ import (
 	chilogger "github.com/treastech/logger"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
-	"moul.io/depviz/internal/chiutil"
 	"moul.io/depviz/internal/dvcore"
+	"moul.io/depviz/pkg/chiutil"
 	"moul.io/multipmuri"
 )
 

pkg/chiutil/doc.go

@@ -0,0 +1 @@
+package chiutil // import "moul.io/depviz/pkg/chiutil"

rules.mk

@@ -68,6 +68,7 @@ endif
 ifdef GOPKG
 GO ?= go
 GOPATH ?= $(HOME)/go
+GOLIBS ?= $(shell find . -type f -name "go.mod" | grep -v /vendor/ | sed 's@/[^/]*$$@@' | sort | uniq)
 GO_INSTALL_OPTS ?=
 GO_TEST_OPTS ?= -test.timeout=30s
 
@@ -93,7 +94,7 @@ go.unittest: coverage.txt
 coverage.txt:
 	@rm -f /tmp/coverage.txt
 	@touch /tmp/coverage.txt
-	@set -e; for dir in `find . -type f -name "go.mod" | grep -v /vendor/ | sed 's@/[^/]*$$@@' | sort | uniq`; do ( set -xe; \
+	@set -e; for dir in $(GOLIBS); do ( set -xe; \
 	  cd $$dir; \
 	  $(GO) test $(GO_TEST_OPTS) -cover -coverprofile=/tmp/profile.out -covermode=atomic -race ./...; \
 	  if [ -f /tmp/profile.out ]; then \
@@ -108,36 +109,36 @@ go.coverfunc: coverage.txt
 
 .PHONY: go.lint
 go.lint:
-	@set -e; for dir in `find . -type f -name "go.mod" | grep -v /vendor/ | sed 's@/[^/]*$$@@' | sort | uniq`; do ( set -xe; \
+	@set -e; for dir in $(GOLIBS); do ( set -xe; \
 	  cd $$dir; \
 	  golangci-lint run --verbose ./...; \
 	); done
 
 .PHONY: go.tidy
 go.tidy:
-	@set -e; for dir in `find . -type f -name "go.mod" | grep -v /vendor/ | sed 's@/[^/]*$$@@' | sort | uniq`; do ( set -xe; \
+	@set -e; for dir in $(GOLIBS); do ( set -xe; \
 	  cd $$dir; \
 	  $(GO)	mod tidy; \
 	); done
 
 .PHONY: go.build
 go.build:
-	@set -e; for dir in `find . -type f -name "go.mod" | grep -v /vendor/ | sed 's@/[^/]*$$@@' | sort | uniq`; do ( set -xe; \
+	@set -e; for dir in $(GOLIBS); do ( set -xe; \
 	  cd $$dir; \
 	  $(GO)	build ./...; \
 	); done
 
 .PHONY: go.bump-deps
 go.bumpdeps:
-	@set -e; for dir in `find . -type f -name "go.mod" | grep -v /vendor/ | sed 's@/[^/]*$$@@' | sort | uniq`; do ( set -xe; \
+	@set -e; for dir in $(GOLIBS); do ( set -xe; \
 	  cd $$dir; \
 	  $(GO)	get -u ./...; \
 	); done
 
 .PHONY: go.bump-deps
 go.fmt:
 	if ! command -v goimports &>/dev/null; then GO111MODULE=off go get golang.org/x/tools/cmd/goimports; fi
-	@set -e; for dir in `find . -type f -name "go.mod" | grep -v /vendor/ | sed 's@/[^/]*$$@@' | sort | uniq`; do ( set -xe; \
+	@set -e; for dir in $(GOLIBS); do ( set -xe; \
 	  cd $$dir; \
 	  goimports -w . \
 	); done