Improve ignore glob handling and add tests

Improves handling of ignored local packages.

Adds tests for ignoring local packages.
- ensure/empty/case4 for ignoring local packages with glob
- ensure/empty/case5 for ignoring a single local package, but not
subpackages

Author: darkowlzz

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

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

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.lock

@@ -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/Gopkg.toml

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

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

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

@@ -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/case4/testcase.json

@@ -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/final/Gopkg.lock

@@ -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/final/Gopkg.toml

@@ -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/Gopkg.lock

@@ -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/initial/Gopkg.toml

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

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

@@ -292,16 +292,32 @@ func (m *Manifest) IgnoredPackages(solveParam gps.SolveParameters) map[string]bo
 
 	mp := make(map[string]bool, len(m.Ignored))
 	for _, i := range m.Ignored {
-		// Check if the path has glob syntax (/...)
-		dir, base := filepath.Split(i)
-		if base == "..." {
-			pkgT, _ := pkgtree.ListPackages(filepath.Join(solveParam.RootDir, dir), dir)
-
-			// Ignored root packages found in package tree of ignored package
-			for p := range pkgT.Packages {
+		// 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, p) {
+					if strings.HasSuffix(rp, filepath.Join(rootPkgT.ImportRoot, i)) {
 						mp[rp] = true
+						break
 					}
 				}
 			}