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

Conflicts:
	cmd/dep/govendor_importer.go

Author: kyleconroy

cmd/dep/govendor_importer.go

@@ -99,8 +99,24 @@ func (g *govendorImporter) convert(pr gps.ProjectRoot) (*dep.Manifest, *dep.Lock
 	}
 
 	if len(g.file.Ignore) > 0 {
-		// TODO: Will this work for "test"?
-		manifest.Ignored = strings.Split(g.file.Ignore, " ")
+		// Govendor has three use cases here
+		// 1. 'test' - special case for ignoring test files
+		// 2. build tags - any string without a slash (/) in it
+		// 3. path and path prefix - any string with a slash (/) in it.
+		//   The path case could be a full path or just a prefix.
+		// Dep doesn't support build tags right now: https://github.com/golang/dep/issues/120
+		for _, i := range strings.Split(g.file.Ignore, " ") {
+			if !strings.Contains(i, "/") {
+				g.logger.Printf("Warning: Not able to convert ignoring of build tag '%v'", i)
+				continue
+			}
+			_, err := g.sm.DeduceProjectRoot(i)
+			if err == nil {
+				manifest.Ignored = append(manifest.Ignored, i)
+			} else {
+				g.logger.Println("Warning: Not able to convert ignoring of build tag '%v'", i)
+			}
+		}
 	}
 
 	lock := &dep.Lock{}

cmd/dep/testdata/govendor/golden.txt

@@ -1,5 +1,6 @@
 Detected govendor configuration files...
 Converting from vendor.json...
+Warning: Not able to convert ignoring of build tag 'test'
   Using ^0.8.1 as initial constraint for imported dep github.com/sdboyer/deptest
   Trying v0.8.1 (3f4c3be) as initial lock for imported dep github.com/sdboyer/deptest
   Using ^2.0.0 as initial constraint for imported dep github.com/sdboyer/deptestdos