Merge pull request #71 from theohbrothers/enhancement/generate-fix-re…

…gex-patterns-for-matching-commit-messages-following-categorized-conventions Enhancement (generate): Fix regex patterns for matching commit messages following categorized conventions
theohbrothers · May 20, 2024 · 403b810 · 403b810
2 parents 41e70a8 + 56e0263
commit 403b810
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/...PSRepositoryReleaseManager/generate/variants/Changes-HashSubject-NoMerges-Categorized.ps1 b/...PSRepositoryReleaseManager/generate/variants/Changes-HashSubject-NoMerges-Categorized.ps1
@@ -58,7 +58,7 @@ function Changes-HashSubject-NoMerges-Categorized {
             }
         )
         $commitHistoryUncategorized = $commitHistoryTrimmed | % {
-            if (!($_ -match "^[0-9a-f]+ (\s*\w+\s*\(\s*[a-zA-Z0-9_-]+\s*\)\s*:)(.+)")) {
+            if (!($_ -match "^[0-9a-f]+ (\s*\w+\s*)(\(\s*[a-zA-Z0-9_-]+\s*\)\s*)*:(.+)")) {
                 $_
             }
         }
@@ -69,7 +69,7 @@ function Changes-HashSubject-NoMerges-Categorized {
             foreach ($c in $commitCategory) {
                 $isTitleOutputted = $false
                 $commitHistoryTrimmed | % {
-                    if ($_ -match "^[0-9a-f]+ (\s*$($c['Name'])\s*\(\s*[a-zA-Z0-9_-]+\s*\)\s*:)(.+)") {
+                    if ($_ -match "^[0-9a-f]+ (\s*$($c['Name'])\s*)(\(\s*[a-zA-Z0-9_-]+\s*\)\s*)*:(.+)") {
                         if (!$isTitleOutputted) {
 @"
 

diff --git a/...sitoryReleaseManager/generate/variants/Changes-HashSubjectAuthor-NoMerges-Categorized.ps1 b/...sitoryReleaseManager/generate/variants/Changes-HashSubjectAuthor-NoMerges-Categorized.ps1
@@ -58,7 +58,7 @@ function Changes-HashSubjectAuthor-NoMerges-Categorized {
             }
         )
         $commitHistoryUncategorized = $commitHistoryTrimmed | % {
-            if (!($_ -match "^[0-9a-f]+ (\s*\w+\s*\(\s*[a-zA-Z0-9_-]+\s*\)\s*:)(.+)")) {
+            if (!($_ -match "^[0-9a-f]+ (\s*\w+\s*)(\(\s*[a-zA-Z0-9_-]+\s*\)\s*)*:(.+)")) {
                 $_
             }
         }
@@ -69,7 +69,7 @@ function Changes-HashSubjectAuthor-NoMerges-Categorized {
             foreach ($c in $commitCategory) {
                 $isTitleOutputted = $false
                 $commitHistoryTrimmed | % {
-                    if ($_ -match "^[0-9a-f]+ (\s*$($c['Name'])\s*\(\s*[a-zA-Z0-9_-]+\s*\)\s*:)(.+)") {
+                    if ($_ -match "^[0-9a-f]+ (\s*$($c['Name'])\s*)(\(\s*[a-zA-Z0-9_-]+\s*\)\s*)*:(.+)") {
                         if (!$isTitleOutputted) {
 @"
 

diff --git a/...positoryReleaseManager/generate/variants/VersionDate-HashSubject-NoMerges-Categorized.ps1 b/...positoryReleaseManager/generate/variants/VersionDate-HashSubject-NoMerges-Categorized.ps1
@@ -58,7 +58,7 @@ function VersionDate-HashSubject-NoMerges-Categorized {
             }
         )
         $commitHistoryUncategorized = $commitHistoryTrimmed | % {
-            if (!($_ -match "^[0-9a-f]+ (\s*\w+\s*\(\s*[a-zA-Z0-9_-]+\s*\)\s*:)(.+)")) {
+            if (!($_ -match "^[0-9a-f]+ (\s*\w+\s*)(\(\s*[a-zA-Z0-9_-]+\s*\)\s*)*:(.+)")) {
                 $_
             }
         }
@@ -69,7 +69,7 @@ function VersionDate-HashSubject-NoMerges-Categorized {
             foreach ($c in $commitCategory) {
                 $isTitleOutputted = $false
                 $commitHistoryTrimmed | % {
-                    if ($_ -match "^[0-9a-f]+ (\s*$($c['Name'])\s*\(\s*[a-zA-Z0-9_-]+\s*\)\s*:)(.+)") {
+                    if ($_ -match "^[0-9a-f]+ (\s*$($c['Name'])\s*)(\(\s*[a-zA-Z0-9_-]+\s*\)\s*)*:(.+)") {
                         if (!$isTitleOutputted) {
 @"
 

diff --git a/...ryReleaseManager/generate/variants/VersionDate-HashSubjectAuthor-NoMerges-Categorized.ps1 b/...ryReleaseManager/generate/variants/VersionDate-HashSubjectAuthor-NoMerges-Categorized.ps1
@@ -58,7 +58,7 @@ function VersionDate-HashSubjectAuthor-NoMerges-Categorized {
             }
         )
         $commitHistoryUncategorized = $commitHistoryTrimmed | % {
-            if (!($_ -match "^[0-9a-f]+ (\s*\w+\s*\(\s*[a-zA-Z0-9_-]+\s*\)\s*:)(.+)")) {
+            if (!($_ -match "^[0-9a-f]+ (\s*\w+\s*)(\(\s*[a-zA-Z0-9_-]+\s*\)\s*)*:(.+)")) {
                 $_
             }
         }
@@ -69,7 +69,7 @@ function VersionDate-HashSubjectAuthor-NoMerges-Categorized {
             foreach ($c in $commitCategory) {
                 $isTitleOutputted = $false
                 $commitHistoryTrimmed | % {
-                    if ($_ -match "^[0-9a-f]+ (\s*$($c['Name'])\s*\(\s*[a-zA-Z0-9_-]+\s*\)\s*:)(.+)") {
+                    if ($_ -match "^[0-9a-f]+ (\s*$($c['Name'])\s*)(\(\s*[a-zA-Z0-9_-]+\s*\)\s*)*:(.+)") {
                         if (!$isTitleOutputted) {
 @"
 

diff --git a/...PSRepositoryReleaseManager/generate/variants/VersionDate-Subject-NoMerges-Categorized.ps1 b/...PSRepositoryReleaseManager/generate/variants/VersionDate-Subject-NoMerges-Categorized.ps1
@@ -58,7 +58,7 @@ function VersionDate-Subject-NoMerges-Categorized {
             }
         )
         $commitHistoryUncategorized = $commitHistoryTrimmed | % {
-            if (!($_ -match "^(\s*\w+\s*\(\s*[a-zA-Z0-9_-]+\s*\)\s*:)(.+)")) {
+            if (!($_ -match "^(\s*\w+\s*)(\(\s*[a-zA-Z0-9_-]+\s*\)\s*)*:(.+)")) {
                 $_
             }
         }
@@ -69,7 +69,7 @@ function VersionDate-Subject-NoMerges-Categorized {
             foreach ($c in $commitCategory) {
                 $isTitleOutputted = $false
                 $commitHistoryTrimmed | % {
-                    if ($_ -match "^(\s*$($c['Name'])\s*\(\s*[a-zA-Z0-9_-]+\s*\)\s*:)(.+)") {
+                    if ($_ -match "^(\s*$($c['Name'])\s*)(\(\s*[a-zA-Z0-9_-]+\s*\)\s*)*:(.+)") {
                         if (!$isTitleOutputted) {
 @"
 

diff --git a/...sitoryReleaseManager/generate/variants/VersionDate-SubjectAuthor-NoMerges-Categorized.ps1 b/...sitoryReleaseManager/generate/variants/VersionDate-SubjectAuthor-NoMerges-Categorized.ps1
@@ -58,7 +58,7 @@ function VersionDate-SubjectAuthor-NoMerges-Categorized {
             }
         )
         $commitHistoryUncategorized = $commitHistoryTrimmed | % {
-            if (!($_ -match "^(\s*\w+\s*\(\s*[a-zA-Z0-9_-]+\s*\)\s*:)(.+)")) {
+            if (!($_ -match "^(\s*\w+\s*)(\(\s*[a-zA-Z0-9_-]+\s*\)\s*)*:(.+)")) {
                 $_
             }
         }
@@ -69,7 +69,7 @@ function VersionDate-SubjectAuthor-NoMerges-Categorized {
             foreach ($c in $commitCategory) {
                 $isTitleOutputted = $false
                 $commitHistoryTrimmed | % {
-                    if ($_ -match "^(\s*$($c['Name'])\s*\(\s*[a-zA-Z0-9_-]+\s*\)\s*:)(.+)") {
+                    if ($_ -match "^(\s*$($c['Name'])\s*)(\(\s*[a-zA-Z0-9_-]+\s*\)\s*)*:(.+)") {
                         if (!$isTitleOutputted) {
 @"