Remove git-url-parse requirement

gilt/config.py

@@ -24,11 +24,16 @@
 import errno
 import os
 
-import giturlparse
 import yaml
 
 from gilt import interpolation
 
+try:
+    from urllib.parse import urlparse
+except ImportError:
+    # Python 2
+    from urlparse import urlparse
+
 
 class ParseError(Exception):
     """ Error raised when a config can't be loaded properly. """
@@ -59,6 +64,37 @@ def config(filename):
     return [Config(**d) for d in _get_config_generator(filename)]
 
 
+def _parse_repo_uri(uri, scm="git"):
+    """
+    Construct and return a `ParsedRepo` object.
+
+    :param uri: A SCM repository URI.
+    :return: ParsedRepo
+    """
+    ParsedRepo = collections.namedtuple('ParsedRepo', [
+        'hostname',
+        'owner',
+        'name'
+    ])
+
+    scm_ext = "." + scm
+    o = urlparse(uri)
+    if not o.hostname:  # scp-style "URI", so fake it
+        uri = "ssh://" + uri.replace(":/", "/").replace(":", "/")
+        o = urlparse(uri)
+    path = o.path
+    if path.endswith(scm_ext):
+        path = path[0:-len(scm_ext)]
+    try:
+        name, owner = path.rsplit("/", 2)[-1:-3:-1]
+        owner = owner.lstrip("~")
+    except ValueError:
+        # if repo is the root of the path, then there is no owner
+        owner = ''
+
+    return ParsedRepo(o.hostname, owner, name)
+
+
 def _get_files_config(src_dir, files_list):
     """
     Construct `FileConfig` object and return a list.
@@ -85,17 +121,22 @@ def _get_config_generator(filename):
     """
     for d in _get_config(filename):
         repo = d['git']
