Upgrade go1.11 module

Author: subchen

.travis.yml

@@ -1,7 +1,7 @@
 language: go
 
 go:
-  - 1.9
+  - 1.11
 
 env:
   global:
@@ -15,14 +15,11 @@ sudo: required
 services:
   - docker
 
-before_script:
-  - go get golang.org/x/tools/cmd/goimports
-
 script:
-  - make build
+  - make build-linux
 
 after_success:
-  - if [ -n "$TRAVIS_TAG" ]; then make release; fi
+  - if [ -n "$TRAVIS_TAG" ]; then make releases_in_docker; fi
 
 deploy:
   provider: releases

Makefile

@@ -4,8 +4,9 @@ VERSION := 1.3.4
 
 LDFLAGS := -s -w \
            -X 'main.BuildVersion=$(VERSION)' \
-           -X 'main.BuildGitRev=$(shell git rev-list HEAD --count)' \
-           -X 'main.BuildGitCommit=$(shell git describe --abbrev=0 --always)' \
+           -X 'main.BuildGitBranch=$(shell git describe --all)' \
+           -X 'main.BuildGitRev=$(shell git rev-list --count HEAD)' \
+           -X 'main.BuildGitCommit=$(shell git rev-parse HEAD)' \
            -X 'main.BuildDate=$(shell date -u -R)'
 
 default:
@@ -14,13 +15,7 @@ default:
 clean:
 	@ rm -rf $(NAME) ./_releases ./_build
 
-glide-vc:
-	@ glide update
-	@ glide-vc --only-code --no-tests --no-legal-files
-
 fmt:
-	# find . -type f -name '*.go' -not -path "./vendor/*" | xargs goimports -w
-	@ go list -f "{{range .GoFiles}}{{$$.Dir}}/{{.}} {{end}} {{range .TestGoFiles}}{{$$.Dir}}/{{.}} {{end}}" ./... | xargs goimports -w
 	@ go fmt ./...
 
 lint:
@@ -29,7 +24,9 @@ lint:
 build: \
     build-linux \
     build-darwin \
-    build-windows
+    build-windows \
+    rpm \
+    deb
 
 build-linux: clean fmt
 	@ CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -installsuffix cgo -ldflags "$(LDFLAGS)" -o _releases/$(NAME)-$(VERSION)-linux-amd64
@@ -87,4 +84,13 @@ sha256sum: build
 		cd $(CWD)/_releases; sha256sum "$$f" >> $$f.sha256; \
 	done
 
-release: build sha256sum homebrew docker
+releases: build sha256sum homebrew docker
+
+releases_in_docker:
+	docker run --rm -it \
+	  -v $(CWD):/workspace \
+	  -e GITHUB_TOKEN=$(GITHUB_TOKEN) \
+	  -e DOCKER_PASSWORD=$(DOCKER_PASSWORD) \
+	  --workdir /workspace \
+	  subchen/centos:7-dev \
+	  make releases

glide.lock

@@ -0,0 +1,14 @@
+module github.com/subchen/frep
+
+require (
+	github.com/BurntSushi/toml v0.3.1
+	github.com/Masterminds/semver v1.4.2 // indirect
+	github.com/Masterminds/sprig v2.17.1+incompatible
+	github.com/aokoli/goutils v1.1.0 // indirect
+	github.com/go-yaml/yaml v2.1.0+incompatible
+	github.com/google/uuid v1.1.0 // indirect
+	github.com/huandu/xstrings v1.2.0 // indirect
+	github.com/imdario/mergo v0.3.6 // indirect
+	github.com/subchen/go-cli v2.0.0+incompatible
+	golang.org/x/crypto v0.0.0-20190103213133-ff983b9c42bc // indirect
+)

glide.yaml

@@ -0,0 +1,20 @@
+github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc=
+github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
+github.com/Masterminds/sprig v2.17.1+incompatible h1:PChbxFGKTWsg9IWh+pSZRCSj3zQkVpL6Hd9uWsFwxtc=
+github.com/Masterminds/sprig v2.17.1+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o=
+github.com/aokoli/goutils v1.1.0 h1:jy4ghdcYvs5EIoGssZNslIASX5m+KNMfyyKvRQ0TEVE=
+github.com/aokoli/goutils v1.1.0/go.mod h1:SijmP0QR8LtwsmDs8Yii5Z/S4trXFGFC2oO5g9DP+DQ=
+github.com/go-yaml/yaml v2.1.0+incompatible h1:RYi2hDdss1u4YE7GwixGzWwVo47T8UQwnTLB6vQiq+o=
+github.com/go-yaml/yaml v2.1.0+incompatible/go.mod h1:w2MrLa16VYP0jy6N7M5kHaCkaLENm+P+Tv+MfurjSw0=
+github.com/google/uuid v1.1.0 h1:Jf4mxPC/ziBnoPIdpQdPJ9OeiomAUHLvxmPRSPH9m4s=
+github.com/google/uuid v1.1.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/huandu/xstrings v1.2.0 h1:yPeWdRnmynF7p+lLYz0H2tthW9lqhMJrQV/U7yy4wX0=
+github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4=
+github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28=
+github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/subchen/go-cli v2.0.0+incompatible h1:8A2Y13R3ZcE5B7RO5TSKV5KwquwuUKB5jri5gmA9xlI=
+github.com/subchen/go-cli v2.0.0+incompatible/go.mod h1:XgWUJcEvZzeSp62+RgNZe61w19G/xIBVuQY9u2qpXmk=
+golang.org/x/crypto v0.0.0-20190103213133-ff983b9c42bc h1:F5tKCVGp+MUAHhKp5MZtGqAlGX3+oCsiL1Q629FL90M=
+golang.org/x/crypto v0.0.0-20190103213133-ff983b9c42bc/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=

go.mod

@@ -16,6 +16,7 @@ import (
 // version
 var (
 	BuildVersion   string
+	BuildGitBranch string
 	BuildGitRev    string
 	BuildGitCommit string
 	BuildDate      string
@@ -207,11 +208,13 @@ frep nginx.conf.in --load config.json --overwrite
 echo "{{ .Env.PATH }}"  | frep -
 `)
 
-	if BuildVersion != "" {
-		app.Version = BuildVersion + "-" + BuildGitRev
+	app.Version = BuildVersion
+	app.BuildInfo = &cli.BuildInfo{
+		GitBranch:   BuildGitBranch,
+		GitCommit:   BuildGitCommit,
+		GitRevCount: BuildGitRev,
+		Timestamp:   BuildDate,
 	}
-	app.BuildGitCommit = BuildGitCommit
-	app.BuildDate = BuildDate
 
 	app.Action = func(c *cli.Context) {
 		if c.NArg() == 0 {