Merge pull request #47 from cbroglie/golangci-lint

Migrate to golangci-lint

.goreleaser.yml

@@ -1,6 +1,6 @@
 env:
   - GO111MODULE=on
-  - CGO_ENABLED=1
+  - CGO_ENABLED=0
   - GOFLAGS=-mod=vendor
   - GOPROXY=off
 builds:

.travis.yml

@@ -2,6 +2,7 @@ language: go
 
 go:
   - 1.13.x
+  - 1.14.x
   - master
 
 script: make ci

Makefile

@@ -19,13 +19,15 @@ fmt:
 	go fmt ./...
 
 .PHONY: lint
-lint: bin/golint
-	go list ./... | xargs -L1 ./bin/golint -set_exit_status
+lint: bin/golangci-lint
+	./bin/golangci-lint run ./...
 
-bin/golint: $(shell find . -type f -name '*.go')
-	@mkdir -p $(dir $@)
-	go build -o $@ ./vendor/golang.org/x/lint/golint
+SOURCES     := $(shell find . -name '*.go')
+BUILD_FLAGS ?= -v
+LDFLAGS     ?= -w -s
 
-bin/%: $(shell find . -type f -name '*.go')
-	@mkdir -p $(dir $@)
-	go build -o $@ ./cmd/$(@F)
+bin/golangci-lint: $(SOURCES)
+	go build -o bin/golangci-lint ./vendor/github.com/golangci/golangci-lint/cmd/golangci-lint
+
+bin/%: $(SOURCES)
+	CGO_ENABLED=0 go build -o $@ $(BUILD_FLAGS) -ldflags "$(LDFLAGS)" ./cmd/$(@F)

cmd/mustache/main.go

@@ -39,8 +39,7 @@ func main() {
 
 func run(cmd *cobra.Command, args []string) error {
 	if len(args) == 0 {
-		cmd.Usage()
-		return nil
+		return cmd.Usage()
 	}
 
 	var data interface{}

go.mod

@@ -1,9 +1,9 @@
 module github.com/cbroglie/mustache
 
-go 1.13
+go 1.14
 
 require (
-	github.com/spf13/cobra v0.0.5
-	golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f
-	gopkg.in/yaml.v2 v2.2.7
+	github.com/golangci/golangci-lint v1.28.3
+	github.com/spf13/cobra v1.0.0
+	gopkg.in/yaml.v2 v2.3.0
 )

mustache.go

@@ -613,7 +613,8 @@ func renderSection(section *sectionElement, contextChain []interface{}, buf io.W
 func renderElement(element interface{}, contextChain []interface{}, buf io.Writer) error {
 	switch elem := element.(type) {
 	case *textElement:
-		buf.Write(elem.text)
+		_, err := buf.Write(elem.text)
+		return err
 	case *varElement:
 		defer func() {
 			if r := recover(); r != nil {

mustache_test.go

@@ -239,7 +239,7 @@ func TestMissing(t *testing.T) {
 		output, err := Render(test.tmpl, test.context)
 		if err == nil {
 			t.Errorf("%q expected missing variable error but got %q", test.tmpl, output)
-		} else if strings.Index(err.Error(), "Missing variable") == -1 {
+		} else if !strings.Contains(err.Error(), "Missing variable") {
 			t.Errorf("%q expected missing variable error but got %q", test.tmpl, err.Error())
 		}
 	}

tools.go

@@ -3,5 +3,5 @@
 package tools
 
 import (
-	_ "golang.org/x/lint/golint"
+	_ "github.com/golangci/golangci-lint/cmd/golangci-lint"
 )