Import glide config during dep init

Use -skip-tools to bypass this behavior

Author: carolynvs

Gopkg.lock

@@ -6,14 +6,12 @@ package main
 
 import (
 	"bytes"
-	"encoding/hex"
 	"flag"
 	"fmt"
 	"go/build"
 	"log"
 	"os"
 	"path/filepath"
-	"strconv"
 	"strings"
 
 	"github.com/golang/dep"
@@ -275,7 +273,7 @@ func getProjectConstraint(arg string, sm *gps.SourceMgr) (gps.ProjectConstraint,
 		parts := strings.SplitN(arg, "@", 2)
 		arg = parts[0]
 		versionStr = parts[1]
-		constraint.Constraint = deduceConstraint(parts[1])
+		constraint.Constraint = gps.DeduceConstraint(parts[1])
 	}
 	// TODO: What if there is no @, assume default branch (which may not be master) ?
 	// TODO: if we decide to keep equals.....
@@ -327,48 +325,6 @@ func getProjectConstraint(arg string, sm *gps.SourceMgr) (gps.ProjectConstraint,
 	return constraint, nil
 }
 
-// deduceConstraint tries to puzzle out what kind of version is given in a string -
-// semver, a revision, or as a fallback, a plain tag
-func deduceConstraint(s string) gps.Constraint {
-	// always semver if we can
-	c, err := gps.NewSemverConstraint(s)
-	if err == nil {
-		return c
-	}
-
-	slen := len(s)
-	if slen == 40 {
-		if _, err = hex.DecodeString(s); err == nil {
-			// Whether or not it's intended to be a SHA1 digest, this is a
-			// valid byte sequence for that, so go with Revision. This
-			// covers git and hg
-			return gps.Revision(s)
-		}
-	}
-	// Next, try for bzr, which has a three-component GUID separated by
-	// dashes. There should be two, but the email part could contain
-	// internal dashes
-	if strings.Count(s, "-") >= 2 {
-		// Work from the back to avoid potential confusion from the email
-		i3 := strings.LastIndex(s, "-")
-		// Skip if - is last char, otherwise this would panic on bounds err
-		if slen == i3+1 {
-			return gps.NewVersion(s)
-		}
-
-		i2 := strings.LastIndex(s[:i3], "-")
-		if _, err = strconv.ParseUint(s[i2+1:i3], 10, 64); err == nil {
-			// Getting this far means it'd pretty much be nuts if it's not a
-			// bzr rev, so don't bother parsing the email.
-			return gps.Revision(s)
-		}
-	}
-
-	// If not a plain SHA1 or bzr custom GUID, assume a plain version.
-	// TODO: if there is amgibuity here, then prompt the user?
-	return gps.NewVersion(s)
-}
-
 func checkErrors(m map[string]pkgtree.PackageOrErr) error {
 	noGoErrors, pkgErrors := 0, 0
 	for _, poe := range m {

cmd/dep/ensure.go

@@ -16,6 +16,7 @@ import (
 	"github.com/golang/dep/gps"
 	"github.com/golang/dep/gps/pkgtree"
 	"github.com/golang/dep/internal"
+	"github.com/golang/dep/internal/importer"
 	"github.com/pkg/errors"
 )
 
@@ -33,6 +34,10 @@ versions available from the upstream source per the following algorithm:
  - Default branch(es) (sorted lexicographically)
  - Non-semver tags (sorted lexicographically)
 
+If configuration files for other dependency management tools are found, they
+are used to pre-populate the manifest and lock. Specify -skip-tools to disable
+this behavior.
+
 A Gopkg.toml file will be written with inferred version constraints for all
 direct dependencies. Gopkg.lock will be written with precise versions, and
 vendor/ will be populated with the precise versions written to Gopkg.lock.
@@ -46,10 +51,12 @@ func (cmd *initCommand) Hidden() bool      { return false }
 
 func (cmd *initCommand) Register(fs *flag.FlagSet) {
 	fs.BoolVar(&cmd.noExamples, "no-examples", false, "don't include example in Gopkg.toml")
+	fs.BoolVar(&cmd.skipTools, "skip-tools", false, "skip importing configuration from other dependency manager tools")
 }
 
 type initCommand struct {
 	noExamples bool
+	skipTools  bool
 }
 
 func trimPathPrefix(p1, p2 string) string {
@@ -116,10 +123,26 @@ func (cmd *initCommand) Run(ctx *dep.Ctx, args []string) error {
 	if err != nil {
 		return err
 	}
+
 	m := &dep.Manifest{
 		Dependencies: pd.constraints,
 	}
 
+	if !cmd.skipTools {
+		ipd, err := importer.Import(root, cpr)
+		if err != nil {
+			return errors.Wrap(err, "Error importing dependency management configuration")
+		}
+
+		if ipd != nil {
+			m.Ignored = ipd.Ignored
+			for pr, c := range ipd.Dependencies {
+				internal.Vlogf("Importing dependency on %s: %s", pr, c)
+				m.Dependencies[pr] = c
+			}
+		}
+	}
+
 	// Make an initial lock from what knowledge we've collected about the
 	// versions on disk
 	l := &dep.Lock{

cmd/dep/ensure_test.go

@@ -0,0 +1,14 @@
+ignored = ["github.com/sdboyer/dep-test","github.com/golang/notexist/samples"]
+
+[[dependencies]]
+  branch = "master"
+  name = "github.com/golang/lint"
+
+[[dependencies]]
+  branch = "master"
+  name = "github.com/sdboyer/deptest"
+  source = "https://github.com/carolynvs/deptest.git"
+
+[[dependencies]]
+  name = "github.com/sdboyer/deptestdos"
+  version = "v2.0.0"

cmd/dep/init.go

@@ -0,0 +1,20 @@
+package: github.com/golang/notexist
+homepage: http://example.com
+license: MIT
+owners:
+- name: Sam Boyer
+  email: [email protected]
+  homepage: http://sdboyer.io
+ignore:
+- github.com/sdboyer/dep-test
+excludeDirs:
+- samples
+import:
+- package: github.com/sdboyer/deptest
+  repo: https://github.com/carolynvs/deptest.git
+  vcs: git
+  version: master
+- package: github.com/sdboyer/deptestdos
+  version: v2.0.0
+testImport:
+- package: github.com/golang/lint

cmd/dep/testdata/harness_tests/init/glide1/final/Gopkg.lock

@@ -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.
+
+package main
+
+import (
+	"fmt"
+
+	_ "github.com/sdboyer/dep-test"
+	"github.com/sdboyer/deptestdos"
+)
+
+func main() {
+	var x deptestdos.Bar
+	fmt.Println(x)
+}

cmd/dep/testdata/harness_tests/init/glide1/final/Gopkg.toml

@@ -0,0 +1,12 @@
+// Copyright 2016 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 samples
+
+import dt "github.com/carolynvs/go-dep-test"
+
+func Sample1() int {
+	var x = dt.Thing
+	return x
+}

cmd/dep/testdata/harness_tests/init/glide1/initial/glide.lock

@@ -0,0 +1,13 @@
+{
+  "commands": [
+    ["init", "-no-examples"]
+  ],
+  "gopath-initial": {
+    "github.com/golang/lint": "cb00e5669539f047b2f4c53a421a01b0c8e172c6",
+    "github.com/sdboyer/deptest": "3f4c3bea144e112a69bbe5d8d01c1b09a544253f"
+  },
+  "vendor-final": [
+    "github.com/sdboyer/deptest",
+    "github.com/sdboyer/deptestdos"
+  ]
+}

cmd/dep/testdata/harness_tests/init/glide1/initial/glide.yaml

@@ -905,3 +905,30 @@ func TestTypedConstraintString(t *testing.T) {
 		}
 	}
 }
+
+func TestDeduceConstraint(t *testing.T) {
+	sv, err := NewSemverConstraint("v1.2.3")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	constraints := map[string]Constraint{
+		"v1.2.3": sv,
+		"5b3352dc16517996fb951394bcbbe913a2a616e3": Revision("5b3352dc16517996fb951394bcbbe913a2a616e3"),
+
+		// valid bzr revs
+		"[email protected]": Revision("[email protected]"),
+
+		// invalid bzr revs
+		"[email protected]": NewVersion("[email protected]"),
+		"[email protected]":                  NewVersion("[email protected]"),
+		"20120425195858-psty8c35ve2oej8t":           NewVersion("20120425195858-psty8c35ve2oej8t"),
+	}
+
+	for str, expected := range constraints {
+		c := DeduceConstraint(str)
+		if c != expected {
+			t.Fatalf("expected: %#v, got %#v for %s", expected, c, str)
+		}
+	}
+}

cmd/dep/testdata/harness_tests/init/glide1/initial/main.go

@@ -8,6 +8,10 @@ import (
 	"fmt"
 	"sort"
 
+	"encoding/hex"
+	"strconv"
+	"strings"
+
 	"github.com/Masterminds/semver"
 )
 
@@ -361,3 +365,45 @@ type sortedWC []workingConstraint
 func (s sortedWC) Len() int           { return len(s) }
 func (s sortedWC) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
 func (s sortedWC) Less(i, j int) bool { return s[i].Ident.less(s[j].Ident) }
+
+// DeduceConstraint tries to puzzle out what kind of version is given in a string -
+// semver, a revision, or as a fallback, a plain tag
+func DeduceConstraint(s string) Constraint {
+	// always semver if we can
+	c, err := NewSemverConstraint(s)
+	if err == nil {
+		return c
+	}
+
+	slen := len(s)
+	if slen == 40 {
+		if _, err = hex.DecodeString(s); err == nil {
+			// Whether or not it's intended to be a SHA1 digest, this is a
+			// valid byte sequence for that, so go with Revision. This
+			// covers git and hg
+			return Revision(s)
+		}
+	}
+	// Next, try for bzr, which has a three-component GUID separated by
+	// dashes. There should be two, but the email part could contain
+	// internal dashes
+	if strings.Count(s, "-") >= 2 {
+		// Work from the back to avoid potential confusion from the email
+		i3 := strings.LastIndex(s, "-")
+		// Skip if - is last char, otherwise this would panic on bounds err
+		if slen == i3+1 {
+			return NewVersion(s)
+		}
+
+		i2 := strings.LastIndex(s[:i3], "-")
+		if _, err = strconv.ParseUint(s[i2+1:i3], 10, 64); err == nil {
+			// Getting this far means it'd pretty much be nuts if it's not a
+			// bzr rev, so don't bother parsing the email.
+			return Revision(s)
+		}
+	}
+
+	// If not a plain SHA1 or bzr custom GUID, assume a plain version.
+	// TODO: if there is amgibuity here, then prompt the user?
+	return NewVersion(s)
+}