improve tag searching in commit message

Prior only the first of the tag was checked. Now all occurances are iterated over until a fullmatch
is found, which then is optionally online verified.

Author: Christian Riedel

src/commit_msg_jira_hook/check_jira_tag.py

@@ -87,21 +87,31 @@ def main(ctx, jira_tag: str, jira_url: str, verify: bool, commit_msg_file: str)
 
     c_msg_cleaned = "\n".join(c_msg_lines)
 
+    regex_str = r"(" + jira_tag.upper() + r")-?([0-9]+)?"
+
     #: Extract tag from commit msg
-    extract = re.search(r"(" + jira_tag.upper() + r")-?([0-9]+)?", c_msg_cleaned)
+    extract = re.search(regex_str, c_msg_cleaned)
 
     #: Check if tag is in commit msg
     if extract is None:
         click.echo(f"'{jira_tag.upper()}' tag not found in commit message.")
         ctx.abort()
 
-    #: Check if tag has a number
     if extract.group(2) is None:  # type: ignore
         click.echo(f"'{jira_tag.upper()}' tag but no number found in commit message.")
         ctx.abort()
 
-    #: Get tag from extract
-    issue = str(extract.group(0))  # type: ignore
+    for match in re.finditer(regex_str, c_msg_cleaned):
+        #: Check if tag has a number
+        if match.group(2) is None:  # type: ignore
+            #: This tag has no number, try next
+            continue
+        #: Get tag from extract
+        issue = str(match.group(0))  # type: ignore
+        break
+    else:
+        click.echo(f"'{jira_tag.upper()}' tag but no number found in commit message.")
+        ctx.abort()
 
     #: Exit with 0 when online check is disabled
     if not verify:

tests/test_check_jira_tag.py

@@ -209,3 +209,24 @@ def test_no_verify(mock_ini, mock_commit_msg_file, cli_runner):
     )
 
     assert result.exit_code == 0
+
+
+@pytest.mark.parametrize(
+    "commit_msg",
+    [
+        "TAG message TAG123",
+        "TAG message TAG-123",
+        "message #TAG #TAG-123 #TAG",
+    ],
+)
+def test_all_tag_finds_are_search_for_fullmatch(
+    commit_msg, mock_ini, mock_commit_msg_file, cli_runner
+):
+    """Assert next tag occurance is checked if prior one is missing number."""
+    mock_commit_msg_file.write_text(commit_msg)
+
+    result = cli_runner.invoke(
+        main, ["--jira-tag=TAG", "--no-verify", str(mock_commit_msg_file)]
+    )
+
+    assert result.exit_code == 0