Chase improvements to input hashing in gps

analyzer.go

@@ -37,5 +37,5 @@ func (a analyzer) DeriveManifestAndLock(path string, n gps.ProjectRoot) (gps.Man
 
 func (a analyzer) Info() (name string, version *semver.Version) {
 	v, _ := semver.NewVersion("v0.0.1")
-	return "example-analyzer", v
+	return "hoard", v
 }

ensure.go

@@ -80,6 +80,7 @@ func (cmd *ensureCommand) Name() string      { return "ensure" }
 func (cmd *ensureCommand) Args() string      { return "[spec...]" }
 func (cmd *ensureCommand) ShortHelp() string { return ensureShortHelp }
 func (cmd *ensureCommand) LongHelp() string  { return ensureLongHelp }
+func (cmd *ensureCommand) Hidden() bool      { return false }
 
 func (cmd *ensureCommand) Register(fs *flag.FlagSet) {
 	fs.BoolVar(&cmd.examples, "examples", false, "print detailed usage examples")

ensure_test.go

@@ -58,7 +58,7 @@ func main() {
 
 	sysCommit := tg.getCommit("go.googlesource.com/sys")
 	expectedLock := `{
-    "memo": "595716d270828e763c811ef79c9c41f85b1d1bfbdfe85280036405c03772206c",
+    "memo": "574170053fb14e0ecdd0ec4d8bb3323b901cb98710ac0da175efdf881dd4fb81",
     "projects": [
         {
             "name": "github.com/Sirupsen/logrus",

hash_in.go

@@ -0,0 +1,57 @@
+// 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 (
+	"flag"
+	"fmt"
+
+	"github.com/pkg/errors"
+	"github.com/sdboyer/gps"
+)
+
+func (cmd *hashinCommand) Name() string      { return "hash-inputs" }
+func (cmd *hashinCommand) Args() string      { return "" }
+func (cmd *hashinCommand) ShortHelp() string { return "" }
+func (cmd *hashinCommand) LongHelp() string  { return "" }
+func (cmd *hashinCommand) Hidden() bool      { return true }
+
+func (cmd *hashinCommand) Register(fs *flag.FlagSet) {
+}
+
+type hashinCommand struct{}
+
+func (_ hashinCommand) Run(args []string) error {
+	p, err := nestContext.loadProject("")
+	if err != nil {
+		return err
+	}
+
+	sm, err := nestContext.sourceManager()
+	if err != nil {
+		return err
+	}
+	sm.UseDefaultSignalHandling()
+	defer sm.Release()
+
+	params := p.makeParams()
+	cpr, err := nestContext.splitAbsoluteProjectRoot(p.absroot)
+	if err != nil {
+		return errors.Wrap(err, "determineProjectRoot")
+	}
+
+	params.RootPackageTree, err = gps.ListPackages(p.absroot, cpr)
+	if err != nil {
+		return errors.Wrap(err, "gps.ListPackages")
+	}
+
+	s, err := gps.Prepare(params, sm)
+	if err != nil {
+		return errors.Wrap(err, "prepare solver")
+	}
+
+	fmt.Println(gps.HashingInputsAsString(s))
+	return nil
+}

init.go

@@ -35,6 +35,7 @@ func (cmd *initCommand) Name() string      { return "init" }
 func (cmd *initCommand) Args() string      { return "[root]" }
 func (cmd *initCommand) ShortHelp() string { return initShortHelp }
 func (cmd *initCommand) LongHelp() string  { return initLongHelp }
+func (cmd *initCommand) Hidden() bool      { return false }
 
 func (cmd *initCommand) Register(fs *flag.FlagSet) {}
 

init_test.go

@@ -7,7 +7,6 @@ package main
 import (
 	"os"
 	"path/filepath"
-	"regexp"
 	"runtime"
 	"testing"
 )
@@ -176,6 +175,7 @@ const Qux = "yo yo!"
 
 	sysCommit := tg.getCommit("go.googlesource.com/sys")
 	expectedLock := `{
+    "memo": "e5aa3024d5de3a019bf6541029effdcd434538399eb079f432635c8524d31238",
     "projects": [
         {
             "name": "github.com/Sirupsen/logrus",
@@ -203,14 +203,8 @@ const Qux = "yo yo!"
     ]
 }
 `
-	lock := wipeMemo(tg.readLock())
+	lock := tg.readLock()
 	if lock != expectedLock {
 		t.Fatalf("expected %s, got %s", expectedLock, lock)
 	}
 }
-
-var memoRE = regexp.MustCompile(`\s+"memo": "[a-z0-9]+",`)
-
-func wipeMemo(s string) string {
-	return memoRE.ReplaceAllString(s, "")
-}

lock.json

@@ -1,5 +1,5 @@
 {
-    "memo": "0c77f1de5f325906db6daf5260193d7de97af45498bc7155689395696cfd7c1b",
+    "memo": "cdafe8641b28cd16fe025df278b0a49b9416859345d8b6ba0ace0272b74925ee",
     "projects": [
         {
             "name": "github.com/Masterminds/semver",
@@ -36,7 +36,7 @@
         {
             "name": "github.com/sdboyer/gps",
             "branch": "master",
-            "revision": "669a62fc8b4b2c48757f6ff89aeba9eb8f287a9c",
+            "revision": "69fdac2db538237e27bbf7a68a305e78e0044591",
             "packages": [
                 "."
             ]

main.go

@@ -33,6 +33,7 @@ type command interface {
 	ShortHelp() string      // "Foo the first bar"
 	LongHelp() string       // "Foo the first bar meeting the following conditions..."
 	Register(*flag.FlagSet) // command-specific flags
+	Hidden() bool           // indicates whether the command should be hidden from help output
 	Run([]string) error
 }
 
@@ -52,6 +53,7 @@ func main() {
 		&statusCommand{},
 		&ensureCommand{},
 		&removeCommand{},
+		&hashinCommand{},
 	}
 
 	usage := func() {
@@ -61,7 +63,9 @@ func main() {
 		fmt.Fprintln(os.Stderr)
 		w := tabwriter.NewWriter(os.Stderr, 0, 4, 2, ' ', 0)
 		for _, command := range commands {
-			fmt.Fprintf(w, "\t%s\t%s\n", command.Name(), command.ShortHelp())
+			if !command.Hidden() {
+				fmt.Fprintf(w, "\t%s\t%s\n", command.Name(), command.ShortHelp())
+			}
 		}
 		w.Flush()
 		fmt.Fprintln(os.Stderr)

remove.go

@@ -26,6 +26,7 @@ func (cmd *removeCommand) Name() string      { return "remove" }
 func (cmd *removeCommand) Args() string      { return "[spec...]" }
 func (cmd *removeCommand) ShortHelp() string { return removeShortHelp }
 func (cmd *removeCommand) LongHelp() string  { return removeLongHelp }
+func (cmd *removeCommand) Hidden() bool      { return false }
 
 func (cmd *removeCommand) Register(fs *flag.FlagSet) {
 	fs.BoolVar(&cmd.dryRun, "n", false, "dry run, don't actually remove anything")

remove_test.go

@@ -123,6 +123,7 @@ func main() {
 
 	sysCommit := tg.getCommit("go.googlesource.com/sys")
 	expectedLock := `{
+    "memo": "c2d1935d281595034e4afeb49d13981f4210badea72ac78c3eb2ba01f36c3ceb",
     "projects": [
         {
             "name": "github.com/Sirupsen/logrus",
@@ -150,7 +151,7 @@ func main() {
     ]
 }
 `
-	lock := wipeMemo(tg.readLock())
+	lock := tg.readLock()
 	if lock != expectedLock {
 		t.Fatalf("expected %s, got %s", expectedLock, lock)
 	}

status.go

@@ -40,6 +40,7 @@ func (cmd *statusCommand) Name() string      { return "status" }
 func (cmd *statusCommand) Args() string      { return "[package...]" }
 func (cmd *statusCommand) ShortHelp() string { return statusShortHelp }
 func (cmd *statusCommand) LongHelp() string  { return statusLongHelp }
+func (cmd *statusCommand) Hidden() bool      { return false }
 
 func (cmd *statusCommand) Register(fs *flag.FlagSet) {
 	fs.BoolVar(&cmd.detailed, "detailed", false, "report more detailed status")