Merge pull request #11 from somasis/master

Add a ${username} variable for use in targets

Author: languitar

passgithelper.py

@@ -354,6 +354,9 @@ def skip(line, skip):
             # TODO handle exceptions
             pass_target = mapping.get(section, 'target').replace(
                 "${host}", request['host'])
+            if 'username' in request:
+                pass_target = pass_target.replace(
+                    "${username}", request['username'])
 
             password_extractor = SpecificLineExtractor(
                 0, 0, option_suffix='_password')

test_data/wildcard/git-pass-mapping.ini

@@ -1,2 +1,2 @@
 [*]
-target=dev/${host}
+target=dev/${host}/${username}

test_passgithelper.py

@@ -208,6 +208,7 @@ def test_wildcard_matching(self, xdg_dir, monkeypatch, mocker, capsys):
         monkeypatch.setattr('sys.stdin', io.StringIO('''
 protocol=https
 host=wildcard.com
+username=wildcard
 path=subpath/bar.git'''))
 
         subprocess_mock = mocker.patch('subprocess.check_output')
@@ -217,7 +218,7 @@ def test_wildcard_matching(self, xdg_dir, monkeypatch, mocker, capsys):
 
         subprocess_mock.assert_called_once()
         subprocess_mock.assert_called_with(
-            ['pass', 'show', 'dev/wildcard.com'])
+            ['pass', 'show', 'dev/wildcard.com/wildcard'])
 
         out, _ = capsys.readouterr()
         assert out == 'password=narf-wildcard\n'