Release 0.17.0

* block issues without templates

* add setup subcommand

* handle devtools config correctly

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,24 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+## Summary
+
+A clear and concise description of what the bug is.
+
+### Steps to Reproduce
+
+Steps to reproduce the behavior (commands, environment etc)
+
+### Expected behavior
+
+A clear and concise description of what you expected to happen.
+
+### Logs
+
+Add logs to help explain your problem. Logs to stderr can be generated by using `--no-log` command line option.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/ISSUE_TEMPLATE/discussion.md

@@ -0,0 +1,12 @@
+---
+name: Question
+about: Create an issue to get help with project
+title: ''
+labels: question
+assignees: ''
+
+---
+
+## Describe your question below
+
+A clear and concise description of your issue for which you would like to get help.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+## Feature summary
+
+Brief description of the feature required
+
+### Cause of the feature request
+
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+### Proposed changes and/or features
+
+A clear and concise description of what you want to happen.

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,13 @@
+## Summary
+
+Brief description of the pull request. Try to provide clear explanation for major changes.
+
+Please make sure that branch called either `feature/feature-name` for feature-related pull requests or `bug/bug-name` for bug-related ones.
+
+Put `closes #ISSUE` in case if the pull requests solves one of the opened issues.
+
+### Checklist
+
+- [ ] Tests to cover new code
+- [ ] `make check` passed
+- [ ] `make tests` passed

.github/workflows/python-app.yml

@@ -0,0 +1,27 @@
+# based on https://github.com/actions/starter-workflows/blob/main/ci/python-app.yml
+
+name: ahriman
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: run check and tests in archlinux container
+        run: |
+          docker run \
+          -v  ${{ github.workspace }}:/build -w /build \
+          archlinux:latest \
+          /bin/bash -c "pacman --noconfirm -Syu base-devel python python-pip && \
+          pip install -e .[web] && \
+          pip install -e .[check] && \
+          pip install -e .[test] && \
+          make check tests"

AUTHORS

@@ -0,0 +1,2 @@
+Current developers:
+Evgenii Alekseev aka arcanis <esalexeev (at) gmail (dot) com>

Makefile

@@ -3,7 +3,7 @@
 
 PROJECT := ahriman
 
-FILES := COPYING CONFIGURING.md README.md package src setup.py
+FILES := AUTHORS COPYING CONFIGURING.md README.md package src setup.py
 TARGET_FILES := $(addprefix $(PROJECT)/, $(FILES))
 IGNORE_FILES := package/archlinux src/.mypy_cache
 

README.md

