Merge pull request #1028 from technosophos/fix/989-helm-ignore-defaults

fix(helm): fix helmignore evaluation of dirs

pkg/chartutil/create.go

@@ -48,7 +48,23 @@ const defaultIgnore = `# Patterns to ignore when building packages.
 # This supports shell glob matching, relative path matching, and
 # negation (prefixed with !). Only one pattern per line.
 .DS_Store
-.git
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
 `
 
 // Create creates a new chart in a directory.

pkg/chartutil/load.go

@@ -218,6 +218,11 @@ func LoadDir(dir string) (*chart.Chart, error) {
 			return err
 		}
 		if fi.IsDir() {
+			// Directory-based ignore rules should involve skipping the entire
+			// contents of that directory.
+			if rules.Ignore(n, fi) {
+				return filepath.SkipDir
+			}
 			return nil
 		}
 

pkg/chartutil/load_test.go

@@ -49,8 +49,9 @@ func verifyChart(t *testing.T, c *chart.Chart) {
 		t.Errorf("Expected 1 template, got %d", len(c.Templates))
 	}
 
-	if len(c.Files) != 5 {
-		t.Errorf("Expected 5 extra files, got %d", len(c.Files))
+	numfiles := 6
+	if len(c.Files) != numfiles {
+		t.Errorf("Expected %d extra files, got %d", numfiles, len(c.Files))
 		for _, n := range c.Files {
 			t.Logf("\t%s", n.TypeUrl)
 		}

pkg/chartutil/testdata/frobnitz/.helmignore

@@ -0,0 +1 @@
+ignore/

pkg/chartutil/testdata/genfrob.sh

@@ -9,4 +9,4 @@ tar -zcvf frobnitz/charts/mariner-4.3.2.tgz mariner
 
 # Pack the frobnitz chart.
 echo "Packing frobnitz"
-tar -zcvf frobnitz-1.2.3.tgz frobnitz
+tar --exclude=ignore/* -zcvf frobnitz-1.2.3.tgz frobnitz

pkg/ignore/rules.go

@@ -65,7 +65,6 @@ func Parse(file io.Reader) (*Rules, error) {
 	if err := s.Err(); err != nil {
 		return r, err
 	}
-
 	return r, nil
 }
 
@@ -97,8 +96,10 @@ func (r *Rules) Ignore(path string, fi os.FileInfo) bool {
 			continue
 		}
 
+		// If the rule is looking for directories, and this is not a directory,
+		// skip it.
 		if p.mustDir && !fi.IsDir() {
-			return false
+			continue
 		}
 		if p.match(path, fi) {
 			return true