Merge pull request #4 from yakky/gitlab

Add support for gitlab

Author: AaronO

giturlparse/parser.py

@@ -8,6 +8,7 @@
     'repo',
     'owner',
     '_user',
+    'port',
 
     'url',
     'platform',
@@ -18,6 +19,7 @@
 def parse(url, check_domain=True):
     # Values are None by default
     parsed_info = defaultdict(lambda: None)
+    parsed_info['port'] = ''
 
     # Defaults to all attributes
     map(parsed_info.setdefault, SUPPORTED_ATTRIBUTES)

giturlparse/platforms/__init__.py

@@ -4,6 +4,7 @@
 from .bitbucket import BitbucketPlatform
 from .friendcode import FriendCodePlatform
 from .assembla import AssemblaPlatform
+from .gitlab import GitlabPlatform
 
 
 # Supported platforms
@@ -13,6 +14,7 @@
     ('bitbucket', BitbucketPlatform()),
     ('friendcode', FriendCodePlatform()),
     ('assembla', AssemblaPlatform()),
+    ('gitlab', GitlabPlatform()),
 
     # Match url
     ('base', BasePlatform()),

giturlparse/result.py

@@ -106,6 +106,10 @@ def friendcode(self):
     def assembla(self):
         return self.platform == 'assembla'
 
+    @property
+    def gitlab(self):
+        return self.platform == 'gitlab'
+
     ##
     # Get data as dict
     ##

giturlparse/tests/parse.py

@@ -50,6 +50,44 @@
         'protocol': 'ssh',
         'platform': 'bitbucket'
     })),
+
+    # Gitlab
+    ('SSH', ('git@host.org:9999/Org/Repo.git', {
+        'host': 'host.org',
+        'user': 'git',
+        'owner': 'Org',
+        'repo': 'Repo',
+
+        'protocol': 'ssh',
+        'platform': 'gitlab'
+    })),
+    ('SSH', ('git@host.org:Org/Repo.git', {
+        'host': 'host.org',
+        'user': 'git',
+        'owner': 'Org',
+        'repo': 'Repo',
+
+        'protocol': 'ssh',
+        'platform': 'gitlab'
+    })),
+    ('SSH', ('ssh://git@host.org:9999/Org/Repo.git', {
+        'host': 'host.org',
+        'user': 'git',
+        'owner': 'Org',
+        'repo': 'Repo',
+
+        'protocol': 'ssh',
+        'platform': 'gitlab'
+    })),
+    ('HTTPS', ('https://host.org/Org/Repo.git', {
+        'host': 'host.org',
+        'user': 'git',
+        'owner': 'Org',
+        'repo': 'Repo',
+
+        'protocol': 'https',
+        'platform': 'gitlab'
+    })),
 )
 
 INVALID_PARSE_URLS = (

giturlparse/tests/rewrite.py

@@ -38,6 +38,16 @@
 
     # FriendCode HTTPS
     ('https://friendco.de/Aaron@user/test-repo.git', 'https', 'https://friendco.de/Aaron@user/test-repo.git'),
+
+    # Gitlab SSH
+    ('git@host.org:Org/Repo.git', 'ssh', 'ssh://git@host.org:Org/Repo.git'),
+    ('git@host.org:9999/Org/Repo.git', 'ssh', 'ssh://git@host.org:9999/Org/Repo.git'),
+    ('git@host.org:Org/Repo.git', 'https', 'https://host.org/Org/Repo.git'),
+    ('git@host.org:9999/Org/Repo.git', 'https', 'https://host.org/Org/Repo.git'),
+
+    # Gitlab HTTPS
+    ('https://host.org/Org/Repo.git', 'ssh', 'ssh://git@host.org:Org/Repo.git'),
+    ('https://host.org/Org/Repo.git', 'https', 'https://host.org/Org/Repo.git'),
 )
 
 INVALID_PARSE_URLS = (