Merge pull request #43 from zeroshade/breaking

fix(internal/angular): fix angular parsing of breaking change messages that have multiple lines

go.mod

@@ -17,7 +17,7 @@ require (
 	golang.org/x/net v0.0.0-20200226121028-0de0cce0169b // indirect
 	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
 	golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae // indirect
-	google.golang.org/appengine v1.6.5
+	google.golang.org/appengine v1.6.5 // indirect
 	gopkg.in/src-d/go-billy.v4 v4.3.2
 	gopkg.in/src-d/go-git.v4 v4.13.1
 	gopkg.in/yaml.v2 v2.2.8

internal/analyzer/angular.go

@@ -22,7 +22,7 @@ const ANGULAR = "angular"
 
 func newAngular() *angular {
 	return &angular{
-		regex: `^(TAG)(?:\((.*)\))?: (.*)`,
+		regex: `^(TAG)(?:\((.*)\))?: (?s)(.*)`,
 		log:   log.WithField("analyzer", ANGULAR),
 		rules: []Rule{
 			{
@@ -105,8 +105,8 @@ func (a *angular) analyze(commit shared.Commit, rule Rule) (shared.AnalyzedCommi
 			}
 			breakingChange := strings.SplitN(message, "BREAKING CHANGE:", 2)
 
-			analyzed.ParsedMessage = strings.Trim(breakingChange[0], " ")
-			analyzed.ParsedBreakingChangeMessage = strings.Trim(breakingChange[1], " ")
+			analyzed.ParsedMessage = strings.TrimSpace(breakingChange[0])
+			analyzed.ParsedBreakingChangeMessage = strings.TrimSpace(breakingChange[1])
 
 			a.log.Tracef(" %s, BREAKING CHANGE found", commit.Message)
 			return analyzed, true, nil

internal/analyzer/angular_test.go

@@ -93,6 +93,53 @@ func TestAngular(t *testing.T) {
 				},
 			},
 		},
+		{	testCase: "feat breaking change footer",
+			commits: []shared.Commit{
+				 shared.Commit{
+					Message: "feat(internal/changelog): my first commit",
+					Author:  "me",
+					Hash:    "12345667",
+				 },
+				 shared.Commit{
+				        Message: "feat(internal/changelog): my first break \n\nBREAKING CHANGE: change api to v2\n",
+					Author:  "me",
+					Hash:    "12345668",
+				 },
+			},
+			analyzedCommits: map[shared.Release][]shared.AnalyzedCommit{
+				 "minor": []shared.AnalyzedCommit{
+					shared.AnalyzedCommit{
+						Commit: shared.Commit{
+							Message: "feat(internal/changelog): my first commit",
+							Author:  "me",
+							Hash:    "12345667",
+						},
+						Scope:         "internal/changelog",
+						ParsedMessage: "my first commit",
+						Tag:           "feat",
+						TagString:     "Features",
+						Print:         true,
+					},
+				},
+				"major": []shared.AnalyzedCommit{
+					shared.AnalyzedCommit{
+						Commit: shared.Commit{
+							Message: "feat(internal/changelog): my first break \n\nBREAKING CHANGE: change api to v2\n",
+							Author:  "me",
+							Hash:    "12345668",
+						},
+						Scope:                       "internal/changelog",
+						ParsedMessage:               "my first break",
+						Tag:                         "feat",
+						TagString:                   "Features",
+						Print:                       true,
+						ParsedBreakingChangeMessage: "change api to v2",
+					},
+				},
+				"patch": []shared.AnalyzedCommit{},
+				"none":  []shared.AnalyzedCommit{},
+			},
+		},
 		{
 			testCase: "invalid",
 			analyzedCommits: map[shared.Release][]shared.AnalyzedCommit{

internal/assets/asset.go

@@ -149,7 +149,6 @@ func (a *Asset) ZipFile() (string, error) {
 	}
 
 	zipWriter := zip.NewWriter(zipFile)
-	defer zipWriter.Close()
 
 	fileToZipHeader, err := zip.FileInfoHeader(fileToZipInfo)
 	if err != nil {
@@ -166,9 +165,15 @@ func (a *Asset) ZipFile() (string, error) {
 	if _, err = io.Copy(fileToZipWriter, fileToZip); err != nil {
 		return "", errors.Wrap(err, "Could not zip file")
 	}
+
+	if err := zipWriter.Close(); err != nil {
+		return "", errors.Wrap(err, fmt.Sprintf("Could not close zipwriter for zip %s", a.path))
+	}
+
 	if err := zipFile.Close(); err != nil {
 		return "", errors.Wrap(err, "Could not close file")
 	}
 	a.zippedPath, err = filepath.Abs(zipFile.Name())
+
 	return a.zippedPath, err
 }