Enable glob syntax (/...) in ignored packages

cmd/dep/testdata/harness_tests/ensure/empty/case4/final/Gopkg.toml

@@ -0,0 +1,5 @@
+ignored = ["./samples/..."]
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/sdboyer/deptest"

cmd/dep/testdata/harness_tests/ensure/empty/case4/initial/Gopkg.toml

@@ -0,0 +1,5 @@
+ignored = ["./samples/..."]
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/sdboyer/deptest"

cmd/dep/testdata/harness_tests/ensure/empty/case4/initial/main.go

@@ -0,0 +1,12 @@
+// 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 (
+        _ "github.com/sdboyer/deptest"
+)
+
+func main() {
+}

cmd/dep/testdata/harness_tests/ensure/empty/case4/initial/samples/samples.go

@@ -0,0 +1,7 @@
+// 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 samples
+
+import _ "github.com/sdboyer/deptestdos"

cmd/dep/testdata/harness_tests/ensure/empty/case4/initial/samples/subsamples/subsamples.go

@@ -0,0 +1,7 @@
+// 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 samples
+
+import _ "github.com/sdboyer/dep-test"

cmd/dep/testdata/harness_tests/ensure/empty/case4/testcase.json

@@ -0,0 +1,9 @@
+{
+  "commands": [
+    ["ensure"]
+  ],
+  "error-expected": "",
+  "vendor-final": [
+    "github.com/sdboyer/deptest"
+  ]
+}

cmd/dep/testdata/harness_tests/ensure/empty/case5/final/Gopkg.toml

@@ -0,0 +1,5 @@
+ignored = ["./samples", "github.com/Sirupsen/logrus"]
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/sdboyer/deptest"

cmd/dep/testdata/harness_tests/ensure/empty/case5/initial/Gopkg.toml

@@ -0,0 +1,5 @@
+ignored = ["./samples", "github.com/Sirupsen/logrus"]
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/sdboyer/deptest"

cmd/dep/testdata/harness_tests/ensure/empty/case5/initial/main.go

@@ -0,0 +1,12 @@
+// 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 (
+        _ "github.com/sdboyer/deptest"
+)
+
+func main() {
+}

cmd/dep/testdata/harness_tests/ensure/empty/case5/initial/samples/samples.go

@@ -0,0 +1,7 @@
+// 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 samples
+
+import _ "github.com/sdboyer/deptestdos"

cmd/dep/testdata/harness_tests/ensure/empty/case5/initial/samples/subsamples/subsamples.go

@@ -0,0 +1,7 @@
+// 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 samples
+
+import _ "github.com/sdboyer/dep-test"

cmd/dep/testdata/harness_tests/ensure/empty/case5/testcase.json

@@ -0,0 +1,10 @@
+{
+  "commands": [
+    ["ensure"]
+  ],
+  "error-expected": "",
+  "vendor-final": [
+    "github.com/sdboyer/dep-test",
+    "github.com/sdboyer/deptest"
+  ]
+}

internal/gps/manifest.go

@@ -50,7 +50,7 @@ type RootManifest interface {
 	//
 	// It is an error to include a package in both the ignored and required
 	// sets.
-	IgnoredPackages() map[string]bool
+	IgnoredPackages(SolveParameters) map[string]bool
 
 	// RequiredPackages returns a set of import paths to require. These packages
 	// are required to be present in any solution. The list can include main
@@ -103,7 +103,7 @@ func (m simpleRootManifest) TestDependencyConstraints() ProjectConstraints {
 func (m simpleRootManifest) Overrides() ProjectConstraints {
 	return m.ovr
 }
-func (m simpleRootManifest) IgnoredPackages() map[string]bool {
+func (m simpleRootManifest) IgnoredPackages(SolveParameters) map[string]bool {
 	return m.ig
 }
 func (m simpleRootManifest) RequiredPackages() map[string]bool {

internal/gps/solver.go

@@ -183,7 +183,7 @@ func (params SolveParameters) toRootdata() (rootdata, error) {
 	}
 
 	rd := rootdata{
-		ig:      params.Manifest.IgnoredPackages(),
+		ig:      params.Manifest.IgnoredPackages(params),
 		req:     params.Manifest.RequiredPackages(),
 		ovr:     params.Manifest.Overrides(),
 		rpt:     params.RootPackageTree.Copy(),

manifest.go

@@ -8,11 +8,14 @@ import (
 	"bytes"
 	"fmt"
 	"io"
+	"path/filepath"
 	"reflect"
 	"regexp"
 	"sort"
+	"strings"
 
 	"github.com/golang/dep/internal/gps"
+	"github.com/golang/dep/internal/gps/pkgtree"
 	"github.com/pelletier/go-toml"
 	"github.com/pkg/errors"
 )
@@ -282,14 +285,45 @@ func (m *Manifest) Overrides() gps.ProjectConstraints {
 }
 
 // IgnoredPackages returns a set of import paths to ignore.
-func (m *Manifest) IgnoredPackages() map[string]bool {
+func (m *Manifest) IgnoredPackages(solveParam gps.SolveParameters) map[string]bool {
 	if len(m.Ignored) == 0 {
 		return nil
 	}
 
 	mp := make(map[string]bool, len(m.Ignored))
 	for _, i := range m.Ignored {
-		mp[i] = true
+		// Check if it's a local package path
+		if strings.HasPrefix(i, "./") {
+			// Clean ./ from path
+			i = filepath.Clean(i)
+			rootPkgT := solveParam.RootPackageTree
+
+			// Check if the path has glob syntax (/...)
+			if strings.HasSuffix(i, "/...") {
+				dir := filepath.Dir(i)
+				pkgT, _ := pkgtree.ListPackages(filepath.Join(solveParam.RootDir, dir), dir)
+
+				// Ignore root packages found in package tree of ignored package
+				for p := range pkgT.Packages {
+					for rp := range solveParam.RootPackageTree.Packages {
+						if strings.HasSuffix(rp, filepath.Join(rootPkgT.ImportRoot, p)) {
+							mp[rp] = true
+							break
+						}
+					}
+				}
+			} else {
+				// Ignore root package found in local ignored package
+				for rp := range solveParam.RootPackageTree.Packages {
+					if strings.HasSuffix(rp, filepath.Join(rootPkgT.ImportRoot, i)) {
+						mp[rp] = true
+						break
+					}
+				}
+			}
+		} else {
+			mp[i] = true
+		}
 	}
 
 	return mp