Fix gofmt and travis

 - Changes to travis.yml
 - New hack validate-gofmt.bash script
 - Fixing staticcheck in gps
 - Fixing gosimple in gps

.travis.yml

@@ -24,10 +24,10 @@ script:
   # Ignore the deprecation warning about filepath.HasPrefix (SA1019). This flag
   # can be removed when issue #296 is resolved.
   - staticcheck -ignore='github.com/golang/dep/context.go:SA1019 github.com/golang/dep/cmd/dep/init.go:SA1019 github.com/golang/dep/cmd/dep/status.go:SA4010' $PKGS
-  #- test -z "$(gofmt -s -l . 2>&1 | grep -v vendor/ | tee /dev/stderr)"
-  - find * -maxdepth 1 ! -path "testdata" ! -path "vendor" ! -path "gps/_testdata" -type d -print0 | xargs -0 gofmt -s -l
+  - ./hack/validate-gofmt.bash
+  - ./hack/validate-vendor.bash
   - gosimple $PKGS
   - go test -race $PKGS
   - go build ./hack/licenseok
   - find . -path ./vendor -prune -o -type f -name "*.go" -printf '%P\n' | xargs ./licenseok
-  - ./hack/validate-vendor.bash
+

cmd/dep/ensure.go

@@ -16,10 +16,10 @@ import (
 	"strings"
 
 	"github.com/golang/dep"
-	"github.com/golang/dep/internal"
-	"github.com/pkg/errors"
 	"github.com/golang/dep/gps"
 	"github.com/golang/dep/gps/pkgtree"
+	"github.com/golang/dep/internal"
+	"github.com/pkg/errors"
 )
 
 const ensureShortHelp = `Ensure a dependency is safely vendored in the project`

cmd/dep/hash_in.go

@@ -9,9 +9,9 @@ import (
 	"fmt"
 
 	"github.com/golang/dep"
-	"github.com/pkg/errors"
 	"github.com/golang/dep/gps"
 	"github.com/golang/dep/gps/pkgtree"
+	"github.com/pkg/errors"
 )
 
 func (cmd *hashinCommand) Name() string      { return "hash-inputs" }

cmd/dep/init.go

@@ -13,10 +13,10 @@ import (
 	"strings"
 
 	"github.com/golang/dep"
-	"github.com/golang/dep/internal"
-	"github.com/pkg/errors"
 	"github.com/golang/dep/gps"
 	"github.com/golang/dep/gps/pkgtree"
+	"github.com/golang/dep/internal"
+	"github.com/pkg/errors"
 )
 
 const initShortHelp = `Initialize a new project with manifest and lock files`

cmd/dep/remove.go

@@ -11,10 +11,10 @@ import (
 	"strings"
 
 	"github.com/golang/dep"
-	"github.com/golang/dep/internal"
-	"github.com/pkg/errors"
 	"github.com/golang/dep/gps"
 	"github.com/golang/dep/gps/pkgtree"
+	"github.com/golang/dep/internal"
+	"github.com/pkg/errors"
 )
 
 const removeShortHelp = `Remove a dependency from the project`

cmd/dep/status.go

@@ -16,9 +16,9 @@ import (
 	"text/tabwriter"
 
 	"github.com/golang/dep"
-	"github.com/pkg/errors"
 	"github.com/golang/dep/gps"
 	"github.com/golang/dep/gps/pkgtree"
+	"github.com/pkg/errors"
 )
 
 const statusShortHelp = `Report the status of the project's dependencies`

context.go

@@ -11,8 +11,8 @@ import (
 	"strings"
 
 	"github.com/Masterminds/vcs"
-	"github.com/pkg/errors"
 	"github.com/golang/dep/gps"
+	"github.com/pkg/errors"
 )
 
 // Ctx defines the supporting context of the tool.

context_test.go

