Update regex pattern for remote URLs

Author: hackebrot

src/labels/utils.py

@@ -1,3 +1,4 @@
+import logging
 import re
 import shlex
 import subprocess
@@ -8,7 +9,7 @@
 
 
 REMOTE_REGEX = re.compile(
-    r"^(https|git)(:\/\/|@)github\.com[\/:](?P<owner>[^\/:]+)\/(?P<name>.+).git$"
+    r"^(https|git)(:\/\/|@)github\.com[\/:](?P<owner>[^\/:]+)\/(?P<name>.*?)(\.git)?$"
 )
 
 
@@ -18,6 +19,8 @@ def load_repository_info(remote_name: str = "origin") -> typing.Optional[Reposit
     HTTPS url format -> 'https://github.com/owner/name.git'
     SSH   url format -> '[email protected]:owner/name.git'
     """
+    logger = logging.getLogger("labels")
+    logger.debug(f"Load repository information for '{remote_name}'.")
 
     proc = subprocess.run(
         shlex.split(f"git remote get-url {remote_name}"),
@@ -26,11 +29,14 @@ def load_repository_info(remote_name: str = "origin") -> typing.Optional[Reposit
     )
 
     if proc.returncode != 0:
+        logger.debug(f"Error running git remote get-url.")
         return None
 
-    match = REMOTE_REGEX.match(proc.stdout.strip())
+    remote_url = proc.stdout.strip()
+    match = REMOTE_REGEX.match(remote_url)
 
     if match is None:
+        logger.debug(f"No match for remote URL: {remote_url}.")
         return None
 
     return Repository(owner=match.group("owner"), name=match.group("name"))

tests/test_utils.py

@@ -8,8 +8,10 @@
     [
         "[email protected]:pytest-dev/pytest.git\n",
         "https://github.com/pytest-dev/pytest.git\n",
+        "[email protected]/pytest-dev/pytest\n",
+        "https://github.com/pytest-dev/pytest\n",
     ],
-    ids=["ssh", "https"],
+    ids=["ssh", "https", "ssh_no_git", "https_no_git"],
 )
 def test_load_repository_info(mock_repo_info):
     """Test that load_repository_info() works for both SSH and HTTPS URLs."""