Merge pull request #4 from sks444/giturlparse

Make all the invalid urls valid

Author: retr0h

giturlparse/parser.py

@@ -69,16 +69,30 @@ def parse(self):
             'name': None,
             'owner': None,
         }
-        regexes = [(r'^(?P<protocol>https?|git|ssh|rsync)\://'
-                    '(?:(?P<user>.+)@)*'
-                    '(?P<resource>[a-z0-9_.-]*)'
-                    '[:/]*'
-                    '(?P<port>[\d]+){0,1}'
-                    '(?P<pathname>\/(?P<owner>.+)/(?P<name>.+).git)'),
-                   (r'^(?:(?P<user>.+)@)*'
-                    '(?P<resource>[a-z0-9_.-]*)[:/]*'
-                    '(?P<port>[\d]+){0,1}'
-                    '[:](?P<pathname>\/?(?P<owner>.+)/(?P<name>.+).git)')]
+        regexes = [
+            (r'^(?P<protocol>https?|git|ssh|rsync)\://'
+             '(?:(?P<user>.+)@)*'
+             '(?P<resource>[a-z0-9_.-]*)'
+             '[:/]*'
+             '(?P<port>[\d]+){0,1}'
+             '(?P<pathname>\/(?P<owner>.+)/(?P<name>.+).git)'),
+            (r'(git\+)?'
+             '((?P<protocol>\w+)://)'
+             '((?P<user>\w+)@)?'
+             '((?P<resource>[\w\.\-]+))'
+             '(:(?P<port>\d+))?'
+             '(?P<pathname>(\/(?P<owner>\w+)/)?'
+             '(\/?(?P<name>[\w\-]+)(\.git)?)?)'),
+            (r'^(?:(?P<user>.+)@)*'
+             '(?P<resource>[a-z0-9_.-]*)[:/]*'
+             '(?P<port>[\d]+){0,1}'
+             '[:](?P<pathname>\/?(?P<owner>.+)/(?P<name>.+).git)'),
+            (r'((?P<user>\w+)@)?'
+             '((?P<resource>[\w\.\-]+))'
+             '[\:\/]{1,2}'
+             '(?P<pathname>((?P<owner>\w+)/)?'
+             '((?P<name>[\w\-]+)(\.git)?)?)'),
+        ]
         for regex in regexes:
             if re.search(regex, self._url):
                 m = re.search(regex, self._url)

test/conftest.py

@@ -170,16 +170,86 @@ def git_urls():
             'name': 'repo',
             'owner': 'owner',
         },
+        'https://example.com/owner/repo': {
+            'pathname': '/owner/repo',
+            'protocols': ['https'],
+            'protocol': 'https',
+            'href': 'https://example.com/owner/repo',
+            'resource': 'example.com',
+            'user': None,
+            'port': None,
+            'name': 'repo',
+            'owner': 'owner',
+        },
+        'example.com:repo.git': {
+            'pathname': 'repo.git',
+            'protocols': [],
+            'protocol': 'ssh',
+            'href': 'example.com:repo.git',
+            'resource': 'example.com',
+            'user': None,
+            'port': None,
+            'name': 'repo',
+            'owner': None,
+        },
+        'https://example.com/repo': {
+            'pathname': '/repo',
+            'protocols': ['https'],
+            'protocol': 'https',
+            'href': 'https://example.com/repo',
+            'resource': 'example.com',
+            'user': None,
+            'port': None,
+            'name': 'repo',
+            'owner': None,
+        },
+        'https://example.in/repo': {
+            'pathname': '/repo',
+            'protocols': ['https'],
+            'protocol': 'https',
+            'href': 'https://example.in/repo',
+            'resource': 'example.in',
+            'user': None,
+            'port': None,
+            'name': 'repo',
+            'owner': None,
+        },
+        '[email protected]:repo.git': {
+            'pathname': 'repo.git',
+            'protocols': [],
+            'protocol': 'ssh',
+            'href': '[email protected]:repo.git',
+            'resource': 'example.com',
+            'user': 'user',
+            'port': None,
+            'name': 'repo',
+            'owner': None,
+        },
+        'git+ssh://example.com/owner/repo.git': {
+            'pathname': '/owner/repo.git',
+            'protocols': ['git', 'ssh'],
+            'protocol': 'ssh',
+            'href': 'git+ssh://example.com/owner/repo.git',
+            'resource': 'example.com',
+            'user': None,
+            'port': None,
+            'name': 'repo',
+            'owner': 'owner',
+        },
+        'git+https://example.com/owner/repo.git': {
+            'pathname': '/owner/repo.git',
+            'protocols': ['git', 'https'],
+            'protocol': 'https',
+            'href': 'git+https://example.com/owner/repo.git',
+            'resource': 'example.com',
+            'user': None,
+            'port': None,
+            'name': 'repo',
+            'owner': 'owner',
+        },
     }
 
 
 @pytest.fixture()
 def invalid_urls():
-    return [
-        'https://example.com/owner',
-        'git+ssh://example.com/owner/repo.git'
-        'git+https://example.com/owner/repo.git'
-        'https://example.com/owner',
-        'example.com:repo.git',
-        '[email protected]:repo.git',
-    ]
+    return []