@@ -12,8 +12,8 @@ import (
 	"testing"
 	"unicode"
 
-	"github.com/golang/dep/test"
 	"github.com/golang/dep/gps"
+	"github.com/golang/dep/test"
 )
 
 func TestNewContextNoGOPATH(t *testing.T) {

gps/_testdata/src/disallow/a.go

@@ -1,8 +1,8 @@
 package disallow
 
 import (
-	"sort"
 	"disallow/testdata"
+	"sort"
 
 	"github.com/golang/dep/gps"
 )

gps/_testdata/src/missing/a.go

@@ -3,8 +3,8 @@ package simple
 import (
 	"sort"
 
-	"missing/missing"
 	"github.com/golang/dep/gps"
+	"missing/missing"
 )
 
 var (

gps/deduce_test.go

@@ -614,7 +614,7 @@ func TestVanityDeduction(t *testing.T) {
 	do := func(t *testing.T) {
 		for _, fix := range vanities {
 			fix := fix
-			t.Run(fmt.Sprintf("%s", fix.in), func(t *testing.T) {
+			t.Run(fix.in, func(t *testing.T) {
 				t.Parallel()
 
 				pr, err := sm.DeduceProjectRoot(fix.in)

gps/internal/fs/fs.go

@@ -168,4 +168,3 @@ func CopyFile(src, dst string) (err error) {
 
 	return
 }
-

gps/internal/internal_test.go

@@ -25,4 +25,3 @@ func TestIsStdLib(t *testing.T) {
 		}
 	}
 }
-

gps/manager_test.go

@@ -839,7 +839,7 @@ func TestSupervisor(t *testing.T) {
 	}()
 
 	<-wait
-	err = <- errchan
+	err = <-errchan
 	if err != nil {
 		t.Fatal("unexpected err on do() completion:", err)
 	}

gps/pkgtree/pkgtree_test.go

@@ -1839,8 +1839,8 @@ func TestFlattenReachMap(t *testing.T) {
 	name = "ignore external"
 	ignore = map[string]bool{
 		"github.com/golang/dep/gps": true,
-		"go/parser":              true,
-		"sort":                   true,
+		"go/parser":                 true,
+		"sort":                      true,
 	}
 	except("sort", "github.com/golang/dep/gps", "go/parser")
 	validate()

gps/pkgtree/reachmap.go

@@ -72,4 +72,4 @@ func (rm ReachMap) flatten(filter func(string) bool, stdlib bool) []string {
 
 	sort.Strings(ex)
 	return ex
-}
+}

gps/source_manager.go

@@ -12,8 +12,8 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/sdboyer/constext"
 	"github.com/golang/dep/gps/pkgtree"
+	"github.com/sdboyer/constext"
 )
 
 // Used to compute a friendly filepath from a URL-shaped input.
@@ -535,7 +535,7 @@ func (sup *supervisor) done(ci callInfo) {
 		// Last one for this particular key; update metrics with info.
 		durCnt := sup.ran[ci.typ]
 		durCnt.count++
-		durCnt.dur += time.Now().Sub(existingInfo.start)
+		durCnt.dur += time.Since(existingInfo.start)
 		sup.ran[ci.typ] = durCnt
 		delete(sup.running, ci)
 

gps/vcs_source.go

@@ -259,7 +259,7 @@ func (s *gitSource) listVersions(ctx context.Context) (vlist []PairedVersion, er
 		for k, v := range vlist {
 			pv := v.(PairedVersion)
 			if bv, ok := pv.Unpair().(branchVersion); ok {
-				if bv.name != "master" && bv.isDefault == true {
+				if bv.name != "master" && bv.isDefault {
 					bv.isDefault = false
 					vlist[k] = bv.Is(pv.Underlying())
 				}

hack/validate-gofmt.bash

@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+# Copyright 2017 The Go Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+#
+# This script will validate that `go fmt` has been ran
+# and is passing for certain directories in the project.
+#
+# Here we use `go list` to help determine which packages
+# we need to check for `go gmt`
+#
+# EXIT 0 - The check is successful
+# EXIT 1 - The check has failed
+
+PKGS=$(go list ./... | grep -v /vendor/)
+REPO_TLD="github.com/golang/dep"
+IGNORE_PKGS=". ./gps"
+
+for PKG in $PKGS; do
+    RELATIVE_PATH="${PKG/$REPO_TLD/.}"
+    i=0
+    for IGNORE_PKG in $IGNORE_PKGS; do
+        if [ "${IGNORE_PKG}" == $RELATIVE_PATH ]; then
+            i=1
+        fi
+    done;
+    if [ $i -eq 1 ]; then
+        continue
+    fi
+
+    echo "Processing gofmt for: ${PKG}"
+    gofmt -s -l $RELATIVE_PATH
+    if [ $? -ne 0 ]; then
+        echo "GO FMT FAILURE: ${PKG}"
+        exit 1
+    fi
+done;
+exit 0

lock.go

@@ -10,9 +10,9 @@ import (
 	"sort"
 
 	"bytes"
+	"github.com/golang/dep/gps"
 	"github.com/pelletier/go-toml"
 	"github.com/pkg/errors"
-	"github.com/golang/dep/gps"
 )
 
 const LockName = "Gopkg.lock"

lock_test.go

@@ -10,8 +10,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/golang/dep/test"
 	"github.com/golang/dep/gps"
+	"github.com/golang/dep/test"
 )
 
 func TestReadLock(t *testing.T) {

manifest.go

@@ -10,9 +10,9 @@ import (
 
 	"bytes"
 
+	"github.com/golang/dep/gps"
 	"github.com/pelletier/go-toml"
 	"github.com/pkg/errors"
-	"github.com/golang/dep/gps"
 )
 
 const ManifestName = "Gopkg.toml"

manifest_test.go

@@ -9,8 +9,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/golang/dep/test"
 	"github.com/golang/dep/gps"
+	"github.com/golang/dep/test"
 )
 
 func TestReadManifest(t *testing.T) {

project.go

@@ -9,8 +9,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/pkg/errors"
 	"github.com/golang/dep/gps"
+	"github.com/pkg/errors"
 )
 
 var errProjectNotFound = fmt.Errorf("could not find project %s, use dep init to initiate a manifest", ManifestName)

project_test.go

@@ -10,8 +10,8 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/golang/dep/test"
 	"github.com/golang/dep/gps"
+	"github.com/golang/dep/test"
 )
 
 func TestFindRoot(t *testing.T) {

test_project_context_test.go

@@ -7,9 +7,9 @@ package dep
 import (
 	"path/filepath"
 
+	"github.com/golang/dep/gps"
 	"github.com/golang/dep/test"
 	"github.com/pkg/errors"
-	"github.com/golang/dep/gps"
 )
 
 // TestProjectContext groups together test project files and helps test them

txn_writer.go

@@ -13,9 +13,9 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/golang/dep/gps"
 	"github.com/pelletier/go-toml"
 	"github.com/pkg/errors"
-	"github.com/golang/dep/gps"
 )
 
 // SafeWriter transactionalizes writes of manifest, lock, and vendor dir, both