Update gps to v0.15.0

analyzer.go

@@ -8,7 +8,6 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/Masterminds/semver"
 	"github.com/sdboyer/gps"
 )
 
@@ -37,7 +36,6 @@ func (a analyzer) DeriveManifestAndLock(path string, n gps.ProjectRoot) (gps.Man
 	return m, nil, nil
 }
 
-func (a analyzer) Info() (string, *semver.Version) {
-	v, _ := semver.NewVersion("v0.0.1")
-	return "dep", v
+func (a analyzer) Info() (string, int) {
+	return "dep", 1
 }

cmd/dep/ensure.go

@@ -18,6 +18,7 @@ import (
 	"github.com/golang/dep"
 	"github.com/pkg/errors"
 	"github.com/sdboyer/gps"
+	"github.com/sdboyer/gps/pkgtree"
 )
 
 const ensureShortHelp = `Ensure a dependency is safely vendored in the project`
@@ -123,7 +124,7 @@ func (cmd *ensureCommand) Run(ctx *dep.Ctx, args []string) error {
 		params.Trace = true
 		params.TraceLogger = log.New(os.Stderr, "", 0)
 	}
-	params.RootPackageTree, err = gps.ListPackages(p.AbsRoot, string(p.ImportRoot))
+	params.RootPackageTree, err = pkgtree.ListPackages(p.AbsRoot, string(p.ImportRoot))
 	if err != nil {
 		return errors.Wrap(err, "ensure ListPackage for project")
 	}

cmd/dep/hash_in.go

@@ -11,6 +11,7 @@ import (
 	"github.com/golang/dep"
 	"github.com/pkg/errors"
 	"github.com/sdboyer/gps"
+	"github.com/sdboyer/gps/pkgtree"
 )
 
 func (cmd *hashinCommand) Name() string      { return "hash-inputs" }
@@ -42,7 +43,7 @@ func (hashinCommand) Run(ctx *dep.Ctx, args []string) error {
 		return errors.Wrap(err, "determineProjectRoot")
 	}
 
-	params.RootPackageTree, err = gps.ListPackages(p.AbsRoot, cpr)
+	params.RootPackageTree, err = pkgtree.ListPackages(p.AbsRoot, cpr)
 	if err != nil {
 		return errors.Wrap(err, "gps.ListPackages")
 	}

cmd/dep/init.go

@@ -15,6 +15,7 @@ import (
 	"github.com/golang/dep"
 	"github.com/pkg/errors"
 	"github.com/sdboyer/gps"
+	"github.com/sdboyer/gps/pkgtree"
 )
 
 const initShortHelp = `Initialize a new project with manifest and lock files`
@@ -89,7 +90,7 @@ func (cmd *initCommand) Run(ctx *dep.Ctx, args []string) error {
 		return errors.Wrap(err, "determineProjectRoot")
 	}
 	vlogf("Finding dependencies for %q...", cpr)
-	pkgT, err := gps.ListPackages(root, cpr)
+	pkgT, err := pkgtree.ListPackages(root, cpr)
 	if err != nil {
 		return errors.Wrap(err, "gps.ListPackages")
 	}
@@ -214,7 +215,7 @@ type projectData struct {
 	ondisk       map[gps.ProjectRoot]gps.Version // projects that were found on disk
 }
 
-func getProjectData(ctx *dep.Ctx, pkgT gps.PackageTree, cpr string, sm *gps.SourceMgr) (projectData, error) {
+func getProjectData(ctx *dep.Ctx, pkgT pkgtree.PackageTree, cpr string, sm *gps.SourceMgr) (projectData, error) {
 	constraints := make(gps.ProjectConstraints)
 	dependencies := make(map[gps.ProjectRoot][]string)
 	packages := make(map[string]bool)
@@ -285,7 +286,7 @@ func getProjectData(ctx *dep.Ctx, pkgT gps.PackageTree, cpr string, sm *gps.Sour
 	)
 
 	// cache of PackageTrees, so we don't parse projects more than once
-	ptrees := make(map[gps.ProjectRoot]gps.PackageTree)
+	ptrees := make(map[gps.ProjectRoot]pkgtree.PackageTree)
 
 	// depth-first traverser
 	var dft func(string) error
@@ -339,7 +340,7 @@ func getProjectData(ctx *dep.Ctx, pkgT gps.PackageTree, cpr string, sm *gps.Sour
 					ondisk[pr] = v
 				}
 
-				ptree, err = gps.ListPackages(r, string(pr))
+				ptree, err = pkgtree.ListPackages(r, string(pr))
 				if err != nil {
 					// Any error here other than an a nonexistent dir (which
 					// can't happen because we covered that case above) is

cmd/dep/remove.go

@@ -14,6 +14,7 @@ import (
 	"github.com/golang/dep"
 	"github.com/pkg/errors"
 	"github.com/sdboyer/gps"
+	"github.com/sdboyer/gps/pkgtree"
 )
 
 const removeShortHelp = `Remove a dependency from the project`
@@ -61,7 +62,7 @@ func (cmd *removeCommand) Run(ctx *dep.Ctx, args []string) error {
 		return errors.Wrap(err, "determineProjectRoot")
 	}
 
-	pkgT, err := gps.ListPackages(p.AbsRoot, cpr)
+	pkgT, err := pkgtree.ListPackages(p.AbsRoot, cpr)
 	if err != nil {
 		return errors.Wrap(err, "gps.ListPackages")
 	}

cmd/dep/status.go

@@ -17,6 +17,7 @@ import (
 
 	"github.com/golang/dep"
 	"github.com/sdboyer/gps"
+	"github.com/sdboyer/gps/pkgtree"
 )
 
 const statusShortHelp = `Report the status of the project's dependencies`
@@ -203,7 +204,7 @@ func runStatusAll(out outputter, p *dep.Project, sm *gps.SourceMgr) error {
 
 	// While the network churns on ListVersions() requests, statically analyze
 	// code from the current project.
-	ptree, err := gps.ListPackages(p.AbsRoot, string(p.ImportRoot))
+	ptree, err := pkgtree.ListPackages(p.AbsRoot, string(p.ImportRoot))
 	if err != nil {
 		return fmt.Errorf("analysis of local packages failed: %v", err)
 	}
@@ -368,7 +369,7 @@ func formatVersion(v gps.Version) string {
 	return v.String()
 }
 
-func collectConstraints(ptree gps.PackageTree, p *dep.Project, sm *gps.SourceMgr) map[string][]gps.Constraint {
+func collectConstraints(ptree pkgtree.PackageTree, p *dep.Project, sm *gps.SourceMgr) map[string][]gps.Constraint {
 	// TODO
 	return map[string][]gps.Constraint{}
 }

cmd/dep/testdata/harness_tests/ensure/empty/case1/final/lock.json

@@ -1,5 +1,5 @@
 {
-    "memo": "63510efb9632ec69c1164ce396d7ebea4ad3884b4fa508373da17226d5a39739",
+    "memo": "4b36ae008ef4be09dee7e2ae00606d44fd75f4310fd0d0ef6e744690290569de",
     "projects": [
         {
             "name": "github.com/sdboyer/deptest",

cmd/dep/testdata/harness_tests/ensure/empty/case2/final/lock.json

@@ -1,5 +1,5 @@
 {
-    "memo": "1a99b419931283cb086167ddfb2e8322df12e2648e139eb27a42904360e962ad",
+    "memo": "e7725ea56516a42a641aaaf5d48754258d9f3c59949cb8a0e8a21b1ab6e07179",
     "projects": [
         {
             "name": "github.com/sdboyer/deptest",

cmd/dep/testdata/harness_tests/ensure/override/case1/final/lock.json

@@ -1,5 +1,5 @@
 {
-    "memo": "70b47774699956441e395f458714b8e5800b54bebc73b046678245b9e1cfdc3b",
+    "memo": "8bca9526e654e56e05d9075d1f33fa5b649bf6d58aa7d71ca39e7fbea8468e07",
     "projects": [
         {
             "name": "github.com/sdboyer/deptest",

cmd/dep/testdata/harness_tests/ensure/update/case1/final/lock.json

@@ -1,5 +1,5 @@
 {
-    "memo": "3ee7126505b016d4b9140dc3521b931380fd9d61fd1d1e6612d6b5b56b21baad",
+    "memo": "1b381263a360eafafe3ef7f9be626672668d17250a3c9a8debd169d1b5e2eebb",
     "projects": [
         {
             "name": "github.com/sdboyer/deptest",

cmd/dep/testdata/harness_tests/ensure/update/case2/testcase.json

@@ -2,5 +2,6 @@
   "commands": [
     ["init"],
     ["ensure", "-n", "-update", "github.com/sdboyer/deptest"]
-  ]
+  ],
+  "vendor-final": []
 }

cmd/dep/testdata/harness_tests/init/case2/final/lock.json

@@ -1,5 +1,5 @@
 {
-    "memo": "1792d407a795640a2b821b350f481bc48852535ed17c98cae2cbe2912a9c3e36",
+    "memo": "88d2718cda70cce45158f953d2c6ead79c1db38e67e9704aff72be8fddb096e7",
     "projects": [
         {
             "name": "github.com/sdboyer/deptest",

cmd/dep/testdata/harness_tests/init/skip-hidden/final/lock.json

@@ -1,5 +1,5 @@
 {
-    "memo": "63510efb9632ec69c1164ce396d7ebea4ad3884b4fa508373da17226d5a39739",
+    "memo": "4b36ae008ef4be09dee7e2ae00606d44fd75f4310fd0d0ef6e744690290569de",
     "projects": [
         {
             "name": "github.com/sdboyer/deptest",

cmd/dep/testdata/harness_tests/remove/force/case1/final/lock.json

@@ -1,5 +1,5 @@
 {
-    "memo": "1792d407a795640a2b821b350f481bc48852535ed17c98cae2cbe2912a9c3e36",
+    "memo": "88d2718cda70cce45158f953d2c6ead79c1db38e67e9704aff72be8fddb096e7",
     "projects": [
         {
             "name": "github.com/sdboyer/deptest",

cmd/dep/testdata/harness_tests/remove/specific/case1/final/lock.json

@@ -1,5 +1,5 @@
 {
-    "memo": "1a90a1bc14e6c5302e5c936186412f7e61e380a3b82afc54ea387f3a237843f8",
+    "memo": "d414dbf5fc668c1085effa68372d02e54b23d058cc66f9fd19ba094c6a946d9b",
     "projects": [
         {
             "name": "github.com/sdboyer/deptest",

cmd/dep/testdata/harness_tests/remove/specific/case2/final/lock.json

@@ -1,5 +1,5 @@
 {
-    "memo": "ffb96eabfbb48ff1ae4f1ad2145a9e765f1e6aef7a3fbfd36a84ad875fcb3585",
+    "memo": "38d8431865759ee3bf28fbdfc464f98ee8b56319394ec717df45e9969544cfca",
     "projects": [
         {
             "name": "github.com/sdboyer/deptest",

cmd/dep/testdata/harness_tests/remove/unused/case1/final/lock.json

@@ -1,5 +1,5 @@
 {
-    "memo": "1a90a1bc14e6c5302e5c936186412f7e61e380a3b82afc54ea387f3a237843f8",
+    "memo": "d414dbf5fc668c1085effa68372d02e54b23d058cc66f9fd19ba094c6a946d9b",
     "projects": [
         {
             "name": "github.com/sdboyer/deptest",

lock.json

@@ -1,5 +1,5 @@
 {
-    "memo": "fc012dfb266db9deec4121dd38069e2556ba66a5514939662da94fac1251996e",
+    "memo": "31a7162c06758e4619ed89b91e1f48bf94ad14f394bbee79299ed0bb5150e409",
     "projects": [
         {
             "name": "github.com/Masterminds/semver",
@@ -11,8 +11,8 @@
         },
         {
             "name": "github.com/Masterminds/vcs",
-            "version": "v1.8.0",
-            "revision": "fbe9fb6ad5b5f35b3e82a7c21123cfc526cbf895",
+            "version": "v1.11.0",
+            "revision": "795e20f901c3d561de52811fb3488a2cb2c8588b",
             "packages": [
                 "."
             ]
@@ -35,10 +35,13 @@
         },
         {
             "name": "github.com/sdboyer/gps",
-            "version": "v0.14.1",
-            "revision": "287edec9f4ca516577cc3ac9744068a34c4c7b08",
+            "version": "v0.15.0",
+            "revision": "b0f646b744e74543c094023d05339ffb82458e35",
             "packages": [
-                "."
+                ".",
+                "internal",
+                "internal/fs",
+                "pkgtree"
             ]
         }
     ]

manifest.json

@@ -10,7 +10,7 @@
             "version": ">=0.8.0, <1.0.0"
         },
         "github.com/sdboyer/gps": {
-            "version": ">=0.14.0, <1.0.0"
+            "version": ">=0.15.0, <1.0.0"
         }
     }
 }