config: per-repo configuration support

Resolves: #89
Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>

Author: arthurzam

src/pkgdev/cli.py

@@ -10,6 +10,8 @@
 from snakeoil.contexts import patch
 from snakeoil.klass import jit_attr_none
 from snakeoil.mappings import OrderedSet
+from pkgcore.repository import errors as repo_errors
+from pkgcore.util.commandline import _mk_domain
 
 from . import const
 
@@ -113,6 +115,7 @@ def __init__(self, parents=(), **kwargs):
                 It's also possible to disable all types of settings loading by
                 specifying an argument of 'false' or 'no'.
             """)
+        _mk_domain(config_options)
         super().__init__(parents=[*parents, self.config_argparser], **kwargs)
 
     def parse_known_args(self, args=None, namespace=None):
@@ -131,5 +134,13 @@ def parse_known_args(self, args=None, namespace=None):
             namespace = config_parser.parse_config_options(
                 namespace, configs=(namespace.config_file, ))
 
+        try:
+            repo = temp_namespace.domain.find_repo(
+                os.getcwd(), config=temp_namespace.config, configure=False)
+            if repo is not None:
+                namespace = config_parser.parse_config_sections(namespace, repo.aliases)
+        except (repo_errors.InitializationError, IOError) as exc:
+            self.error(str(exc))
+
         # parse command line args to override config defaults
         return super().parse_known_args(args, namespace)

src/pkgdev/scripts/pkgdev_manifest.py

@@ -67,8 +67,8 @@ def _restrict_targets(repo, targets):
         if os.path.exists(target):
             try:
                 restrictions.append(repo.path_restrict(target))
-            except ValueError as e:
-                manifest.error(e)
+            except ValueError as exc:
+                manifest.error(exc)
         else:
             try:
                 restrictions.append(parse_match(target))

tests/conftest.py

@@ -9,8 +9,7 @@
 @pytest.fixture(scope="session")
 def tool():
     """Generate a tool utility for running pkgdev."""
-    tool = Tool(pkgdev.argparser)
-    return tool
+    return Tool(pkgdev.argparser)
 
 
 @pytest.fixture

tests/scripts/test_pkgdev_commit.py

@@ -996,6 +996,28 @@ def test_config_opts(self, capsys, repo, make_git_repo, tmp_path):
         assert not err
         assert 'MissingLicense' in out
 
+    def test_config_repo_opts(self, capsys, repo, make_git_repo, tmp_path):
+        config_file = str(tmp_path / 'config')
+        with open(config_file, 'w') as f:
+            f.write(textwrap.dedent("""
+                [fake]
+                commit.scan=
+            """))
+
+        git_repo = make_git_repo(repo.location)
+        repo.create_ebuild('cat/pkg-0')
+        git_repo.add_all('cat/pkg-0')
+        repo.create_ebuild('cat/pkg-1', license='')
+        git_repo.add_all('cat/pkg-1', commit=False)
+        with patch('sys.argv', ['pkgdev', 'commit', '--config', config_file] + self.scan_args), \
+                pytest.raises(SystemExit) as excinfo, \
+                chdir(git_repo.path):
+            self.script()
+        out, err = capsys.readouterr()
+        assert excinfo.value.code == 1
+        assert not err
+        assert 'MissingLicense' in out
+
     def test_failed_manifest(self, capsys, repo, make_git_repo):
         git_repo = make_git_repo(repo.location)
         repo.create_ebuild('cat/pkg-0')