Merge pull request #25 from mkouhei/fixes-golint-violations

Fixes golint violations
mkouhei · Mar 4, 2017 · 02dc25e · 02dc25e
2 parents e4fa6f2 + 0070bfa
commit 02dc25e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 30 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,25 +1,15 @@
 language: go
 sudo: false
 
-matrix:
-  include:
-    - go: "1.2"
-      before_install:
-        - go get code.google.com/p/go.tools/cmd/cover
-        - go get code.google.com/p/go.tools/cmd/goimports
-    - go: "1.3"
-      before_install:
-        - go get code.google.com/p/go.tools/cmd/cover
-        - go get code.google.com/p/go.tools/cmd/goimports
-    - go: "1.4"
-      before_install:
-        - go get golang.org/x/tools/cmd/cover
-        - go get golang.org/x/tools/cmd/goimports
-    - go: "tip"
-      before_install:
-        - go get golang.org/x/tools/cmd/cover
-        - go get golang.org/x/tools/cmd/goimports
+go:
+  - 1.5
+  - 1.6
+  - 1.7
+  - 1.8
+  - tip
+
 install:
+  - go get golang.org/x/tools/cmd/goimports
   - go get github.com/mattn/goveralls
   - go get -d -v ./...
 script:

diff --git a/Makefile b/Makefile
@@ -79,10 +79,10 @@ prebuild: $(SRC)
 	$(PREBUILD_CMD)
 
 build: prebuild
-	go build -ldflags "-X main.ver $(shell git describe --always)" -o _build/$(BIN)
+	go build -ldflags "-X main.ver=$(shell git describe --always)" -o _build/$(BIN)
 
 build-only: $(SRC)
-	go build -ldflags "-X main.ver $(shell git describe --always)" -o _build/$(BIN)
+	go build -ldflags "-X main.ver=$(shell git describe --always)" -o _build/$(BIN)
 
 prebuild-docs:
 	@if [ -d $(CURDIR)/docs ] && [ -f $(CURDIR)/docs/requirements.txt ]; then \

diff --git a/env_test.go b/env_test.go
@@ -44,7 +44,7 @@ func TestNewEnv(t *testing.T) {
 	cleanDir(e.bldDir)
 }
 
-func Example_CheckInst() {
+func CheckInst() {
 	p := os.Getenv("PATH")
 	os.Setenv("PATH", "")
 	go checkInst()

diff --git a/main_test.go b/main_test.go
@@ -22,7 +22,7 @@ import (
 	"time"
 )
 
-func Example_MainVersion() {
+func MainVersion() {
 	os.Args = append(os.Args, "-version")
 	os.Args = append(os.Args, "-c")
 	main()
@@ -31,7 +31,7 @@ func Example_MainVersion() {
 	time.Sleep(time.Microsecond)
 }
 
-func Example_Run() {
+func Run() {
 	goVer = "go version goX.X.X\n"
 	ver = "x.x.x"
 	run(false, "")

diff --git a/shell_test.go b/shell_test.go
@@ -28,10 +28,8 @@ import (
 
 var (
 	testSrc = `package main
-import (
-"fmt"
-"os"
-)
+import "fmt"
+
 func main() {
 fmt.Println("hello")
 }
@@ -169,7 +167,7 @@ func TestRead(t *testing.T) {
 	os.Remove("dummy_code")
 }
 
-func ExampleGoGet() {
+func GoGet() {
 	e := newEnv(false, "")
 	imptQ := make(chan imptSpec, 1)
 	imptQ <- imptSpec{"fmt", ""}
@@ -178,7 +176,7 @@ func ExampleGoGet() {
 	//
 }
 
-func ExampleGoRun() {
+func GoRun() {
 	e := newEnv(true, "")
 	fp, err := os.OpenFile(e.tmpPath, os.O_WRONLY|os.O_CREATE, 0600)
 	if err != nil {
@@ -199,7 +197,7 @@ func ExampleGoRun() {
 
 }
 
-func ExampleGoRunFail() {
+func GoRunFail() {
 	e := newEnv(false, "")
 	e.goRun()
 	// Output: