Bugfix/issue 107 fix bitbucked url parse (#118)

* Fix BitBucket regex

user@ is optional for HTTPS URLs. Fixes #107

* Add tests for BitBucket HTTPS URLs

* Properly apply platform defaults when parsing

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update changelog

* Update changes/107.bugfix

Co-authored-by: Leonardo Cavallucci <leo.cavallucci@gmail.com>

---------

Co-authored-by: Maciej Katafiasz <mathrick@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Leonardo Cavallucci <leo.cavallucci@gmail.com>

Author: 4 people

changes/107.bugfix

@@ -0,0 +1 @@
+Fix Bitbucket url parse and add bitbucket.com to recognized domains

giturlparse/parser.py

@@ -52,7 +52,9 @@ def parse(url, check_domain=True):
             parsed_info.update(platform.DEFAULTS)
 
             # Get matches as dictionary
-            matches = platform.clean_data(match.groupdict(default=""))
+            matches = platform.clean_data(
+                {k: v if v is not None else platform.DEFAULTS.get(k, "") for k, v in match.groupdict().items()}
+            )
 
             # Update info with matches
             parsed_info.update(matches)

giturlparse/platforms/bitbucket.py

@@ -4,7 +4,7 @@
 class BitbucketPlatform(BasePlatform):
     PATTERNS = {
         "https": (
-            r"(?P<protocols>(git\+)?(?P<protocol>https))://(?P<_user>.+)@(?P<domain>.+?)"
+            r"(?P<protocols>(git\+)?(?P<protocol>https))://(?:(?P<_user>.+)@)?(?P<domain>.+?)"
             r"(?P<pathname>/(?P<owner>.+)/(?P<repo>.+?)(?:\.git)?)$"
         ),
         "ssh": (
@@ -16,5 +16,5 @@ class BitbucketPlatform(BasePlatform):
         "https": r"https://%(owner)s@%(domain)s/%(owner)s/%(repo)s%(dot_git)s",
         "ssh": r"git@%(domain)s:%(owner)s/%(repo)s%(dot_git)s",
     }
-    DOMAINS = ("bitbucket.org",)
+    DOMAINS = ("bitbucket.org", "bitbucket.com")
     DEFAULTS = {"_user": "git"}

giturlparse/tests/test_parse.py

@@ -273,6 +273,75 @@
             },
         ),
     ),
+    (
+        "HTTPS",
+        (
+            "https://bitbucket.org/Org/Repo.git",
+            {
+                "host": "bitbucket.org",
+                "resource": "bitbucket.org",
+                "user": "git",
+                "port": "",
+                "owner": "Org",
+                "repo": "Repo",
+                "name": "Repo",
+                "groups": [],
+                "path": "",
+                "path_raw": "",
+                "pathname": "/Org/Repo.git",
+                "branch": "",
+                "protocol": "https",
+                "protocols": ["https"],
+                "platform": "bitbucket",
+            },
+        ),
+    ),
+    (
+        "HTTPS",
+        (
+            "https://bitbucket.org/Org/Repo",
+            {
+                "host": "bitbucket.org",
+                "resource": "bitbucket.org",
+                "user": "git",
+                "port": "",
+                "owner": "Org",
+                "repo": "Repo",
+                "name": "Repo",
+                "groups": [],
+                "path": "",
+                "path_raw": "",
+                "pathname": "/Org/Repo",
+                "branch": "",
+                "protocol": "https",
+                "protocols": ["https"],
+                "platform": "bitbucket",
+            },
+        ),
+    ),
+    (
+        "HTTPS",
+        (
+            "https://bitbucket.com/Org/Repo",
+            {
+                "host": "bitbucket.com",
+                "resource": "bitbucket.com",
+                "user": "git",
+                "port": "",
+                "owner": "Org",
+                "repo": "Repo",
+                "name": "Repo",
+                "groups": [],
+                "path": "",
+                "path_raw": "",
+                "pathname": "/Org/Repo",
+                "branch": "",
+                "protocol": "https",
+                "protocols": ["https"],
+                "platform": "bitbucket",
+            },
+        ),
+    ),
     # Gitlab
     (
         "SSH",