fix(parse_git_url): fix bad url with dash

python-semantic-release · Feb 25, 2024 · 1c25b8e · 1c25b8e
1 parent 82bfcd3
commit 1c25b8e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/semantic_release/helpers.py b/semantic_release/helpers.py
@@ -119,7 +119,7 @@ def parse_git_url(url: str) -> ParsedGitUrl:
         (r"^git\+ssh://", "ssh://"),
         # normalize an scp like syntax to URL compatible syntax
         # excluding port definitions (:#####) & including numeric usernames
-        (r"(ssh://(?:\w+@)?[\w.]+):(?!\d{1,5}/\w+/)(.*)$", r"\1/\2"),
+        (r"(ssh://(?:\w+@)?[\w.-]+):(?!\d{1,5}/\w+/)(.*)$", r"\1/\2"),
         # normalize implicit file (windows || posix) urls to explicit file:// urls
         (r"^([C-Z]:/)|^/(\w)", r"file:///\1\2"),
     ]

diff --git a/tests/unit/semantic_release/test_helpers.py b/tests/unit/semantic_release/test_helpers.py
@@ -10,6 +10,10 @@
             "http://git.mycompany.com/username/myproject.git",
             ParsedGitUrl("http", "git.mycompany.com", "username", "myproject"),
         ),
+        (
+            "http://subsubdomain.subdomain.company-net.com/username/myproject.git",
+            ParsedGitUrl("http", "subsubdomain.subdomain.company-net.com", "username", "myproject"),
+        ),
         (
             "https://github.com/username/myproject.git",
             ParsedGitUrl("https", "github.com", "username", "myproject"),
@@ -22,6 +26,10 @@
             "https://git.mycompany.com:4443/username/myproject.git",
             ParsedGitUrl("https", "git.mycompany.com:4443", "username", "myproject"),
         ),
+        (
+            "https://subsubdomain.subdomain.company-net.com/username/myproject.git",
+            ParsedGitUrl("https", "subsubdomain.subdomain.company-net.com", "username", "myproject"),
+        ),
         (
             "git://host.xz/path/to/repo.git/",
             ParsedGitUrl("git", "host.xz", "path/to", "repo"),
@@ -34,6 +42,10 @@
             "git@github.com:username/myproject.git",
             ParsedGitUrl("ssh", "git@github.com", "username", "myproject"),
         ),
+        (
+            "git@subsubdomain.subdomain.company-net.com:username/myproject.git",
+            ParsedGitUrl("ssh", "git@subsubdomain.subdomain.company-net.com", "username", "myproject"),
+        ),
         (
             "ssh://git@github.com:3759/myproject.git",
             ParsedGitUrl("ssh", "git@github.com", "3759", "myproject"),
@@ -46,6 +58,10 @@
             "ssh://git@bitbucket.org:7999/username/myproject.git",
             ParsedGitUrl("ssh", "git@bitbucket.org:7999", "username", "myproject"),
         ),
+        (
+            "ssh://git@subsubdomain.subdomain.company-net.com:username/myproject.git",
+            ParsedGitUrl("ssh", "git@subsubdomain.subdomain.company-net.com", "username", "myproject"),
+        ),
         (
             "git+ssh://git@github.com:username/myproject.git",
             ParsedGitUrl("ssh", "git@github.com", "username", "myproject"),