cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improved handling of role_version in repo_url_to_role_name

Browse source
This commit is contained in:
Will Thames 2014-08-14 20:48:25 +10:00 committed by Michael DeHaan
parent 1803976a40
commit 4803e923ff
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/utils/__init__.py
View file

@ -356,6 +356,8 @@ def repo_url_to_role_name(repo_url):
trailing_path = repo_url.split('/')[-1]
if trailing_path.endswith('.git'):
trailing_path = trailing_path[:-4]
if ',' in trailing_path:
trailing_path = trailing_path.split(',')[0]
return trailing_path
def json_loads(data):

3
test/units/TestUtils.py
View file

@ -780,6 +780,7 @@ class TestUtils(unittest.TestCase):
def test_repo_url_to_role_name(self):
tests = [("http://git.example.com/repos/repo.git", "repo"),
("ssh://git@git.example.com:repos/role-name", "role-name")]
("ssh://git@git.example.com:repos/role-name", "role-name"),
("ssh://git@git.example.com:repos/role-name,v0.1", "role-name")]
for (url, result) in tests:
self.assertEqual(ansible.utils.repo_url_to_role_name(url), result)