Merge pull request #30 from odacremolbap/master

Fixes #29. Duplicated dependencies use only first occurrence

Author: imikushin

conf/yaml.go

@@ -1,8 +1,9 @@
 package conf
 
 import (
-	yaml "github.com/cloudfoundry-incubator/candiedyaml"
 	"os"
+
+	yaml "github.com/cloudfoundry-incubator/candiedyaml"
 )
 
 type Trash struct {
@@ -25,5 +26,20 @@ func Parse(path string) (*Trash, error) {
 	if err := yaml.NewDecoder(file).Decode(trash); err != nil {
 		return nil, err
 	}
+	trash.deleteDups()
 	return trash, nil
 }
+
+// deleteDups delete duplicate imports
+func (t *Trash) deleteDups() {
+	seen := make(map[string]bool)
+	uniq := make([]Import, 0, len(t.Imports))
+	for _, i := range t.Imports {
+		if _, ok := seen[i.Package]; ok {
+			continue
+		}
+		uniq = append(uniq, i)
+		seen[i.Package] = true
+	}
+	t.Imports = uniq
+}

conf/yaml_test.go

@@ -0,0 +1,51 @@
+package conf
+
+import (
+	"testing"
+)
+
+func TestDuplicates(t *testing.T) {
+
+	testData := []struct {
+		imports    []Import
+		duplicates int
+	}{
+		{[]Import{
+			{"package1", "version1", ""},
+		}, 0},
+		{[]Import{
+			{"package1", "version1", ""},
+			{"package2", "version1", "repoA"},
+		}, 0},
+		{[]Import{
+			{"package1", "version1", ""},
+			{"package2", "version1", "repoA"},
+			{"package1", "version1", ""},
+		}, 1},
+		{[]Import{
+			{"package1", "version1", ""},
+			{"package2", "version1", "repoA"},
+			{"package1", "version1", ""},
+			{"package1", "version1", ""},
+		}, 2},
+		{[]Import{
+			{"package1", "version1", ""},
+			{"package2", "version1", "repoA"},
+			{"package1", "version1", ""},
+			{"package1", "version1", ""},
+			{"package2", "version2", "repoB"},
+			{"package3", "version1", "repoA"},
+		}, 3},
+	}
+
+	for i, d := range testData {
+		trash := Trash{"", d.imports}
+		trash.deleteDups()
+
+		if d.duplicates != len(d.imports)-len(trash.Imports) {
+			t.Errorf("Case %d failed: expected %d duplicates but removed %d", i, d.duplicates, len(d.imports)-len(trash.Imports))
+		}
+
+	}
+
+}

trash.go

@@ -154,7 +154,7 @@ func vendor(keep bool, trashDir, dir string, trashConf *conf.Trash) error {
 			}
 			return nil
 		}); err != nil {
-			logrus.Error("Error stripping .git dirs: %s", err)
+			logrus.Errorf("Error stripping .git dirs: %s", err)
 			return err
 		}
 	}
@@ -339,7 +339,7 @@ func listImports(rootPackage, pkg string) <-chan util.Packages {
 			if os.IsNotExist(err) {
 				logrus.Debugf("listImports, pkgPath does not exist: %s", err)
 			} else {
-				logrus.Error("Error parsing imports, pkgPath: '%s', err: '%s'", pkgPath, err)
+				logrus.Errorf("Error parsing imports, pkgPath: '%s', err: '%s'", pkgPath, err)
 			}
 			return
 		}
@@ -521,7 +521,7 @@ func cleanup(dir string, trashConf *conf.Trash) error {
 		logrus.Info("Trying to guess the root package from directory structure")
 		srcPath := path.Join(dir, "..", "..", "..", "..", "src")
 		if _, err := os.Stat(srcPath); err != nil {
-			logrus.Fatal("It didn't work: '%s' does not exist or something: %s", srcPath, err)
+			logrus.Fatalf("It didn't work: '%s' does not exist or something: %s", srcPath, err)
 		}
 		srcPath = filepath.Clean(srcPath)
 		logrus.Debugf("srcPath: '%s'", srcPath)