Merge pull request #540 from davecheney/fixedbugs/519

gps: move gps to internal/gps

Author: sdboyer

.codeclimate.yml

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

analyzer.go

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

appveyor.yml

@@ -36,9 +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/gps
+  - go test ./internal/gps/internal
+  - go test ./internal/gps/internal/fs
+  - go test ./internal/gps/pkgtree
   - go test ./internal
   - go test ./test

cmd/dep/ensure.go

@@ -16,8 +16,8 @@ import (
 	"strings"
 
 	"github.com/golang/dep"
-	"github.com/golang/dep/gps"
-	"github.com/golang/dep/gps/pkgtree"
+	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/internal/gps/pkgtree"
 	"github.com/pkg/errors"
 )
 

cmd/dep/ensure_test.go

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

cmd/dep/hash_in.go

@@ -8,8 +8,8 @@ import (
 	"flag"
 
 	"github.com/golang/dep"
-	"github.com/golang/dep/gps"
-	"github.com/golang/dep/gps/pkgtree"
+	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/internal/gps/pkgtree"
 	"github.com/pkg/errors"
 )
 

cmd/dep/init.go

@@ -12,9 +12,9 @@ import (
 	"sync"
 
 	"github.com/golang/dep"
-	"github.com/golang/dep/gps"
-	"github.com/golang/dep/gps/pkgtree"
 	"github.com/golang/dep/internal"
+	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/internal/gps/pkgtree"
 	"github.com/pkg/errors"
 )
 

cmd/dep/init_test.go

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

cmd/dep/prune.go

@@ -10,9 +10,8 @@ import (
 	"fmt"
 
 	"github.com/golang/dep"
-	"github.com/golang/dep/gps"
-	"github.com/golang/dep/gps/pkgtree"
-
+	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/internal/gps/pkgtree"
 	"github.com/pkg/errors"
 )
 

cmd/dep/remove.go

@@ -9,8 +9,8 @@ import (
 	"strings"
 
 	"github.com/golang/dep"
-	"github.com/golang/dep/gps"
-	"github.com/golang/dep/gps/pkgtree"
+	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/internal/gps/pkgtree"
 	"github.com/pkg/errors"
 )
 

cmd/dep/status.go

@@ -15,8 +15,8 @@ import (
 	"text/tabwriter"
 
 	"github.com/golang/dep"
-	"github.com/golang/dep/gps"
-	"github.com/golang/dep/gps/pkgtree"
+	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/internal/gps/pkgtree"
 	"github.com/pkg/errors"
 )
 

cmd/dep/status_test.go

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

context.go

@@ -11,8 +11,8 @@ import (
 	"strings"
 
 	"github.com/Masterminds/vcs"
-	"github.com/golang/dep/gps"
 	"github.com/golang/dep/internal"
+	"github.com/golang/dep/internal/gps"
 	"github.com/pkg/errors"
 )
 

context_test.go

@@ -12,7 +12,7 @@ import (
 	"testing"
 	"unicode"
 
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 	"github.com/golang/dep/test"
 )
 

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

@@ -6,7 +6,7 @@ package cycle
 
 import (
 	"cycle/one"
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 )
 
 var (

gps/_testdata/src/ren/simple/a.go

@@ -6,7 +6,7 @@ package one
 
 import (
 	"cycle/two"
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 )
 
 var (

gps/_testdata/src/simple/a.go

@@ -6,7 +6,7 @@ package two
 
 import (
 	"cycle"
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 )
 
 var (

gps/_testdata/src/simpleallt/a.go

@@ -8,7 +8,7 @@ import (
 	"disallow/testdata"
 	"sort"
 
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 )
 
 var (

gps/_testdata/src/simplet/a.go

@@ -7,7 +7,7 @@ package base
 import (
 	"go/parser"
 
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 )
 
 var (

gps/_testdata/src/simplext/a.go

@@ -7,7 +7,7 @@ package m1p
 import (
 	"sort"
 
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 )
 
 var (

gps/_testdata/src/twopkgs/a.go

@@ -7,7 +7,7 @@ package m1p
 import (
 	"sort"
 
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 )
 
 var (

gps/_testdata/cmd/echosleep.go renamed to internal/gps/_testdata/cmd/echosleep.go

@@ -7,7 +7,7 @@ package simple
 import (
 	"go/parser"
 
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 )
 
 var (

gps/_testdata/src/bad/bad.go renamed to internal/gps/_testdata/src/bad/bad.go

@@ -7,7 +7,7 @@ package simple
 import (
 	"sort"
 
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 )
 
 var (

gps/_testdata/src/buildtag/invalid.go renamed to internal/gps/_testdata/src/buildtag/invalid.go

@@ -7,7 +7,7 @@ package simple
 import (
 	"sort"
 
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 )
 
 var (

gps/_testdata/src/cycle/a.go renamed to internal/gps/_testdata/src/cycle/a.go

@@ -7,7 +7,7 @@ package simple
 import (
 	"sort"
 
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 )
 
 var (

gps/_testdata/src/cycle/one/a.go renamed to internal/gps/_testdata/src/cycle/one/a.go

@@ -7,7 +7,7 @@ package simple
 import (
 	"sort"
 
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 )
 
 var (

gps/_testdata/src/cycle/two/a.go renamed to internal/gps/_testdata/src/cycle/two/a.go

@@ -7,7 +7,7 @@ package m1p
 import (
 	"sort"
 
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 )
 
 var (

gps/_testdata/src/disallow/.m1p/a.go renamed to internal/gps/_testdata/src/disallow/.m1p/a.go

@@ -7,7 +7,7 @@ package simple
 import (
 	"sort"
 
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 	"missing/missing"
 )
 

gps/_testdata/src/disallow/.m1p/b.go renamed to internal/gps/_testdata/src/disallow/.m1p/b.go

@@ -7,7 +7,7 @@ package m1p
 import (
 	"sort"
 
-	"github.com/golang/dep/gps"
+	"github.com/golang/dep/internal/gps"
 )
 
 var (