Merge pull request #39 from jayvdb/trailing-slash

Allow trailing slashes
coala · Jul 9, 2019 · d3eac95 · d3eac95
2 parents a6901cf + 73dec59
commit d3eac95
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 3 deletions.
diff --git a/giturlparse/parser.py b/giturlparse/parser.py
@@ -42,14 +42,14 @@
                r'[:/]*'
                r'(?P<port>[\d]+){0,1}'
                r'(?P<pathname>\/((?P<owner>[\w\-]+)\/)?'
-               r'((?P<name>[\w\-\.]+?)(\.git)?)?)$'),
+               r'((?P<name>[\w\-\.]+?)(\.git|\/)?)?)$'),
     re.compile(r'(git\+)?'
                r'((?P<protocol>\w+)://)'
                r'((?P<user>\w+)@)?'
                r'((?P<resource>[\w\.\-]+))'
                r'(:(?P<port>\d+))?'
                r'(?P<pathname>(\/(?P<owner>\w+)/)?'
-               r'(\/?(?P<name>[\w\-]+)(\.git)?)?)$'),
+               r'(\/?(?P<name>[\w\-]+)(\.git|\/)?)?)$'),
     re.compile(r'^(?:(?P<user>.+)@)*'
                r'(?P<resource>[a-z0-9_.-]*)[:]*'
                r'(?P<port>[\d]+){0,1}'
@@ -58,7 +58,7 @@
                r'((?P<resource>[\w\.\-]+))'
                r'[\:\/]{1,2}'
                r'(?P<pathname>((?P<owner>\w+)/)?'
-               r'((?P<name>[\w\-]+)(\.git)?)?)$'),
+               r'((?P<name>[\w\-]+)(\.git|\/)?)?)$'),
 )
 
 

diff --git a/test/conftest.py b/test/conftest.py
@@ -48,6 +48,17 @@ def first_match_urls():
             'name': 'repo',
             'owner': 'owner',
         },
+        'http://example.com/owner/repo/': {
+            'pathname': '/owner/repo/',
+            'protocols': ['http'],
+            'protocol': 'http',
+            'href': 'http://example.com/owner/repo/',
+            'resource': 'example.com',
+            'user': None,
+            'port': None,
+            'name': 'repo',
+            'owner': 'owner',
+        },
         'http://[email protected]/user/repo': {
             'pathname': '/user/repo',
             'protocols': ['http'],
@@ -81,6 +92,17 @@ def first_match_urls():
             'name': 'repo',
             'owner': 'user',
         },
+        'http://[email protected]:29418/user/repo/': {
+            'pathname': '/user/repo/',
+            'protocols': ['http'],
+            'protocol': 'http',
+            'href': 'http://[email protected]:29418/user/repo/',
+            'resource': 'example.com',
+            'user': 'user',
+            'port': '29418',
+            'name': 'repo',
+            'owner': 'user',
+        },
         'http://example.com/repo': {
             'pathname': '/repo',
             'protocols': ['http'],
@@ -180,6 +202,28 @@ def first_match_urls():
             'name': 'repo',
             'owner': 'owner',
         },
+        'git://example.com/owner/repo': {
+            'pathname': '/owner/repo',
+            'protocols': ['git'],
+            'protocol': 'git',
+            'href': 'git://example.com/owner/repo',
+            'resource': 'example.com',
+            'user': None,
+            'port': None,
+            'name': 'repo',
+            'owner': 'owner',
+        },
+        'git://example.com/owner/repo/': {
+            'pathname': '/owner/repo/',
+            'protocols': ['git'],
+            'protocol': 'git',
+            'href': 'git://example.com/owner/repo/',
+            'resource': 'example.com',
+            'user': None,
+            'port': None,
+            'name': 'repo',
+            'owner': 'owner',
+        },
         'ssh://[email protected]/owner/repo.git': {
             'pathname': '/owner/repo.git',
             'protocols': ['ssh'],
@@ -248,6 +292,17 @@ def first_match_urls():
             'name': 'Stouts.openvpn',
             'owner': 'tterranigma',
         },
+        'https://github.com/tterranigma/Stouts.openvpn/': {
+            'pathname': '/tterranigma/Stouts.openvpn/',
+            'protocols': ['https'],
+            'protocol': 'https',
+            'href': 'https://github.com/tterranigma/Stouts.openvpn/',
+            'resource': 'github.com',
+            'user': None,
+            'port': None,
+            'name': 'Stouts.openvpn',
+            'owner': 'tterranigma',
+        },
         # https://github.com/retr0h/git-url-parse/issues/33
         'https://github.com/tterranigma/Stouts.openvpn.git': {
             'pathname': '/tterranigma/Stouts.openvpn.git',