Merge pull request #98 from svanharmelen/dev

Fix small regression

CHANGELOG.md

@@ -1,6 +1,10 @@
 Chef-Guard CHANGELOG
 ====================
 
+0.6.1
+-----
+- Fixed a small regression where the `metadata.rb` and/or `metadata.json` are not handled correctly
+
 0.6.0
 -----
 - Added support for using GitLab as git backend (fixes GH-61)

VERSION

@@ -1 +1 @@
-0.6.0-UNRELEASED
+0.6.1

cookbook.go

@@ -135,7 +135,7 @@ func (cg *ChefGuard) processCookbookFiles() error {
 	}
 
 	for _, f := range cg.getAllCookbookFiles() {
-		ignore, err := cg.ignoreThisFile(f.Name)
+		ignore, err := cg.ignoreThisFile(f.Name, false)
 		if err != nil {
 			return fmt.Errorf("Ignore check failed for file %s: %s", f.Name, err)
 		}

validations.go

@@ -233,7 +233,7 @@ func (cg *ChefGuard) compareCookbooks() (int, error) {
 				changed = append(changed, file)
 			}
 		} else {
-			ignore, err := cg.ignoreThisFile(file)
+			ignore, err := cg.ignoreThisFile(file, true)
 			if err != nil {
 				return http.StatusBadGateway, err
 			}
@@ -252,7 +252,7 @@ func (cg *ChefGuard) compareCookbooks() (int, error) {
 	}
 	if len(sh) > 0 {
 		for file, _ := range sh {
-			ignore, err := cg.ignoreThisFile(file)
+			ignore, err := cg.ignoreThisFile(file, true)
 			if err != nil {
 				return http.StatusBadGateway, err
 			}
@@ -287,10 +287,12 @@ func (cg *ChefGuard) searchSourceCookbook() (errCode int, err error) {
 		"Failed to locate the source of the %s cookbook!", cg.Cookbook.Name)
 }
 
-func (cg *ChefGuard) ignoreThisFile(file string) (ignore bool, err error) {
-	// if file == "metadata.rb" || file == "metadata.json" || strings.HasPrefix(file, "spec/") {
-	// 	return true, nil
-	// }
+func (cg *ChefGuard) ignoreThisFile(file string, ignoreDefaultFiles bool) (ignore bool, err error) {
+	if ignoreDefaultFiles {
+		if file == "metadata.rb" || file == "metadata.json" || strings.HasPrefix(file, "spec/") {
+			return true, nil
+		}
+	}
 	ignore, err = pathspec.GitIgnore(bytes.NewReader(cg.GitIgnoreFile), file)
 	if ignore || err != nil {
 		return ignore, err