Adding gps to dep

.codeclimate.yml

@@ -8,3 +8,4 @@ ratings:
     - "**.go"
 exclude_paths:
   - vendor/
+  - gps/_testdata

.travis.yml

@@ -13,22 +13,32 @@ matrix:
       go: tip
     - os: osx
       go: 1.8.x
+env:
+  # Flip bit to bypass tests - see dep#501 for more information
+  - DEPTESTBYPASS501=1
 install:
   - echo "This is an override of the default install deps step in travis."
 before_script:
   # OSX as of El Capitan sets an exit trap that interacts poorly with our
   # set -e below. So, unset the trap.
   # Related: https://superuser.com/questions/1044130/why-am-i-having-how-can-i-fix-this-error-shell-session-update-command-not-f
   - if [[ "$(go env GOHOSTOS)" == "darwin" ]]; then trap EXIT; fi
-  - PKGS=$(go list ./... | grep -v /vendor/)
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install bzr; fi
+  - PKGS=$(go list ./... | grep -v /vendor/ | grep -v _testdata/ )
   - go get -v honnef.co/go/tools/cmd/{gosimple,staticcheck}
   - npm install -g codeclimate-test-reporter
 script:
   - go build -v ./cmd/dep
-  - staticcheck $PKGS
+  - go vet $PKGS
+  # TODO (kris-nova) remove the ignore flag once we can refactor the code causing problems
+  - staticcheck -ignore='github.com/golang/dep/cmd/dep/status.go:SA4010' $PKGS
+  #- ./hack/validate-gofmt.bash
+  - ./hack/validate-vendor.bash
   - gosimple $PKGS
-  - set -e; for pkg in $PKGS; do go test -race -coverprofile=profile.out -covermode=atomic $pkg; if [[ -f profile.out ]]; then cat profile.out >> coverage.txt; rm profile.out; fi; done
+  #- go test -race $PKGS
   - go build ./hack/licenseok
+  - set -e; for pkg in $PKGS; do go test -race -coverprofile=profile.out -covermode=atomic $pkg; if [[ -f profile.out ]]; then cat profile.out >> coverage.txt; rm profile.out; fi; done
   - find . -path ./vendor -prune -o -type f -name "*.go" -printf '%P\n' | xargs ./licenseok
   - ./hack/validate-vendor.bash
 after_success:

Gopkg.toml

@@ -1,4 +1,3 @@
-# Temporarily, until gps moves in and this becomes a direct dep again
 required = ["github.com/Masterminds/semver"]
 
 [[dependencies]]
@@ -7,7 +6,7 @@ required = ["github.com/Masterminds/semver"]
 
 [[dependencies]]
   name = "github.com/Masterminds/vcs"
-  version = "^1.8.0"
+  version = "^1.11.0"
 
 [[dependencies]]
   branch = "master"
@@ -16,7 +15,3 @@ required = ["github.com/Masterminds/semver"]
 [[dependencies]]
   name = "github.com/pkg/errors"
   version = ">=0.8.0, <1.0.0"
-
-[[dependencies]]
-  name = "github.com/sdboyer/gps"
-  version = ">=0.16.0, <1.0.0"

analyzer.go

@@ -8,7 +8,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/sdboyer/gps"
+	"github.com/golang/dep/gps"
 )
 
 type Analyzer struct{}

appveyor.yml

@@ -7,6 +7,7 @@ clone_folder: c:\gopath\src\github.com\golang\dep
 
 environment:
   GOPATH: c:\gopath
+  DEPTESTBYPASS501: 1
   matrix:
     - environment:
       GOVERSION: 1.7.5
@@ -23,7 +24,8 @@ install:
   - rmdir c:\go /s /q
   - appveyor DownloadFile https://storage.googleapis.com/golang/go%GOVERSION%.windows-amd64.msi
   - msiexec /i go%GOVERSION%.windows-amd64.msi /q
-  - set Path=c:\go\bin;c:\gopath\bin;%Path%
+  - choco install bzr
+  - set Path=c:\go\bin;c:\gopath\bin;C:\Program Files (x86)\Bazaar\;C:\Program Files\Mercurial\%Path%
   - go version
   - go env
 
@@ -34,3 +36,9 @@ test_script:
   - go build
   - go test .
   - go test ./cmd/dep
+  - go test ./gps
+  - go test ./gps/internal
+  - go test ./gps/internal/fs
+  - go test ./gps/pkgtree
+  - go test ./internal
+  - go test ./test

cmd/dep/ensure.go

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

cmd/dep/ensure_test.go