-        parsedrepo = giturlparse.parse(repo)
-        name = '{}.{}'.format(parsedrepo.owner, parsedrepo.name)
-        src_dir = os.path.join(_get_clone_dir(), name)
+        parsedrepo = _parse_repo_uri(repo)
+        if parsedrepo.owner:
+            name = '{}.{}'.format(parsedrepo.owner, parsedrepo.name)
+        else:
+            name = parsedrepo.name
+        src_dir = os.path.join(_get_clone_dir(), parsedrepo.hostname, name)
         files = d.get('files')
         post_commands = d.get('post_commands', [])
         dst_dir = None
         if not files:
             dst_dir = _get_dst_dir(d['dst'])
         yield {
             'git': repo,
-            'lock_file': _get_lock_file(name),
+            'lock_file': os.path.join(
+                _get_lock_dir(), parsedrepo.hostname, name
+            ),
             'version': d['version'],
             'name': name,
             'src': src_dir,
@@ -156,13 +197,6 @@ def _get_dst_dir(dst_dir):
     return os.path.join(wd, dst_dir)
 
 
-def _get_lock_file(name):
-    """ Return the lock file for the given name. """
-    return os.path.join(
-        _get_lock_dir(),
-        name, )
-
-
 def _get_base_dir():
     """ Return gilt's base working directory. """
     return os.path.expanduser(BASE_WORKING_DIR)

requirements.txt

@@ -1,7 +1,6 @@
 click
 colorama
 fasteners
-git-url-parse
 pbr
 PyYAML
 sh

test/test_config.py

@@ -38,9 +38,10 @@ def test_config(gilt_config_file):
     assert 'https://github.com/retr0h/ansible-etcd.git' == r.git
     assert 'master' == r.version
     assert 'retr0h.ansible-etcd' == r.name
-    assert (gilt_root, 'clone', 'retr0h.ansible-etcd') == os_split(r.src)[-3:]
-    assert (gilt_root, 'lock',
-            'retr0h.ansible-etcd') == os_split(r.lock_file)[-3:]
+    assert (gilt_root, 'clone', 'github.com',
+            'retr0h.ansible-etcd') == os_split(r.src)[-4:]
+    assert (gilt_root, 'lock', 'github.com',
+            'retr0h.ansible-etcd') == os_split(r.lock_file)[-4:]
     assert ('roles', 'retr0h.ansible-etcd', '') == os_split(r.dst)[-3:]
     assert [] == r.files
 
@@ -52,11 +53,176 @@ def test_config(gilt_config_file):
     assert r.dst is None
 
     f = r.files[0]
-    x = (gilt_root, 'clone', 'lorin.openstack-ansible-modules', '*_manage')
-    assert x == os_split(f.src)[-4:]
+    x = (gilt_root, 'clone', 'github.com',
+         'lorin.openstack-ansible-modules', '*_manage')
+    assert x == os_split(f.src)[-5:]
     assert ('library', '') == os_split(f.dst)[-2:]
 
 
+gilt_repos = [
+    (
+        "example.com:/owner/repo.git",
+        {"name": "repo", "owner": "owner", "hostname": "example.com"},
+    ),
+    (
+        "example.com:owner/repo.git",
+        {"name": "repo", "owner": "owner", "hostname": "example.com"},
+    ),
+    (
+        "example.com:repo.git",
+        {"name": "repo", "owner": "", "hostname": "example.com"},
+    ),
+    (
+        "git+https://example.com/owner/repo.git",
+        {"name": "repo", "owner": "owner", "hostname": "example.com"},
+    ),
+    (
+        "git+ssh://example.com/owner/repo.git",
+        {"name": "repo", "owner": "owner", "hostname": "example.com"},
+    ),
+    (
+        "git+ssh://[email protected]/~philip.sd6/test.repo.git",
+        {
+            "name": "test.repo",
+            "owner": "philip.sd6",
+            "hostname": "git.example.com",
+        },
+    ),
+    (
+        "git://example.com/owner/repo.git",
+        {"name": "repo", "owner": "owner", "hostname": "example.com"},
+    ),
+    (
+        "http://example.com/owner/repo",
+        {"name": "repo", "owner": "owner", "hostname": "example.com"},
+    ),
+    (
+        "http://example.com/owner/repo.git",
+        {"name": "repo", "owner": "owner", "hostname": "example.com"},
+    ),
+    (
+        "http://example.com/repo",
+        {"name": "repo", "owner": "", "hostname": "example.com"},
+    ),
+    (
+        "http://example.com:29418/owner/repo.git",
+        {"name": "repo", "owner": "owner", "hostname": "example.com"},
+    ),
+    (
+        "http://[email protected]/user/repo",
+        {"name": "repo", "owner": "user", "hostname": "example.com"},
+    ),
+    (
+        "http://[email protected]:29418/user/repo",
+        {"name": "repo", "owner": "user", "hostname": "example.com"},
+    ),
+    (
+        "https://example.com/git/scm/project/my-sample.repo.git",
+        {
+            "name": "my-sample.repo",
+            "owner": "project",
+            "hostname": "example.com",
+        },
+    ),
+    (
+        "https://example.com/git/scm/~philip.sd6/my-sample.repo.git",
+        {
+            "name": "my-sample.repo",
+            "owner": "philip.sd6",
+            "hostname": "example.com",
+        },
+    ),
+    (
+        "https://example.com/owner/repo",
+        {"name": "repo", "owner": "owner", "hostname": "example.com"},
+    ),
+    (
+        "https://example.com/owner/repo.git",
+        {"name": "repo", "owner": "owner", "hostname": "example.com"},
+    ),
+    (
+        "https://example.com/repo",
+        {"name": "repo", "owner": "", "hostname": "example.com"},
+    ),
+    (
+        "https://example.com:29418/owner/repo.git",
+        {"name": "repo", "owner": "owner", "hostname": "example.com"},
+    ),
+    (
+        "https://github.com/sphinx-doc/sphinx.git",
+        {"name": "sphinx", "owner": "sphinx-doc", "hostname": "github.com"},
+    ),
+    (
+        "https://github.com/tterranigma/Stouts.openvpn",
+        {
+            "name": "Stouts.openvpn",
+            "owner": "tterranigma",
+            "hostname": "github.com",
+        },
+    ),
+    (
+        "https://github.com/tterranigma/Stouts.openvpn.git",
+        {
+            "name": "Stouts.openvpn",
+            "owner": "tterranigma",
+            "hostname": "github.com",
+        },
+    ),
+    (
+        "https://[email protected]/user/repo",
+        {"name": "repo", "owner": "user", "hostname": "example.com"},
+    ),
+    (
+        "https://[email protected]:29418/user/repo",
+        {"name": "repo", "owner": "user", "hostname": "example.com"},
+    ),
+    (
+        "rsync://example.com/owner/repo.git",
+        {"name": "repo", "owner": "owner", "hostname": "example.com"},
+    ),
+    (
+        "ssh://example.com/owner/repo.git",
+        {"name": "repo", "owner": "owner", "hostname": "example.com"},
+    ),
+    (
+        "ssh://example.com:29418/owner/repo.git",
+        {"name": "repo", "owner": "owner", "hostname": "example.com"},
+    ),
+    (
+        "ssh://[email protected]/owner/repo.git",
+        {"name": "repo", "owner": "owner", "hostname": "example.com"},
+    ),
+    (
+        "ssh://[email protected]:29418/owner/repo.git",
+        {"name": "repo", "owner": "owner", "hostname": "example.com"},
+    ),
+    (
+        "[email protected]:/owner/repo.git",
+        {"name": "repo", "owner": "owner", "hostname": "example.com"},
+    ),
+    (
+        "[email protected]:owner/repo.git",
+        {"name": "repo", "owner": "owner", "hostname": "example.com"},
+    ),
+    (
+        "[email protected]:repo.git",
+        {"name": "repo", "owner": "", "hostname": "example.com"},
+    ),
+    (
+        "[email protected]:owner/repo.git",
+        {"name": "repo", "owner": "owner", "hostname": "foo-example.com"},
+    ),
+]
+
+
+@pytest.mark.parametrize('uri,expected', gilt_repos)
+def test_config_repo(uri, expected):
+    parsedrepo = config._parse_repo_uri(uri)
+    assert parsedrepo.hostname == expected['hostname']
+    assert parsedrepo.owner == expected['owner']
+    assert parsedrepo.name == expected['name']
+
+
 @pytest.fixture()
 def missing_git_key_data():
     return [{'foo': 'https://github.com/retr0h/ansible-etcd.git'}]