Merge branch 'govendor-importer' of github.com:kyleconroy/dep into govendor-importer

Author: otoolec

cmd/dep/govendor_importer_test.go

@@ -8,6 +8,7 @@ import (
 	"bytes"
 	"log"
 	"path/filepath"
+	"strings"
 	"testing"
 
 	"github.com/golang/dep/internal/gps"
@@ -190,6 +191,37 @@ func TestGovendorConfig_Convert_TestProject(t *testing.T) {
 	}
 }
 
+func TestGovendorConfig_Convert_Ignore(t *testing.T) {
+	h := test.NewHelper(t)
+	defer h.Cleanup()
+
+	ctx := newTestContext(h)
+	sm, err := ctx.SourceManager()
+	h.Must(err)
+	defer sm.Release()
+
+	pkg := "github.com/sdboyer/deptest"
+
+	g := newGovendorImporter(ctx.Err, true, sm)
+	g.file = govendorFile{
+		Ignore: strings.Join([]string{"test", pkg, "linux_amd64", "github.com/sdboyer/"}, " "),
+	}
+
+	m, _, err := g.convert(testGovendorProjectRoot)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if len(m.Ignored) != 1 {
+		t.Fatalf("Expected the ignored list to contain 1 project but got %d", len(m.Ignored))
+	}
+
+	p := m.Ignored[0]
+	if p != pkg {
+		t.Fatalf("Expected the ignored list to have an element for %s but got '%s'", pkg, p)
+	}
+}
+
 func TestGovendorConfig_Convert_BadInput_EmptyPackagePath(t *testing.T) {
 	h := test.NewHelper(t)
 	defer h.Cleanup()

cmd/dep/testdata/harness_tests/init/govendor/case1/README.md

@@ -0,0 +1 @@
+Import govendor config in vendor dir.

cmd/dep/testdata/harness_tests/init/govendor/case1/final/Gopkg.lock

@@ -0,0 +1,5 @@
+ignored = ["github.com/sdboyer/dep-test","github.com/golang/notexist/samples"]
+
+[[constraint]]
+  name = "github.com/sdboyer/deptestdos"
+  version = "2.0.0"

cmd/dep/testdata/harness_tests/init/govendor/case1/final/Gopkg.toml

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

cmd/dep/testdata/harness_tests/init/govendor/case1/initial/main.go

@@ -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/govendor/case1/initial/samples/samples.go

@@ -0,0 +1,22 @@
+{
+	"comment": "",
+	"ignore": "test github.com/sdboyer/dep-test",
+	"package": [
+		{
+			"checksumSHA1": "4R6TQcq0/gI/I2kKeUunuO/pEec=",
+			"origin": "github.com/carolynvs/deptest",
+			"path": "github.com/sdboyer/deptest",
+			"revision": "3f4c3bea144e112a69bbe5d8d01c1b09a544253f",
+			"revisionTime": "2017-02-22T03:31:47Z"
+		},
+		{
+			"checksumSHA1": "96YwrJjpE07ENey/eDWWnCWKQOw=",
+			"path": "github.com/sdboyer/deptestdos",
+			"revision": "5c607206be5decd28e6263ffffdcee067266015e",
+			"revisionTime": "2017-02-22T03:34:58Z",
+			"version": "v2",
+			"versionExact": "v2.0.0"
+		}
+	],
+	"rootPath": "github.com/golang/notexist"
+}

cmd/dep/testdata/harness_tests/init/govendor/case1/initial/vendor/vendor.json

@@ -0,0 +1,14 @@
+{
+  "commands": [
+    ["init", "-no-examples", "-gopath"]
+  ],
+  "error-expected": "",
+  "gopath-initial": {
+    "github.com/sdboyer/deptest": "3f4c3bea144e112a69bbe5d8d01c1b09a544253f",
+    "github.com/sdboyer/deptestdos": "5c607206be5decd28e6263ffffdcee067266015e"
+  },
+  "vendor-final": [
+    "github.com/sdboyer/deptest",
+    "github.com/sdboyer/deptestdos"
+  ]
+}