fix #54: fix mistake in example

.travis.yml

@@ -18,6 +18,8 @@ go:
   - 1.13.x
   - 1.14.x
 
+go_import_path: github.com/kamilsk/egg
+
 jobs:
   allow_failures:
     - go: master

Makefile

@@ -39,11 +39,6 @@ go-env:
 	@echo "PATHS:       $(strip $(PATHS))"
 	@echo "TIMEOUT:     $(TIMEOUT)"
 
-.PHONY: deps
-deps:
-	@go mod download
-	@if [[ "`go env GOFLAGS`" =~ -mod=vendor ]]; then go mod vendor; fi
-
 .PHONY: deps-check
 deps-check:
 	@go mod verify
@@ -60,18 +55,35 @@ deps-clean:
 deps-shake:
 	@go mod tidy
 
+.PHONY: module-deps
+module-deps:
+	@go mod download
+	@if [[ "`go env GOFLAGS`" =~ -mod=vendor ]]; then go mod vendor; fi
+
 .PHONY: update
 update: selector = '{{if not (or .Main .Indirect)}}{{.Path}}{{end}}'
 update:
 	@if command -v egg > /dev/null; then \
 		packages="`egg deps list`"; \
 	else \
 		packages="`go list -f $(selector) -m all`"; \
-	fi; go get -mod= -u $$packages
+	fi; go get -d -u $$packages
 
 .PHONY: update-all
 update-all:
-	@go get -mod= -u ./...
+	@go get -d -u ./...
+
+.PHONY: format
+format:
+	@goimports -local $(LOCAL) -ungroup -w $(PATHS)
+
+.PHONY: go-generate
+go-generate:
+	@go generate $(PACKAGES)
+
+.PHONY: lint
+lint:
+	@golangci-lint run ./...
 
 .PHONY: test
 test:
@@ -89,14 +101,6 @@ test-with-coverage:
 test-with-coverage-profile:
 	@go test -cover -covermode count -coverprofile c.out -timeout $(TIMEOUT) $(PACKAGES)
 
-.PHONY: format
-format:
-	@goimports -local $(LOCAL) -ungroup -w $(PATHS)
-
-.PHONY: generate
-generate:
-	@go generate $(PACKAGES)
-
 BINARY  = $(BINPATH)/$(shell basename $(MAIN))
 BINPATH = $(PWD)/bin
 COMMIT  = $(shell git rev-parse --verify HEAD)
@@ -142,12 +146,35 @@ dist-check:
 dist-dump:
 	@godownloader .goreleaser.yml > bin/install
 
+TOOLFLAGS = -mod=
+
+.PHONY: tools-env
+tools-env:
+	@echo "GOBIN:       `go env GOBIN`"
+	@echo "TOOLFLAGS:   $(TOOLFLAGS)"
+
+.PHONY: toolset
+toolset:
+	@( \
+		GOFLAGS=$(TOOLFLAGS); \
+		cd tools; \
+		go mod download; \
+		if [[ "`go env GOFLAGS`" =~ -mod=vendor ]]; then go mod vendor; fi; \
+		go generate tools.go; \
+	)
+
 
 .PHONY: clean
 clean: build-clean deps-clean install-clean test-clean
 
+.PHONY: deps
+deps: module-deps toolset
+
 .PHONY: env
-env: go-env build-env
+env: go-env build-env tools-env
+
+.PHONY: generate
+generate: go-generate format
 
 .PHONY: refresh
 refresh: deps-shake update deps generate format test build

README.md

@@ -8,7 +8,7 @@
 ## 💡 Idea
 
 ```bash
-$ egg tools add github.com/golangci/golangci-lint@latest
+$ egg tools  add golang.org/x/tools/cmd/goimports@latest
 
 $ egg binary get github.com/goreleaser/goreleaser@latest
 ```
@@ -56,7 +56,7 @@ $ go mod init your.module/tools
 $ egg tools init
 
 # add golangci-lint to tools.go
-$ egg tools add github.com/golangci/golangci-lint
+$ egg tools add github.com/golangci/golangci-lint/cmd/golangci-lint
 # add mockgen to tools.go and build it to bin/mockgen
 $ egg tools add --build github.com/golang/mock/mockgen
 

bin/activate

@@ -96,7 +96,7 @@ _OLD_PS1="${PS1:-}"
 
 export GO111MODULE=on
 export GOBIN="${_BINPATH}"
-export GOFLAGS=-mod=vendor
+export GOFLAGS=-mod=
 export GOPRIVATE=go.octolab.net
 export GOPROXY=direct
 export PATH="${_BINPATH}:${PATH}"

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/spf13/afero v1.2.2
 	github.com/spf13/cobra v0.0.6
 	github.com/stretchr/testify v1.5.1
-	go.octolab.org/toolkit/cli v0.0.6
+	go.octolab.org/toolkit/cli v0.0.7
 )
 
 replace github.com/izumin5210/gex => github.com/kamilsk/gex v0.6.0-e4