@@ -7,7 +7,7 @@ package main
 import (
 	"testing"
 
-	"github.com/sdboyer/gps"
+	"github.com/golang/dep/gps"
 )
 
 func TestDeduceConstraint(t *testing.T) {

cmd/dep/hash_in.go

@@ -9,9 +9,9 @@ import (
 	"fmt"
 
 	"github.com/golang/dep"
+	"github.com/golang/dep/gps"
+	"github.com/golang/dep/gps/pkgtree"
 	"github.com/pkg/errors"
-	"github.com/sdboyer/gps"
-	"github.com/sdboyer/gps/pkgtree"
 )
 
 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/gps"
+	"github.com/golang/dep/gps/pkgtree"
 	"github.com/golang/dep/internal"
 	"github.com/pkg/errors"
-	"github.com/sdboyer/gps"
-	"github.com/sdboyer/gps/pkgtree"
 )
 
 const initShortHelp = `Initialize a new project with manifest and lock files`

cmd/dep/init_test.go

@@ -8,7 +8,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/sdboyer/gps"
+	"github.com/golang/dep/gps"
 )
 
 func TestContains(t *testing.T) {

cmd/dep/prune.go

@@ -12,8 +12,8 @@ import (
 	"os"
 
 	"github.com/golang/dep"
-	"github.com/sdboyer/gps"
-	"github.com/sdboyer/gps/pkgtree"
+	"github.com/golang/dep/gps"
+	"github.com/golang/dep/gps/pkgtree"
 
 	"github.com/pkg/errors"
 )

cmd/dep/remove.go

@@ -11,10 +11,10 @@ import (
 	"strings"
 
 	"github.com/golang/dep"
+	"github.com/golang/dep/gps"
+	"github.com/golang/dep/gps/pkgtree"
 	"github.com/golang/dep/internal"
 	"github.com/pkg/errors"
-	"github.com/sdboyer/gps"
-	"github.com/sdboyer/gps/pkgtree"
 )
 
 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/golang/dep/gps"
+	"github.com/golang/dep/gps/pkgtree"
 	"github.com/pkg/errors"
-	"github.com/sdboyer/gps"
-	"github.com/sdboyer/gps/pkgtree"
 )
 
 const statusShortHelp = `Report the status of the project's dependencies`

cmd/dep/status_test.go

@@ -7,7 +7,7 @@ package main
 import (
 	"testing"
 
-	"github.com/sdboyer/gps"
+	"github.com/golang/dep/gps"
 )
 
 func TestStatusFormatVersion(t *testing.T) {

context.go

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

context_test.go

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

vendor/github.com/sdboyer/gps/_testdata/cmd/echosleep.go → gps/_testdata/cmd/echosleep.go

@@ -1,3 +1,7 @@
+// 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.
+
 package main
 
 import (

gps/_testdata/src/bad/bad.go

@@ -0,0 +1,6 @@
+// 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 ill-formed Go source file is here to ensure the tool is robust
+// against bad packages in the workspace.

gps/_testdata/src/buildtag/invalid.go

@@ -0,0 +1,17 @@
+// 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.
+
+// Hello
+// Not a valid +build ignore
+// No Really
+
+package buildtag
+
+import (
+	"sort"
+)
+
+var (
+	_ = sort.Strings
+)

gps/_testdata/src/cycle/a.go

@@ -0,0 +1,15 @@
+// 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.
+
+package cycle
+
+import (
+	"cycle/one"
+	"github.com/golang/dep/gps"
+)
+
+var (
+	A = gps.Solve
+	B = one.A
+)

gps/_testdata/src/cycle/one/a.go

@@ -0,0 +1,15 @@
+// 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.
+
+package one
+
+import (
+	"cycle/two"
+	"github.com/golang/dep/gps"
+)
+
+var (
+	A = gps.Solve
+	B = two.A
+)

gps/_testdata/src/cycle/two/a.go

@@ -0,0 +1,15 @@
+// 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.
+
+package two
+
+import (
+	"cycle"
+	"github.com/golang/dep/gps"
+)
+
+var (
+	A = gps.Solve
+	B = cycle.A
+)

gps/_testdata/src/disallow/.m1p/a.go

@@ -0,0 +1,16 @@
+// 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.
+
+package m1p
+
+import (
+	"sort"
+
+	"github.com/golang/dep/gps"
+)
+
+var (
+	_ = sort.Strings
+	S = gps.Solve
+)

gps/_testdata/src/disallow/.m1p/b.go

@@ -0,0 +1,15 @@
+// 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.
+
+package m1p
+
+import (
+	"os"
+	"sort"
+)
+
+var (
+	_ = sort.Strings
+	_ = os.PathSeparator
+)

gps/_testdata/src/disallow/a.go

@@ -0,0 +1,18 @@
+// 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.
+
+package disallow
+
+import (
+	"disallow/testdata"
+	"sort"
+
+	"github.com/golang/dep/gps"
+)
+
+var (
+	_ = sort.Strings
+	_ = gps.Solve
+	_ = testdata.H
+)

gps/_testdata/src/disallow/testdata/another.go

@@ -0,0 +1,11 @@
+// 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.
+
+package testdata
+
+import "hash"
+
+var (
+	H = hash.Hash
+)