@@ -19,14 +19,14 @@ Wrapper for managing custom repository inspired by [repo-scripts](https://github
 * Create `/var/lib/ahriman/.makepkg.conf` with `makepkg.conf` overrides if required (at least you might want to set `PACKAGER`):
 
     ```shell
-    echo 'PACKAGES="John Doe <john@doe.com>"' | sudo -u ahriman tee -a /var/lib/ahriman/.makepkg.conf
+    echo 'PACKAGER="John Doe <john@doe.com>"' | sudo -u ahriman tee -a /var/lib/ahriman/.makepkg.conf
     ```
 
 * Configure build tools (it is required for correct dependency management system):
 
     * create build command, e.g. `ln -s /usr/bin/archbuild /usr/local/bin/ahriman-x86_64-build` (you can choose any name for command, basically it should be `{name}-{arch}-build`);
     * create configuration file, e.g. `cp /usr/share/devtools/pacman-{extra,ahriman}.conf` (same as previous `pacman-{name}.conf`);
-    * change configuration file, add your own repository, add multilib repository etc. Hint: you can use `Include` option as well;
+    * change configuration file, add your own repository, add multilib repository etc;
     * set `build_command` option to point to your command;
     * configure `/etc/sudoers.d/ahriman` to allow running command without a password.
 
@@ -66,3 +66,5 @@ Wrapper for managing custom repository inspired by [repo-scripts](https://github
     ```shell
     sudo -u ahriman ahriman -a x86_64 add yay
     ```
+
+Note that initial service configuration can be done by running `ahriman setup` with specific arguments.

package/archlinux/PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Evgeniy Alekseev
 
 pkgname='ahriman'
-pkgver=0.16.0
+pkgver=0.17.0
 pkgrel=1
 pkgdesc="ArcHlinux ReposItory MANager"
 arch=('any')
@@ -23,7 +23,7 @@ optdepends=('aws-cli: sync to s3'
 source=("https://github.com/arcan1s/ahriman/releases/download/$pkgver/$pkgname-$pkgver-src.tar.xz"
         'ahriman.sysusers'
         'ahriman.tmpfiles')
-sha512sums=('b337bd936d8bc768a703eaa519e4a178993454e15696135fc21cd4216fbd03bcf433c9887cc96b4cf96f8738488d338338601b5b04c5c3b099ab69c52305d8f6'
+sha512sums=('0e29a7a075cbca0259a2f6374a5d1d09285112f6221d62b1c24b56ad23807133001d56ed045307866f9c7cde772f54adda234bdfcaaa272ac7d363c7da6d1f9f'
             '13718afec2c6786a18f0b223ef8e58dccf0688bca4cdbe203f14071f5031ed20120eb0ce38b52c76cfd6e8b6581a9c9eaa2743eb11abbaca637451a84c33f075'
             '55b20f6da3d66e7bbf2add5d95a3b60632df121717d25a993e56e737d14f51fe063eb6f1b38bd81cc32e05db01c0c1d80aaa720c45cde87f238d8b46cdb8cbc4')
 backup=('etc/ahriman.ini'

setup.py

@@ -71,8 +71,25 @@ setup(
     ],
 
     extras_require={
-        "html-templates": ["Jinja2"],
-        "test": ["pytest", "pytest-cov", "pytest-helpers-namespace", "pytest-mock", "pytest-pspec", "pytest-resource-path"],
-        "web": ["Jinja2", "aiohttp", "aiohttp_jinja2", "requests"],
+        "check": [
+            "autopep8",
+            "mypy",
+            "pylint",
+        ],
+        "test": [
+            "pytest",
+            "pytest-aiohttp",
+            "pytest-cov",
+            "pytest-helpers-namespace",
+            "pytest-mock",
+            "pytest-pspec",
+            "pytest-resource-path",
+        ],
+        "web": [
+            "Jinja2",
+            "aiohttp",
+            "aiohttp_jinja2",
+            "requests",
+        ],
     },
 )

src/ahriman/application/ahriman.py

@@ -31,12 +31,8 @@ def _parser() -> argparse.ArgumentParser:
     :return: command line parser for the application
     """
     parser = argparse.ArgumentParser(prog="ahriman", description="ArcHlinux ReposItory MANager")
-    parser.add_argument(
-        "-a",
-        "--architecture",
-        help="target architectures (can be used multiple times)",
-        action="append",
-        required=True)
+    parser.add_argument("-a", "--architecture", help="target architectures (can be used multiple times)",
+                        action="append", required=True)
     parser.add_argument("-c", "--config", help="configuration path", default="/etc/ahriman.ini")
     parser.add_argument("--force", help="force run, remove file lock", action="store_true")
     parser.add_argument("--lock", help="lock file", default="/tmp/ahriman.lock")
@@ -44,6 +40,7 @@ def _parser() -> argparse.ArgumentParser:
     parser.add_argument("--no-report", help="force disable reporting to web service", action="store_true")
     parser.add_argument("--unsafe", help="allow to run ahriman as non-ahriman user", action="store_true")
     parser.add_argument("-v", "--version", action="version", version=version.__version__)
+
     subparsers = parser.add_subparsers(title="command", help="command to run", dest="command", required=True)
 
     add_parser = subparsers.add_parser("add", description="add package")
@@ -60,12 +57,10 @@ def _parser() -> argparse.ArgumentParser:
     clean_parser.add_argument("--no-build", help="do not clear directory with package sources", action="store_true")
     clean_parser.add_argument("--no-cache", help="do not clear directory with package caches", action="store_true")
     clean_parser.add_argument("--no-chroot", help="do not clear build chroot", action="store_true")
-    clean_parser.add_argument(
-        "--no-manual",
-        help="do not clear directory with manually added packages",
+    clean_parser.add_argument("--no-manual", help="do not clear directory with manually added packages",
                               action="store_true")
     clean_parser.add_argument("--no-packages", help="do not clear directory with built packages", action="store_true")
-    clean_parser.set_defaults(handler=handlers.Clean)
+    clean_parser.set_defaults(handler=handlers.Clean, unsafe=True)
 
     config_parser = subparsers.add_parser("config", description="dump configuration for specified architecture")
     config_parser.set_defaults(handler=handlers.Dump, lock=None, no_report=True, unsafe=True)
@@ -81,6 +76,19 @@ def _parser() -> argparse.ArgumentParser:
     report_parser.add_argument("target", help="target to generate report", nargs="*")
     report_parser.set_defaults(handler=handlers.Report)
 
+    setup_parser = subparsers.add_parser("setup", description="create initial service configuration, requires root")
+    setup_parser.add_argument("--build-command", help="build command prefix", default="ahriman")
+    setup_parser.add_argument("--from-config", help="path to default devtools pacman configuration",
+                              default="/usr/share/devtools/pacman-extra.conf")
+    setup_parser.add_argument("--no-multilib", help="do not add multilib repository", action="store_true")
+    setup_parser.add_argument("--packager", help="packager name and email", required=True)
+    setup_parser.add_argument("--repository", help="repository name", default="aur-clone")
+    setup_parser.set_defaults(handler=handlers.Setup, lock=None, no_report=True, unsafe=True)
+
+    sign_parser = subparsers.add_parser("sign", description="(re-)sign packages and repository database")
+    sign_parser.add_argument("package", help="sign only specified packages", nargs="*")
+    sign_parser.set_defaults(handler=handlers.Sign)
+
     status_parser = subparsers.add_parser("status", description="request status of the package")
     status_parser.add_argument("--ahriman", help="get service status itself", action="store_true")
     status_parser.add_argument("package", help="filter status by package base", nargs="*")
@@ -92,8 +100,8 @@ def _parser() -> argparse.ArgumentParser:
 
     update_parser = subparsers.add_parser("update", description="run updates")
     update_parser.add_argument("package", help="filter check by package base", nargs="*")
-    update_parser.add_argument(
-        "--dry-run", help="just perform check for updates, same as check command", action="store_true")
+    update_parser.add_argument("--dry-run", help="just perform check for updates, same as check command",
+                               action="store_true")
     update_parser.add_argument("--no-aur", help="do not check for AUR updates. Implies --no-vcs", action="store_true")
     update_parser.add_argument("--no-manual", help="do not include manual updates", action="store_true")
     update_parser.add_argument("--no-vcs", help="do not check VCS packages", action="store_true")
@@ -106,8 +114,8 @@ def _parser() -> argparse.ArgumentParser:
 
 
 if __name__ == "__main__":
-    arg_parser = _parser()
-    args = arg_parser.parse_args()
+    args_parser = _parser()
+    args = args_parser.parse_args()
 
     handler: handlers.Handler = args.handler
     status = handler.execute(args)

src/ahriman/application/application.py

@@ -21,7 +21,7 @@ import logging
 import shutil
 
 from pathlib import Path
-from typing import Callable, Iterable, List, Optional, Set
+from typing import Callable, Iterable, List, Set
 
 from ahriman.core.build_tools.task import Task
 from ahriman.core.configuration import Configuration
@@ -67,8 +67,8 @@ class Application:
         """
         generate report and sync to remote server
         """
-        self.report()
-        self.sync()
+        self.report([])
+        self.sync([])
 
     def get_updates(self, filter_packages: List[str], no_aur: bool, no_manual: bool, no_vcs: bool,
                     log_fn: Callable[[str], None]) -> List[Package]:
@@ -162,7 +162,7 @@ class Application:
         self.repository.process_remove(names)
         self._finalize()
 
-    def report(self, target: Optional[Iterable[str]] = None) -> None:
+    def report(self, target: Iterable[str]) -> None:
         """
         generate report
         :param target: list of targets to run (e.g. html)
@@ -170,7 +170,29 @@ class Application:
         targets = target or None
         self.repository.process_report(targets)
 
-    def sync(self, target: Optional[Iterable[str]] = None) -> None:
+    def sign(self, packages: Iterable[str]) -> None:
+        """
+        sign packages and repository
+        :param packages: only sign specified packages
+        """
+        # copy to prebuilt directory
+        for package in self.repository.packages():
+            # no one requested this package
+            if packages and package.base not in packages:
+                continue
+            for archive in package.packages.values():
+                if archive.filepath is None:
+                    continue  # avoid mypy warning
+                src = self.repository.paths.repository / archive.filepath
+                dst = self.repository.paths.packages / archive.filepath
+                shutil.copy(src, dst)
+        # run generic update function
+        self.update([])
+        # sign repository database if set
+        self.repository.sign.sign_repository(self.repository.repo.repo_path)
+        self._finalize()
+
+    def sync(self, target: Iterable[str]) -> None:
         """
         sync to remote server
         :param target: list of targets to run (e.g. s3)

src/ahriman/application/handlers/__init__.py

@@ -25,6 +25,8 @@ from ahriman.application.handlers.dump import Dump
 from ahriman.application.handlers.rebuild import Rebuild
 from ahriman.application.handlers.remove import Remove
 from ahriman.application.handlers.report import Report
+from ahriman.application.handlers.setup import Setup
+from ahriman.application.handlers.sign import Sign
 from ahriman.application.handlers.status import Status
 from ahriman.application.handlers.sync import Sync
 from ahriman.application.handlers.update import Update

src/ahriman/application/handlers/setup.py

@@ -0,0 +1,160 @@
+#
+# Copyright (c) 2021 ahriman team.
+#
+# This file is part of ahriman
+# (see https://github.com/arcan1s/ahriman).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+import argparse
+import configparser
+
+from pathlib import Path
+from typing import Type
+
+from ahriman.application.application import Application
+from ahriman.application.handlers.handler import Handler
+from ahriman.core.configuration import Configuration
+from ahriman.models.repository_paths import RepositoryPaths
+
+
+class Setup(Handler):
+    """
+    setup handler
+    :cvar ARCHBUILD_COMMAND_PATH: default devtools command
+    :cvar BIN_DIR_PATH: directory for custom binaries
+    :cvar MIRRORLIST_PATH: path to pacman default mirrorlist (used by multilib repository)
+    :cvar SUDOERS_PATH: path to sudoers.d include configuration
+    """
+
+    ARCHBUILD_COMMAND_PATH = Path("/usr/bin/archbuild")
+    BIN_DIR_PATH = Path("/usr/local/bin")
+    MIRRORLIST_PATH = Path("/etc/pacman.d/mirrorlist")
+    SUDOERS_PATH = Path("/etc/sudoers.d/ahriman")
+
+    @classmethod
+    def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, config: Configuration) -> None:
+        """
+        callback for command line
+        :param args: command line args
+        :param architecture: repository architecture
+        :param config: configuration instance
+        """
+        application = Application(architecture, config)
+        Setup.create_makepkg_configuration(args.packager, application.repository.paths)
+        Setup.create_executable(args.build_command, architecture)
+        Setup.create_devtools_configuration(args.build_command, architecture, Path(args.from_config), args.no_multilib,
+                                            args.repository, application.repository.paths)
+        Setup.create_ahriman_configuration(args.build_command, architecture, args.repository, config.include)
+        Setup.create_sudo_configuration(args.build_command, architecture)
+
+    @staticmethod
+    def build_command(prefix: str, architecture: str) -> Path:
+        """
+        generate build command name
+        :param prefix: command prefix in {prefix}-{architecture}-build
+        :param architecture: repository architecture
+        :return: valid devtools command name
+        """
+        return Setup.BIN_DIR_PATH / f"{prefix}-{architecture}-build"
+
+    @staticmethod
+    def create_ahriman_configuration(prefix: str, architecture: str, repository: str, include_path: Path) -> None:
+        """
+        create service specific configuration
+        :param prefix: command prefix in {prefix}-{architecture}-build
+        :param architecture: repository architecture
+        :param repository: repository name
+        :param include_path: path to directory with configuration includes
+        """
+        config = configparser.ConfigParser()
+
+        config.add_section("build")
+        config.set("build", "build_command", str(Setup.build_command(prefix, architecture)))
+
+        config.add_section("repository")
+        config.set("repository", "name", repository)
+
+        target = include_path / "build-overrides.ini"
+        with target.open("w") as ahriman_config:
+            config.write(ahriman_config)
+
+    @staticmethod
+    def create_devtools_configuration(prefix: str, architecture: str, source: Path,
+                                      no_multilib: bool, repository: str, paths: RepositoryPaths) -> None:
+        """
+        create configuration for devtools based on `source` configuration
+        :param prefix: command prefix in {prefix}-{architecture}-build
+        :param architecture: repository architecture
+        :param source: path to source configuration file
+        :param no_multilib: do not add multilib repository
+        :param repository: repository name
+        :param paths: repository paths instance
+        """
+        config = configparser.ConfigParser()
+        # preserve case
+        # stupid mypy thinks that it is impossible
+        config.optionxform = lambda key: key  # type: ignore
+
+        # load default configuration first
+        # we cannot use Include here because it will be copied to new chroot, thus no includes there
+        config.read(source)
+
+        # set our architecture now
+        config.set("options", "Architecture", architecture)
+
+        # add multilib
+        if not no_multilib:
+            config.add_section("multilib")
+            config.set("multilib", "Include", str(Setup.MIRRORLIST_PATH))
+
+        # add repository itself
+        config.add_section(repository)
+        config.set(repository, "SigLevel", "Optional TrustAll")  # we don't care
+        config.set(repository, "Server", f"file://{paths.repository}")
+
+        target = source.parent / f"pacman-{prefix}.conf"
+        with target.open("w") as devtools_config:
+            config.write(devtools_config)
+
+    @staticmethod
+    def create_makepkg_configuration(packager: str, paths: RepositoryPaths) -> None:
+        """
+        create configuration for makepkg
+        :param packager: packager identifier (e.g. name, email)
+        :param paths: repository paths instance
+        """
+        (paths.root / ".makepkg.conf").write_text(f"PACKAGER='{packager}'\n")
+
+    @staticmethod
+    def create_sudo_configuration(prefix: str, architecture: str) -> None:
+        """
+        create configuration to run build command with sudo without password
+        :param prefix: command prefix in {prefix}-{architecture}-build
+        :param architecture: repository architecture
+        """
+        command = Setup.build_command(prefix, architecture)
+        Setup.SUDOERS_PATH.write_text(f"ahriman ALL=(ALL) NOPASSWD: {command} *\n")
+        Setup.SUDOERS_PATH.chmod(0o400)  # security!
+
+    @staticmethod
+    def create_executable(prefix: str, architecture: str) -> None:
+        """
+        create executable for the service
+        :param prefix: command prefix in {prefix}-{architecture}-build
+        :param architecture: repository architecture
+        """
+        command = Setup.build_command(prefix, architecture)
+        command.unlink(missing_ok=True)
+        command.symlink_to(Setup.ARCHBUILD_COMMAND_PATH)

src/ahriman/application/handlers/sign.py

@@ -0,0 +1,42 @@
+#
+# Copyright (c) 2021 ahriman team.
+#
+# This file is part of ahriman
+# (see https://github.com/arcan1s/ahriman).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+import argparse
+
+from typing import Type
+
+from ahriman.application.application import Application
+from ahriman.application.handlers.handler import Handler
+from ahriman.core.configuration import Configuration
+
+
+class Sign(Handler):
+    """
+    (re-)sign handler
+    """
+
+    @classmethod
+    def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, config: Configuration) -> None:
+        """
+        callback for command line
+        :param args: command line args
+        :param architecture: repository architecture
+        :param config: configuration instance
+        """
+        Application(architecture, config).sign(args.package)

src/ahriman/version.py

@@ -17,4 +17,4 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-__version__ = "0.16.0"
+__version__ = "0.17.0"

tests/ahriman/application/handlers/test_handler_add.py

@@ -6,12 +6,17 @@ from ahriman.application.handlers import Add
 from ahriman.core.configuration import Configuration
 
 
+def _default_args(args: argparse.Namespace) -> argparse.Namespace:
+    args.package = []
+    args.without_dependencies = False
+    return args
+
+
 def test_run(args: argparse.Namespace, configuration: Configuration, mocker: MockerFixture) -> None:
     """
     must run command
     """
-    args.package = []
-    args.without_dependencies = False
+    args = _default_args(args)
     mocker.patch("pathlib.Path.mkdir")
     application_mock = mocker.patch("ahriman.application.application.Application.add")
 

tests/ahriman/application/handlers/test_handler_clean.py

@@ -6,15 +6,20 @@ from ahriman.application.handlers import Clean
 from ahriman.core.configuration import Configuration
 
 
-def test_run(args: argparse.Namespace, configuration: Configuration, mocker: MockerFixture) -> None:
-    """
-    must run command
-    """
+def _default_args(args: argparse.Namespace) -> argparse.Namespace:
     args.no_build = False
     args.no_cache = False
     args.no_chroot = False
     args.no_manual = False
     args.no_packages = False
+    return args
+
+
+def test_run(args: argparse.Namespace, configuration: Configuration, mocker: MockerFixture) -> None:
+    """
+    must run command
+    """
+    args = _default_args(args)
     mocker.patch("pathlib.Path.mkdir")
     application_mock = mocker.patch("ahriman.application.application.Application.clean")
 

tests/ahriman/application/handlers/test_handler_remove.py

@@ -6,11 +6,16 @@ from ahriman.application.handlers import Remove
 from ahriman.core.configuration import Configuration
 
 
+def _default_args(args: argparse.Namespace) -> argparse.Namespace:
+    args.package = []
+    return args
+
+
 def test_run(args: argparse.Namespace, configuration: Configuration, mocker: MockerFixture) -> None:
     """
     must run command
     """
-    args.package = []
+    args = _default_args(args)
     mocker.patch("pathlib.Path.mkdir")
     application_mock = mocker.patch("ahriman.application.application.Application.remove")
 

tests/ahriman/application/handlers/test_handler_report.py

@@ -6,11 +6,16 @@ from ahriman.application.handlers import Report
 from ahriman.core.configuration import Configuration
 
 
+def _default_args(args: argparse.Namespace) -> argparse.Namespace:
+    args.target = []
+    return args
+
+
 def test_run(args: argparse.Namespace, configuration: Configuration, mocker: MockerFixture) -> None:
     """
     must run command
     """
-    args.target = []
+    args = _default_args(args)
     mocker.patch("pathlib.Path.mkdir")
     application_mock = mocker.patch("ahriman.application.application.Application.report")
 

tests/ahriman/application/handlers/test_handler_setup.py

@@ -0,0 +1,145 @@
+import argparse
+
+from pathlib import Path
+from pytest_mock import MockerFixture
+from unittest import mock
+
+from ahriman.application.handlers import Setup
+from ahriman.core.configuration import Configuration
+from ahriman.models.repository_paths import RepositoryPaths
+
+
+def _default_args(args: argparse.Namespace) -> argparse.Namespace:
+    args.build_command = "ahriman"
+    args.from_config = "/usr/share/devtools/pacman-extra.conf"
+    args.no_multilib = False
+    args.packager = "John Doe <john@doe.com>"
+    args.repository = "aur-clone"
+    return args
+
+
+def test_run(args: argparse.Namespace, configuration: Configuration, mocker: MockerFixture) -> None:
+    """
+    must run command
+    """
+    args = _default_args(args)
+    mocker.patch("pathlib.Path.mkdir")
+    ahriman_configuration_mock = mocker.patch("ahriman.application.handlers.setup.Setup.create_ahriman_configuration")
+    devtools_configuration_mock = mocker.patch("ahriman.application.handlers.setup.Setup.create_devtools_configuration")
+    makepkg_configuration_mock = mocker.patch("ahriman.application.handlers.setup.Setup.create_makepkg_configuration")
+    sudo_configuration_mock = mocker.patch("ahriman.application.handlers.setup.Setup.create_sudo_configuration")
+    executable_mock = mocker.patch("ahriman.application.handlers.setup.Setup.create_executable")
+
+    Setup.run(args, "x86_64", configuration)
+    ahriman_configuration_mock.assert_called_once()
+    devtools_configuration_mock.assert_called_once()
+    makepkg_configuration_mock.assert_called_once()
+    sudo_configuration_mock.assert_called_once()
+    executable_mock.assert_called_once()
+
+
+def test_build_command(args: argparse.Namespace) -> None:
+    """
+    must generate correct build command name
+    """
+    args = _default_args(args)
+    assert Setup.build_command(args.build_command, "x86_64").name == f"{args.build_command}-x86_64-build"
+
+
+def test_create_ahriman_configuration(args: argparse.Namespace, configuration: Configuration,
+                                      mocker: MockerFixture) -> None:
+    """
+    must create configuration for the service
+    """
+    args = _default_args(args)
+    mocker.patch("pathlib.Path.open")
+    add_section_mock = mocker.patch("configparser.RawConfigParser.add_section")
+    set_mock = mocker.patch("configparser.RawConfigParser.set")
+    write_mock = mocker.patch("configparser.RawConfigParser.write")
+
+    command = Setup.build_command(args.build_command, "x86_64")
+    Setup.create_ahriman_configuration(args.build_command, "x86_64", args.repository, configuration.include)
+    add_section_mock.assert_has_calls([
+        mock.call("build"),
+        mock.call("repository"),
+    ])
+    set_mock.assert_has_calls([
+        mock.call("build", "build_command", str(command)),
+        mock.call("repository", "name", args.repository),
+    ])
+    write_mock.assert_called_once()
+
+
+def test_create_devtools_configuration(args: argparse.Namespace, repository_paths: RepositoryPaths,
+                                       mocker: MockerFixture) -> None:
+    """
+    must create configuration for the devtools
+    """
+    args = _default_args(args)
+    mocker.patch("pathlib.Path.open")
+    mocker.patch("configparser.RawConfigParser.set")
+    add_section_mock = mocker.patch("configparser.RawConfigParser.add_section")
+    write_mock = mocker.patch("configparser.RawConfigParser.write")
+
+    Setup.create_devtools_configuration(args.build_command, "x86_64", Path(args.from_config), args.no_multilib,
+                                        args.repository, repository_paths)
+    add_section_mock.assert_has_calls([
+        mock.call("multilib"),
+        mock.call(args.repository)
+    ])
+    write_mock.assert_called_once()
+
+
+def test_create_devtools_configuration_no_multilib(args: argparse.Namespace, repository_paths: RepositoryPaths,
+                                                   mocker: MockerFixture) -> None:
+    """
+    must create configuration for the devtools without multilib
+    """
+    args = _default_args(args)
+    mocker.patch("pathlib.Path.open")
+    mocker.patch("configparser.RawConfigParser.set")
+    add_section_mock = mocker.patch("configparser.RawConfigParser.add_section")
+    write_mock = mocker.patch("configparser.RawConfigParser.write")
+
+    Setup.create_devtools_configuration(args.build_command, "x86_64", Path(args.from_config), True,
+                                        args.repository, repository_paths)
+    add_section_mock.assert_called_once()
+    write_mock.assert_called_once()
+
+
+def test_create_makepkg_configuration(args: argparse.Namespace, repository_paths: RepositoryPaths,
+                                      mocker: MockerFixture) -> None:
+    """
+    must create makepkg configuration
+    """
+    args = _default_args(args)
+    write_text_mock = mocker.patch("pathlib.Path.write_text")
+
+    Setup.create_makepkg_configuration(args.packager, repository_paths)
+    write_text_mock.assert_called_once()
+
+
+def test_create_sudo_configuration(args: argparse.Namespace, mocker: MockerFixture) -> None:
+    """
+    must create sudo configuration
+    """
+    args = _default_args(args)
+    chmod_text_mock = mocker.patch("pathlib.Path.chmod")
+    write_text_mock = mocker.patch("pathlib.Path.write_text")
+
+    Setup.create_sudo_configuration(args.build_command, "x86_64")
+    chmod_text_mock.assert_called_with(0o400)
+    write_text_mock.assert_called_once()
+
+
+def test_create_executable(args: argparse.Namespace, mocker: MockerFixture) -> None:
+    """
+    must create executable
+    """
+    args = _default_args(args)
+    symlink_text_mock = mocker.patch("pathlib.Path.symlink_to")
+    unlink_text_mock = mocker.patch("pathlib.Path.unlink")
+
+    Setup.create_executable(args.build_command, "x86_64")
+    symlink_text_mock.assert_called_once()
+    unlink_text_mock.assert_called_once()

tests/ahriman/application/handlers/test_handler_sign.py

@@ -0,0 +1,23 @@
+import argparse
+
+from pytest_mock import MockerFixture
+
+from ahriman.application.handlers import Sign
+from ahriman.core.configuration import Configuration
+
+
+def _default_args(args: argparse.Namespace) -> argparse.Namespace:
+    args.package = []
+    return args
+
+
+def test_run(args: argparse.Namespace, configuration: Configuration, mocker: MockerFixture) -> None:
+    """
+    must run command
+    """
+    args = _default_args(args)
+    mocker.patch("pathlib.Path.mkdir")
+    application_mock = mocker.patch("ahriman.application.application.Application.sign")
+
+    Sign.run(args, "x86_64", configuration)
+    application_mock.assert_called_once()

tests/ahriman/application/handlers/test_handler_status.py

@@ -6,13 +6,17 @@ from ahriman.application.handlers import Status
 from ahriman.core.configuration import Configuration
 
 
+def _default_args(args: argparse.Namespace) -> argparse.Namespace:
+    args.ahriman = True
+    args.package = []
+    return args
+
+
 def test_run(args: argparse.Namespace, configuration: Configuration, mocker: MockerFixture) -> None:
     """
     must run command
     """
-    args.ahriman = True
-    args.package = []
-    args.without_dependencies = False
+    args = _default_args(args)
     mocker.patch("pathlib.Path.mkdir")
     application_mock = mocker.patch("ahriman.core.status.client.Client.get_self")
     packages_mock = mocker.patch("ahriman.core.status.client.Client.get")

tests/ahriman/application/handlers/test_handler_sync.py

@@ -6,11 +6,16 @@ from ahriman.application.handlers import Sync
 from ahriman.core.configuration import Configuration
 
 
+def _default_args(args: argparse.Namespace) -> argparse.Namespace:
+    args.target = []
+    return args
+
+
 def test_run(args: argparse.Namespace, configuration: Configuration, mocker: MockerFixture) -> None:
     """
     must run command
     """
-    args.target = []
+    args = _default_args(args)
     mocker.patch("pathlib.Path.mkdir")
     application_mock = mocker.patch("ahriman.application.application.Application.sync")
 

tests/ahriman/application/handlers/test_handler_update.py

@@ -6,15 +6,20 @@ from ahriman.application.handlers import Update
 from ahriman.core.configuration import Configuration
 
 
-def test_run(args: argparse.Namespace, configuration: Configuration, mocker: MockerFixture) -> None:
-    """
-    must run command
-    """
+def _default_args(args: argparse.Namespace) -> argparse.Namespace:
     args.package = []
     args.dry_run = False
     args.no_aur = False
     args.no_manual = False
     args.no_vcs = False
+    return args
+
+
+def test_run(args: argparse.Namespace, configuration: Configuration, mocker: MockerFixture) -> None:
+    """
+    must run command
+    """
+    args = _default_args(args)
     mocker.patch("pathlib.Path.mkdir")
     application_mock = mocker.patch("ahriman.application.application.Application.update")
     updates_mock = mocker.patch("ahriman.application.application.Application.get_updates")
@@ -28,11 +33,8 @@ def test_run_dry_run(args: argparse.Namespace, configuration: Configuration, moc
     """
     must run simplified command
     """
-    args.package = []
+    args = _default_args(args)
     args.dry_run = True
-    args.no_aur = False
-    args.no_manual = False
-    args.no_vcs = False
     mocker.patch("pathlib.Path.mkdir")
     updates_mock = mocker.patch("ahriman.application.application.Application.get_updates")
 

tests/ahriman/application/test_ahriman.py

@@ -26,6 +26,14 @@ def test_subparsers_check(parser: argparse.ArgumentParser) -> None:
     assert args.dry_run
 
 
+def test_subparsers_clean(parser: argparse.ArgumentParser) -> None:
+    """
+    clean command must imply unsafe
+    """
+    args = parser.parse_args(["-a", "x86_64", "clean"])
+    assert args.unsafe
+
+
 def test_subparsers_config(parser: argparse.ArgumentParser) -> None:
     """
     config command must imply lock, no_report and unsafe
@@ -36,6 +44,16 @@ def test_subparsers_config(parser: argparse.ArgumentParser) -> None:
     assert args.unsafe
 
 
+def test_subparsers_setup(parser: argparse.ArgumentParser) -> None:
+    """
+    setup command must imply lock, no_report and unsafe
+    """
+    args = parser.parse_args(["-a", "x86_64", "setup", "--packager", "John Doe <john@doe.com>"])
+    assert args.lock is None
+    assert args.no_report
+    assert args.unsafe
+
+
 def test_subparsers_status(parser: argparse.ArgumentParser) -> None:
     """
     status command must imply lock, no_report and unsafe

tests/ahriman/application/test_application.py

@@ -1,3 +1,5 @@
+import pytest
+
 from pytest_mock import MockerFixture
 from unittest import mock
 
@@ -205,16 +207,57 @@ def test_report(application: Application, mocker: MockerFixture) -> None:
     must generate report
     """
     executor_mock = mocker.patch("ahriman.core.repository.executor.Executor.process_report")
-    application.report(None)
+    application.report([])
     executor_mock.assert_called_once()
 
 
+def test_sign(application: Application, package_ahriman: Package, package_python_schedule: Package,
+              mocker: MockerFixture) -> None:
+    """
+    must sign world
+    """
+    mocker.patch("ahriman.core.repository.repository.Repository.packages",
+                 return_value=[package_ahriman, package_python_schedule])
+    copy_mock = mocker.patch("shutil.copy")
+    update_mock = mocker.patch("ahriman.application.application.Application.update")
+    sign_repository_mock = mocker.patch("ahriman.core.sign.gpg.GPG.sign_repository")
+    finalize_mock = mocker.patch("ahriman.application.application.Application._finalize")
+
+    application.sign([])
+    copy_mock.assert_has_calls([
+        mock.call(pytest.helpers.anyvar(str), pytest.helpers.anyvar(str)),
+        mock.call(pytest.helpers.anyvar(str), pytest.helpers.anyvar(str))
+    ])
+    update_mock.assert_called_with([])
+    sign_repository_mock.assert_called_once()
+    finalize_mock.assert_called_once()
+
+
+def test_sign_specific(application: Application, package_ahriman: Package, package_python_schedule: Package,
+                       mocker: MockerFixture) -> None:
+    """
+    must sign only specified packages
+    """
+    mocker.patch("ahriman.core.repository.repository.Repository.packages",
+                 return_value=[package_ahriman, package_python_schedule])
+    copy_mock = mocker.patch("shutil.copy")
+    update_mock = mocker.patch("ahriman.application.application.Application.update")
+    sign_repository_mock = mocker.patch("ahriman.core.sign.gpg.GPG.sign_repository")
+    finalize_mock = mocker.patch("ahriman.application.application.Application._finalize")
+
+    application.sign([package_ahriman.base])
+    copy_mock.assert_called_once()
+    update_mock.assert_called_with([])
+    sign_repository_mock.assert_called_once()
+    finalize_mock.assert_called_once()
+
+
 def test_sync(application: Application, mocker: MockerFixture) -> None:
     """
     must sync to remote
     """
     executor_mock = mocker.patch("ahriman.core.repository.executor.Executor.process_sync")
-    application.sync(None)
+    application.sync([])
     executor_mock.assert_called_once()
 
 

tests/testresources/core/ahriman.ini

@@ -1,4 +1,5 @@
 [settings]
+include = .
 logging = logging.ini
 
 [alpm]