go.sum

@@ -127,6 +127,8 @@ go.octolab.org v0.0.5 h1:tahANpBotiOKW+kSM9ThBgxGo114CLS3TsNia3bA+6c=
 go.octolab.org v0.0.5/go.mod h1:5UoQWOX65NmlTeBT6fUgB7XXs7YmcmE9/sE6CTRvwVY=
 go.octolab.org/toolkit/cli v0.0.6 h1:PRhfgBBGxf05AXnpBAlWPkt6IBOJ5p5agXaVx7B21C0=
 go.octolab.org/toolkit/cli v0.0.6/go.mod h1:pwB5sV1q+/Cu7HTDCjWVZGbYZb0jLy6420FzCaFiIaU=
+go.octolab.org/toolkit/cli v0.0.7 h1:+ZtUyUk3rl31RNHca3add3BXIryzFcn2Trvr0aDtdAg=
+go.octolab.org/toolkit/cli v0.0.7/go.mod h1:Hvf/uskcVTs3GEei4ubloSTE8slHiB2k4CBm/UUA8a0=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
@@ -170,6 +172,7 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.5 h1:ymVxjfMaHvXD8RqPRmzHHsB3VvucivSkIAvJFDI5O3c=
 gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

tools/go.mod

@@ -3,8 +3,8 @@ module github.com/kamilsk/egg/tools
 go 1.11
 
 require (
-	github.com/golang/mock v1.4.1
-	github.com/golangci/golangci-lint v1.23.7
+	github.com/golang/mock v1.4.3
+	github.com/golangci/golangci-lint v1.24.0
 	golang.org/x/tools v0.3.3
 )
 

tools/go.sum

@@ -75,6 +75,8 @@ github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4er
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.4.1 h1:ocYkMQY5RrXTYgXl7ICpV0IXwlEQGwKIsery4gyXa1U=
 github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.3 h1:GV+pQPG/EUUbkh47niozDcADz6go/dUwhVzdUQHIVRw=
+github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
@@ -95,6 +97,8 @@ github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a h1:iR3fYXUjHCR97qWS
 github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a/go.mod h1:9qCChq59u/eW8im404Q2WWTrnBUQKjpNYKMbU4M7EFU=
 github.com/golangci/golangci-lint v1.23.7 h1:/rWK6IXb9k554NPStxDapUgHsJhKf73AsSWvYqIDkp8=
 github.com/golangci/golangci-lint v1.23.7/go.mod h1:g/38bxfhp4rI7zeWSxcdIeHTQGS58TCak8FYcyCmavQ=
+github.com/golangci/golangci-lint v1.24.0 h1:OcmSTTMPqI/VT4GvN1fKuE9NX15dDXIwolO0l08334U=
+github.com/golangci/golangci-lint v1.24.0/go.mod h1:yIqiAZ2SSQqg+1JeFlAdvEWjGVz4uu5jr4lrciqA1gE=
 github.com/golangci/ineffassign v0.0.0-20190609212857-42439a7714cc h1:gLLhTLMk2/SutryVJ6D4VZCU3CUqr8YloG7FPIBWFpI=
 github.com/golangci/ineffassign v0.0.0-20190609212857-42439a7714cc/go.mod h1:e5tpTHCfVze+7EpLEozzMB3eafxo2KT5veNg1k6byQU=
 github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 h1:MfyDlzVjl1hoaPzPD4Gpb/QgoRfSBR0jdhwGyAWwMSA=
@@ -254,6 +258,8 @@ github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e/go.mod h1:Qimiff
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tommy-muehle/go-mnd v1.1.1 h1:4D0wuPKjOTiK2garzuPGGvm4zZ/wLYDOH8TJSABC7KU=
 github.com/tommy-muehle/go-mnd v1.1.1/go.mod h1:dSUh0FtTP8VhvkL1S+gUR1OKd9ZnSaozuI6r3m6wOig=
+github.com/tommy-muehle/go-mnd v1.3.1-0.20200224220436-e6f9a994e8fa h1:RC4maTWLKKwb7p1cnoygsbKIgNlJqSYBeAFON3Ar8As=
+github.com/tommy-muehle/go-mnd v1.3.1-0.20200224220436-e6f9a994e8fa/go.mod h1:dSUh0FtTP8VhvkL1S+gUR1OKd9ZnSaozuI6r3m6wOig=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/ultraware/funlen v0.0.2 h1:Av96YVBwwNSe4MLR7iI/BIa3VyI7/djnto/pK3Uxbdo=
@@ -345,6 +351,8 @@ gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
+honnef.co/go/tools v0.0.1-2020.1.3 h1:sXmLre5bzIR6ypkjXCDI3jHPssRhc8KD/Ome589sc3U=
+honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed h1:WX1yoOaKQfddO/mLzdV4wptyWgoH/6hwLs7QHTixo0I=
 mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc=
 mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b h1:DxJ5nJdkhDlLok9K6qO+5290kphDJbHOQO1DFFFTeBo=