From 51ccc1db2941a02c4846efdb87dfb7554b67006b Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 7 Oct 2021 13:33:59 +0000 Subject: [PATCH] fix(deps): update module github.com/release-lab/conventional-commit-parser to v0.1.5 --- go.mod | 2 +- go.sum | 2 + .../conventional-commit-parser/parser.go | 75 +++++++++---------- vendor/modules.txt | 2 +- 4 files changed, 38 insertions(+), 43 deletions(-) diff --git a/go.mod b/go.mod index 048614cd..1f4d56cc 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/go-git/go-git/v5 v5.4.2 github.com/mattn/go-runewidth v0.0.9 // indirect github.com/pkg/errors v0.9.1 - github.com/release-lab/conventional-commit-parser v0.1.2 + github.com/release-lab/conventional-commit-parser v0.1.5 github.com/shurcooL/go v0.0.0-20200502201357-93f07166e636 // indirect github.com/shurcooL/markdownfmt v0.0.0-20210117162146-75134924a9fd github.com/stretchr/testify v1.7.0 diff --git a/go.sum b/go.sum index 38da57af..a94be0da 100644 --- a/go.sum +++ b/go.sum @@ -94,6 +94,8 @@ github.com/release-lab/conventional-commit-parser v0.1.1 h1:6C8YGOr7sE5wuPkuO+No github.com/release-lab/conventional-commit-parser v0.1.1/go.mod h1:J56B1fNHAVNm5SynjINkz1mThTKqN0KQnFH54Fuz2KQ= github.com/release-lab/conventional-commit-parser v0.1.2 h1:sZ0jMtNcO2j+uabV3n/KTKej2PlfNhYCzN2rBeNbTMo= github.com/release-lab/conventional-commit-parser v0.1.2/go.mod h1:J56B1fNHAVNm5SynjINkz1mThTKqN0KQnFH54Fuz2KQ= +github.com/release-lab/conventional-commit-parser v0.1.5 h1:r4kWlRbh5V4Y0ne3j2A44gCam07rPOkGKWCBBC9z5c4= +github.com/release-lab/conventional-commit-parser v0.1.5/go.mod h1:J56B1fNHAVNm5SynjINkz1mThTKqN0KQnFH54Fuz2KQ= github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww= github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY= github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= diff --git a/vendor/github.com/release-lab/conventional-commit-parser/parser.go b/vendor/github.com/release-lab/conventional-commit-parser/parser.go index 9adfea59..62ff8256 100644 --- a/vendor/github.com/release-lab/conventional-commit-parser/parser.go +++ b/vendor/github.com/release-lab/conventional-commit-parser/parser.go @@ -30,7 +30,7 @@ type Footer struct { var ( EMPTY_LINE_PATTERN = regexp.MustCompile(`^\s*$`) HEADER_PATTERN = regexp.MustCompile(`^(?:fixup!\s*)?(\w*)(\(([\w\$\.\*/-]*)\))?(!?):\s(.*)$`) - FOOTER_PATTERN = regexp.MustCompile(`^([\w\s\-]+):\s(.*)$`) + FOOTER_PATTERN = regexp.MustCompile(`^([\w\s\-]+):(.*)$`) REVERT_HEADER_PATTERN = regexp.MustCompile(`^(?i)revert\s(.*)$`) REVERT_BODY_PATTERN = regexp.MustCompile(`(?i)This\sreverts\scommit\s(\w+)\.?`) ) @@ -39,7 +39,7 @@ func splitToLines(text string) []string { return strings.Split(strings.ReplaceAll(text, "\r\n", "\n"), "\n") } -func (m Message) GetHeader() Header { +func (m Message) ParseHeader() Header { headerMatchers := HEADER_PATTERN.FindStringSubmatch(m.Header) revertHeaderMatchers := REVERT_HEADER_PATTERN.FindStringSubmatch(m.Header) header := Header{} @@ -63,7 +63,7 @@ func (m Message) GetHeader() Header { return header } -func (m Message) GetFooter() []Footer { +func (m Message) ParseFooter() []Footer { footers := make([]Footer, 0) for _, m := range m.Footer { @@ -82,8 +82,8 @@ func (m Message) GetFooter() []Footer { footer.Tag = "" footer.Title = line } else { - footer.Tag = matcher[1] - footer.Title = matcher[2] + footer.Tag = strings.TrimSpace(matcher[1]) + footer.Title = strings.TrimSpace(matcher[2]) } continue lineLoop } else { @@ -96,7 +96,7 @@ func (m Message) GetFooter() []Footer { footers = append(footers, footer) } - header := m.GetHeader() + header := m.ParseHeader() if header.Type == "revert" { matcher := REVERT_BODY_PATTERN.FindStringSubmatch(m.Body) @@ -118,12 +118,12 @@ func (m Message) GetFooter() []Footer { return footers } -func (m Message) GetFooterField(tags ...string) *Footer { - footers := m.GetFooter() +func (m Message) GetFooterByField(tags ...string) *Footer { + footers := m.ParseFooter() for _, tag := range tags { for _, f := range footers { - if strings.ToLower(f.Tag) == tag { + if strings.EqualFold(f.Tag, tag) { return &f } } @@ -197,47 +197,40 @@ func Parse(message string) Message { previousLine := lines[index-1] - // parse body - if !FOOTER_PATTERN.MatchString(line) { - body = append(body, line) + // if is a footer start + if FOOTER_PATTERN.MatchString(line) && (EMPTY_LINE_PATTERN.MatchString(previousLine) || FOOTER_PATTERN.MatchString(previousLine)) { + footerContent := []string{line} + index++ - continue - } else { - // if previous line is blank. then should be body block end - // or previous line is a footer - if EMPTY_LINE_PATTERN.MatchString(previousLine) || FOOTER_PATTERN.MatchString(previousLine) { - footerContent := []string{line} - index++ + // if this line is last line + if index >= len(lines) { + footer = append(footer, strings.TrimSpace(strings.Join(footerContent, "\n"))) + continue + } - // if this line is last line + innerLoop: + for { if index >= len(lines) { footer = append(footer, strings.TrimSpace(strings.Join(footerContent, "\n"))) - continue + break innerLoop } - innerLoop: - for { - if index >= len(lines) { - break innerLoop - } - - line := lines[index] - - if !FOOTER_PATTERN.MatchString(line) { - footerContent = append(footerContent, line) - index++ - continue innerLoop - } else { - footer = append(footer, strings.TrimSpace(strings.Join(footerContent, "\n"))) - break innerLoop - } + line := lines[index] + + if !FOOTER_PATTERN.MatchString(line) { + footerContent = append(footerContent, line) + index++ + continue innerLoop + } else { + footer = append(footer, strings.TrimSpace(strings.Join(footerContent, "\n"))) + break innerLoop } - } else { - body = append(body, line) - index++ - continue } + } else { + body = append(body, line) + index++ + continue } } diff --git a/vendor/modules.txt b/vendor/modules.txt index b830744b..c4c7d52c 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -125,7 +125,7 @@ github.com/pkg/errors # github.com/pmezard/go-difflib v1.0.0 ## explicit github.com/pmezard/go-difflib/difflib -# github.com/release-lab/conventional-commit-parser v0.1.2 +# github.com/release-lab/conventional-commit-parser v0.1.5 ## explicit; go 1.17 github.com/release-lab/conventional-commit-parser # github.com/russross/blackfriday v1.6.0