Merge pull request #32 from retr0h/bug-29

Corrected processing of URLs with hyphen
coala · Mar 9, 2019 · 3e2bf91 · 3e2bf91
2 parents 3c3ba25 + ea32b30
commit 3e2bf91
Show file tree

Hide file tree

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