Merge pull request #1349 from tamalsaha/gomvpkg

Move gps package out of internal

.codeclimate.yml

@@ -10,7 +10,7 @@ ratings:
     - "**.go"
 exclude_paths:
   - vendor/
-  - internal/gps/_testdata
+  - gps/_testdata
   - cmd/dep/testdata
   - testdata
-  - internal/gps/internal/pb
+  - gps/internal/pb

.github/CODEOWNERS

@@ -22,4 +22,4 @@
 /cmd/dep/graphviz*                        @darkowlzz
 
 # gps caching
-/internal/gps/source_cache* @jmank88
+/gps/source_cache* @jmank88

CHANGELOG.md

@@ -8,6 +8,7 @@ BUG FIXES:
 IMPROVEMENTS:
 
 * Log as dependencies are pre-fetched during dep init ([#1176](https://github.com/golang/dep/pull/1176)).
+* Make the gps package importable ([#1349](https://github.com/golang/dep/pull/1349)).
 
 # v0.3.2
 

analyzer.go

@@ -8,8 +8,8 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/golang/dep/gps"
 	"github.com/golang/dep/internal/fs"
-	"github.com/golang/dep/internal/gps"
 )
 
 // Analyzer implements gps.ProjectAnalyzer.

appveyor.yml

@@ -1,6 +1,7 @@
 version: "{build}"
 
 # Source Config
+
 clone_folder: c:\gopath\src\github.com\golang\dep
 
 # Build host

cmd/dep/ensure.go

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

cmd/dep/ensure_test.go

@@ -14,8 +14,8 @@ import (
 	"testing"
 
 	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/gps/pkgtree"
+	"github.com/golang/dep/gps"
+	"github.com/golang/dep/gps/pkgtree"
 	"github.com/golang/dep/internal/test"
 )
 

cmd/dep/gopath_scanner.go

@@ -11,11 +11,11 @@ import (
 	"sync"
 
 	"github.com/golang/dep"
+	"github.com/golang/dep/gps"
+	"github.com/golang/dep/gps/paths"
+	"github.com/golang/dep/gps/pkgtree"
 	fb "github.com/golang/dep/internal/feedback"
 	"github.com/golang/dep/internal/fs"
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/gps/paths"
-	"github.com/golang/dep/internal/gps/pkgtree"
 	"github.com/pkg/errors"
 )
 

cmd/dep/gopath_scanner_test.go

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

cmd/dep/hash_in.go

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

cmd/dep/init.go

@@ -14,10 +14,10 @@ import (
 	"time"
 
 	"github.com/golang/dep"
+	"github.com/golang/dep/gps"
+	"github.com/golang/dep/gps/paths"
+	"github.com/golang/dep/gps/pkgtree"
 	"github.com/golang/dep/internal/fs"
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/gps/paths"
-	"github.com/golang/dep/internal/gps/pkgtree"
 	"github.com/pkg/errors"
 )
 

cmd/dep/init_test.go

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

cmd/dep/prune.go

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

cmd/dep/root_analyzer.go

@@ -12,8 +12,8 @@ import (
 	"golang.org/x/sync/errgroup"
 
 	"github.com/golang/dep"
+	"github.com/golang/dep/gps"
 	fb "github.com/golang/dep/internal/feedback"
-	"github.com/golang/dep/internal/gps"
 	"github.com/golang/dep/internal/importers"
 )
 

cmd/dep/status.go

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

cmd/dep/status_test.go

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

context.go

@@ -10,8 +10,8 @@ import (
 	"path/filepath"
 	"runtime"
 
+	"github.com/golang/dep/gps"
 	"github.com/golang/dep/internal/fs"
-	"github.com/golang/dep/internal/gps"
 	"github.com/pkg/errors"
 )
 

docs/FAQ.md

@@ -179,7 +179,7 @@ Once you have set that up, dep will automatically use that Token to authenticate
 
 The full algorithm is complex, but the most important thing to understand is
 that `dep` tries versions in a [certain
-order](https://godoc.org/github.com/golang/dep/internal/gps#SortForUpgrade),
+order](https://godoc.org/github.com/golang/dep/gps#SortForUpgrade),
 checking to see a version is acceptable according to specified constraints.
 
 - All semver versions come first, and sort mostly according to the semver 2.0

internal/gps/_testdata/src/cycle/a.go → gps/_testdata/src/cycle/a.go

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

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

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

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

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

internal/gps/_testdata/src/disallow/a.go → gps/_testdata/src/disallow/a.go

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

internal/gps/_testdata/src/dotgodir/.m1p/a.go → gps/_testdata/src/dotgodir/.m1p/a.go

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

internal/gps/_testdata/src/doublenest/a.go → gps/_testdata/src/doublenest/a.go

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

internal/gps/_testdata/src/m1p/a.go → gps/_testdata/src/doublenest/namemismatch/m1p/a.go

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

internal/gps/_testdata/src/varied/m1p/a.go → gps/_testdata/src/github.com/example/varied/m1p/a.go

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

internal/gps/_testdata/src/github.com/example/varied/simple/simple.go → gps/_testdata/src/github.com/example/varied/simple/simple.go

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

internal/gps/_testdata/src/igmaint/a.go → gps/_testdata/src/igmain/a.go

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

internal/gps/_testdata/src/igmainfirst/z.go → gps/_testdata/src/igmainfirst/z.go

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

internal/gps/_testdata/src/igmainlong/a.go → gps/_testdata/src/igmainlong/a.go

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

internal/gps/_testdata/src/nest/a.go → gps/_testdata/src/igmaint/a.go

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

internal/gps/_testdata/src/missing/m1p/a.go → gps/_testdata/src/m1p/a.go

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

internal/gps/_testdata/src/missing/a.go → gps/_testdata/src/missing/a.go

@@ -9,7 +9,7 @@ import (
 
 	"missing/missing"
 
-	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/gps"
 )
 
 var (

internal/gps/_testdata/src/doublenest/namemismatch/m1p/a.go → gps/_testdata/src/missing/m1p/a.go

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

internal/gps/_testdata/src/igmain/a.go → gps/_testdata/src/nest/a.go

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

internal/gps/_testdata/src/nest/m1p/a.go → gps/_testdata/src/nest/m1p/a.go

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

internal/gps/_testdata/src/relimport/dotdotslash/a.go → gps/_testdata/src/relimport/dotdotslash/a.go

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

gps/_testdata/src/ren/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
+	_ = gps.Solve
+)

gps/_testdata/src/ren/simple/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 simple
+
+import (
+	"sort"
+
+	"github.com/golang/dep/gps"
+)
+
+var (
+	_ = sort.Strings
+	_ = gps.Solve
+)