Release 2.9.0

This migration includes
* removal of community repository as it is no more
* fixed paths for devtools configurations
* migration of archlinux packaging git url

.bandit-test.yml

@@ -1 +1 @@
-skips: ['B101', 'B105', 'B106', 'B404']
+skips: ['B101', 'B104', 'B105', 'B106', 'B404']

.github/ISSUE_TEMPLATE/02-security-report.md

@@ -0,0 +1,20 @@
+---
+name: Security report
+about: Create a report related to security issues
+title: ''
+labels: security
+assignees: ''
+
+---
+
+## Summary
+
+A clear and concise description of what the issue is.
+
+### Steps to reproduce
+
+Steps to reproduce the behavior (commands, environment etc).
+
+### Intended impact
+
+Brief optional description of how this vulnerability can be used and which effects can be achieved. 

.github/workflows/setup.sh

@@ -10,7 +10,7 @@ echo -e '[arcanisrepo]\nServer = http://repo.arcanis.me/$arch\nSigLevel = Never'
 # refresh the image
 pacman --noconfirm -Syu
 # main dependencies
-pacman --noconfirm -Sy base-devel devtools git pyalpm python-aur python-passlib python-setuptools python-srcinfo sudo
+pacman --noconfirm -Sy base-devel devtools git pyalpm python-cerberus python-inflection python-passlib python-requests python-srcinfo sudo
 # make dependencies
 pacman --noconfirm -Sy python-build python-installer python-wheel
 # optional dependencies
@@ -18,7 +18,7 @@ if [[ -z $MINIMAL_INSTALL ]]; then
     # VCS support
     pacman --noconfirm -Sy breezy darcs mercurial subversion
     # web server
-    pacman --noconfirm -Sy python-aioauth-client python-aiohttp python-aiohttp-debugtoolbar python-aiohttp-jinja2 python-aiohttp-security python-aiohttp-session python-cryptography python-jinja
+    pacman --noconfirm -Sy python-aioauth-client python-aiohttp python-aiohttp-apispec-git python-aiohttp-cors python-aiohttp-debugtoolbar python-aiohttp-jinja2 python-aiohttp-security python-aiohttp-session python-cryptography python-jinja
     # additional features
     pacman --noconfirm -Sy gnupg python-boto3 rsync
 fi
@@ -38,7 +38,9 @@ systemd-machine-id-setup
 sed -i "s/handlers = syslog_handler/handlers = console_handler/g" /etc/ahriman.ini.d/logging.ini
 # initial setup command as root
 [[ -z $MINIMAL_INSTALL ]] && WEB_ARGS=("--web-port" "8080")
-ahriman -a x86_64 repo-setup --packager "ahriman bot <ahriman@example.com>" --repository "github" "${WEB_ARGS[@]}"
+ahriman -a x86_64 service-setup --packager "ahriman bot <ahriman@example.com>" --repository "github" "${WEB_ARGS[@]}"
+# validate configuration
+ahriman -a x86_64 service-config-validate --exit-code
 # enable services
 systemctl enable ahriman-web@x86_64
 systemctl enable ahriman@x86_64.timer
@@ -52,7 +54,7 @@ fi
 # the build itself does not really work in the container
 sudo -u ahriman -- ahriman package-add --now yay
 # check if package was actually installed
-#test -n "$(find "/var/lib/ahriman/repository/x86_64" -name "yay*pkg*")"
+test -n "$(find "/var/lib/ahriman/repository/x86_64" -name "yay*pkg*")"
 # run package check
 sudo -u ahriman -- ahriman repo-update
 # stop web service lol

.github/workflows/tests.sh

@@ -4,7 +4,7 @@
 set -ex
 
 # install dependencies
-pacman --noconfirm -Syu base-devel python-pip python-setuptools python-tox
+pacman --noconfirm -Syu base-devel python-setuptools python-tox
 
 # run test and check targets
 make check tests

.pylintrc

@@ -533,5 +533,5 @@ valid-metaclass-classmethod-first-arg=cls
 
 # Exceptions that will emit a warning when being caught. Defaults to
 # "BaseException, Exception".
-overgeneral-exceptions=BaseException,
-                       Exception
+overgeneral-exceptions=builtins.BaseException,
+                       builtins.Exception

.readthedocs.yaml

@@ -1,6 +1,7 @@
 version: 2
 
-formats: all
+formats:
+  - pdf
 
 build:
   os: ubuntu-20.04
@@ -10,6 +11,7 @@ build:
 sphinx:
   builder: html
   configuration: docs/conf.py
+  fail_on_warning: true
 
 python:
   install:
@@ -17,4 +19,6 @@ python:
       path: .
       extra_requirements:
         - docs
+        - s3
+        - web
   system_packages: true

AUTHORS

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

CONTRIBUTING.md

@@ -26,7 +26,103 @@ In order to resolve all difficult cases the `autopep8` is used. You can perform
 Again, the most checks can be performed by `make check` command, though some additional guidelines must be applied:
 
 * Every class, every function (including private and protected), every attribute must be documented. The project follows [Google style documentation](https://google.github.io/styleguide/pyguide.html). The only exception is local functions.
-* Type annotations are the must, even for local functions.
+* Correct way to document function, if section is empty, e.g. no notes or there are no args, it should be omitted:
+
+    ```python
+    def foo(argument: str, *, flag: bool = False) -> int:
+        """
+        do foo. With very very very long
+        docstring
+  
+        Note:
+            Very important note about this function
+  
+        Args:
+            argument(str): an argument. This argument has
+                long description also
+            flag(bool, optional): a flag (Default value = False)
+  
+        Returns:
+            int: result
+  
+        Raises:
+            RuntimeException: a local function error occurs
+  
+        Examples:
+            Very informative example how to use this function, e.g.::
+  
+                >>> foo("argument", flag=False)
+  
+            Note that function documentation is in rST.
+        """
+    ```
+  
+  `Returns` should be replaced with `Yields` for generators.
+
+  Class attributes should be documented in the following way:
+
+    ```python
+    class Clazz(BaseClazz):
+        """
+        brand-new implementation of ``BaseClazz``
+  
+        Attributes:
+            CLAZZ_ATTRIBUTE(int): (class attribute) a brand-new class attribute
+            instance_attribute(str): an instance attribute
+  
+        Examples:
+            Very informative class usage example, e.g.::
+  
+                >>> from module import Clazz
+                >>> clazz = Clazz()
+        """
+  
+        CLAZZ_ATTRIBUTE = 42
+  
+        def __init__(self, *args: Any, **kwargs: Any) -> None:
+            """
+            default constructor
+  
+            Args:
+                *args(Any): positional arguments
+                **kwargs(Any): keyword arguments 
+            """
+            self.instance_attribute = ""
+    ```
+
+* Type annotations are the must, even for local functions. For the function argument `self` (for instance methods) and `cls` (for class methods) should not be annotated.
+* For collection types built-in classes must be used if possible (e.g. `dict` instead of `typing.Dict`, `tuple` instead of `typing.Tuple`). In case if built-in type is not available, but `collections.abc` provides interface, it must be used (e.g. `collections.abc.Awaitable` instead of `typing.Awaitable`, `collections.abc.Iterable` instead of `typing.Iterable`). For union classes, the bar operator (`|`) must be used (e.g. `float | int` instead of `typing.Union[float, int]`), which also includes `typinng.Optional` (e.g. `str | None` instead of `Optional[str]`).
+* `classmethod` should always return `Self`. In case of mypy warning (e.g. if there is a branch in which function doesn't return the instance of `cls`) consider using `staticmethod` instead.
+* Recommended order of function definitions in class:
+
+    ```python
+    class Clazz:
+  
+        def __init__(self) -> None: ...  # replace with `__post_init__` for dataclasses
+
+        @property
+        def property(self) -> Any: ...
+
+        @classmethod
+        def class_method(cls) -> Self: ...
+
+        @staticmethod
+        def static_method() -> Any: ...
+
+        def __private_method(self) -> Any: ...
+
+        def _protected_method(self) -> Any: ...
+
+        def usual_method(self) -> Any: ...
+
+        def __hash__(self) -> int: ...  # basically any magic (or look-alike) method
+    ```
+  
+  Methods inside one group should be ordered alphabetically, the only exception is `__init__` method (`__post__init__` for dataclasses) which should be defined first. For test methods it is recommended to follow the order in which functions are defined.
+
+  Though, we would like to highlight abstract methods (i.e. ones which raise `NotImplementedError`), we still keep in global order at the moment.
+
+* Abstract methods must raise `NotImplementedError` instead of using `abc.abstractmethod`. The reason behind this restriction is the fact that we have class/static abstract methods for those we need to define their attribute first making the code harder to read.
 * For any path interactions `pathlib.Path` must be used.
 * Configuration interactions must go through `ahriman.core.configuration.Configuration` class instance.
 * In case if class load requires some actions, it is recommended to create class method which can be used for class instantiating.
@@ -59,9 +155,55 @@ Again, the most checks can be performed by `make check` command, though some add
 * One file should define only one class, exception is class satellites in case if file length remains less than 400 lines.
 * It is possible to create file which contains some functions (e.g. `ahriman.core.util`), but in this case you would need to define `__all__` attribute.
 * The file size mentioned above must be applicable in general. In case of big classes consider splitting them into traits. Note, however, that `pylint` includes comments and docstrings into counter, thus you need to check file size by other tools.
-* No global variable is allowed outside of `ahriman.version` module.
+* No global variable is allowed outside of `ahriman.version` module. `ahriman.core.context` is also special case.
 * Single quotes are not allowed. The reason behind this restriction is the fact that docstrings must be written by using double quotes only, and we would like to make style consistent.
-* If your class writes anything to log, the `ahriman.core.lazy_logging.LazyLogging` trait must be used.
+* If your class writes anything to log, the `ahriman.core.log.LazyLogging` trait must be used.
+* Web API methods must be documented by using `aiohttp_apispec` library. Schema testing mostly should be implemented in related view class tests. Recommended example for documentation (excluding comments):
+
+    ```python
+    import aiohttp_apispec
+
+    from marshmallow import Schema, fields  
+
+    from ahriman.web.schemas.auth_schema import AuthSchema
+    from ahriman.web.schemas.error_schema import ErrorSchema
+    from ahriman.web.schemas.package_name_schema import PackageNameSchema
+    from ahriman.web.views.base import BaseView
+
+
+    class RequestSchema(Schema):
+
+        field = fields.String(metadata={"description": "Field description", "example": "foo"})
+
+
+    class ResponseSchema(Schema):
+
+        field = fields.String(required=True, metadata={"description": "Field description"})
+
+
+    class Foo(BaseView):
+
+        POST_PERMISSION = ...
+
+        @aiohttp_apispec.docs(
+            tags=["Tag"],
+            summary="Do foo",
+            description="Extended description of the method which does foo",
+            responses={
+                200: {"description": "Success response", "schema": ResponseSchema},
+                204: {"description": "Success response"},  # example without json schema response
+                400: {"description": "Bad data is supplied", "schema": ErrorSchema},  # exception raised by this method
+                401: {"description": "Authorization required", "schema": ErrorSchema},  # should be always presented
+                403: {"description": "Access is forbidden", "schema": ErrorSchema},  # should be always presented
+                500: {"description": "Internal server error", "schema": ErrorSchema},  # should be always presented
+            },
+            security=[{"token": [POST_PERMISSION]}],
+        )
+        @aiohttp_apispec.cookies_schema(AuthSchema)  # should be always presented
+        @aiohttp_apispec.match_info_schema(PackageNameSchema)
+        @aiohttp_apispec.json_schema(RequestSchema(many=True))
+        async def post(self) -> None: ...
+    ```
 
 ### Other checks
 

Dockerfile

@@ -5,12 +5,16 @@ ENV AHRIMAN_ARCHITECTURE="x86_64"
 ENV AHRIMAN_DEBUG=""
 ENV AHRIMAN_FORCE_ROOT=""
 ENV AHRIMAN_HOST="0.0.0.0"
+ENV AHRIMAN_MULTILIB="yes"
 ENV AHRIMAN_OUTPUT="syslog"
 ENV AHRIMAN_PACKAGER="ahriman bot <ahriman@example.com>"
+ENV AHRIMAN_PACMAN_MIRROR=""
 ENV AHRIMAN_PORT=""
 ENV AHRIMAN_REPOSITORY="aur-clone"
 ENV AHRIMAN_REPOSITORY_ROOT="/var/lib/ahriman/ahriman"
+ENV AHRIMAN_UNIX_SOCKET=""
 ENV AHRIMAN_USER="ahriman"
+ENV AHRIMAN_VALIDATE_CONFIGURATION="yes"
 
 # install environment
 ## update pacman.conf with multilib
@@ -24,11 +28,11 @@ RUN useradd -m -d "/home/build" -s "/usr/bin/nologin" build && \
 COPY "docker/install-aur-package.sh" "/usr/local/bin/install-aur-package"
 ## install package dependencies
 ## darcs is not installed by reasons, because it requires a lot haskell packages which dramatically increase image size
-RUN pacman --noconfirm -Sy devtools git pyalpm python-inflection python-passlib python-requests python-setuptools python-srcinfo && \
+RUN pacman --noconfirm -Sy devtools git pyalpm python-cerberus python-inflection python-passlib python-requests python-srcinfo && \
     pacman --noconfirm -Sy python-build python-installer python-wheel && \
-    pacman --noconfirm -Sy breezy mercurial python-aiohttp python-boto3 python-cryptography python-jinja rsync subversion && \
-    runuser -u build -- install-aur-package python-aioauth-client python-aiohttp-jinja2 python-aiohttp-debugtoolbar \
-                                            python-aiohttp-session python-aiohttp-security
+    pacman --noconfirm -Sy breezy mercurial python-aiohttp python-aiohttp-cors python-boto3 python-cryptography python-jinja python-requests-unixsocket rsync subversion && \
+    runuser -u build -- install-aur-package python-aioauth-client python-aiohttp-apispec-git python-aiohttp-jinja2  \
+                                            python-aiohttp-debugtoolbar python-aiohttp-session python-aiohttp-security
 
 # cleanup unused
 RUN find "/var/cache/pacman/pkg" -type f -delete
@@ -50,4 +54,4 @@ VOLUME ["/var/lib/ahriman"]
 COPY "docker/entrypoint.sh" "/usr/local/bin/entrypoint"
 ENTRYPOINT ["entrypoint"]
 # default command
-CMD ["repo-update"]
+CMD ["repo-update", "--refresh"]

Makefile

@@ -3,7 +3,7 @@
 
 PROJECT := ahriman
 
-FILES := AUTHORS CONTRIBUTING.md COPYING README.md docs package src setup.py tox.ini web.png
+FILES := AUTHORS CONTRIBUTING.md COPYING Makefile README.md SECURITY.md docs package src setup.py tox.ini web.png
 TARGET_FILES := $(addprefix $(PROJECT)/, $(FILES))
 IGNORE_FILES := package/archlinux src/.mypy_cache
 
@@ -38,7 +38,7 @@ html: specification
 	tox -e docs-html
 
 push: specification archlinux
-	git add package/archlinux/PKGBUILD src/ahriman/version.py docs/ahriman-architecture.svg docs/ahriman.1
+	git add package/archlinux/PKGBUILD src/ahriman/version.py docs/ahriman-architecture.svg docs/ahriman.1 docs/completions/
 	git commit -m "Release $(VERSION)"
 	git tag "$(VERSION)"
 	git push

README.md

@@ -33,3 +33,9 @@ Every available option is described in the [documentation](https://ahriman.readt
 The application provides reasonable defaults which allow to use it out-of-box; however additional steps (like configuring build toolchain and sudoers) are recommended and can be easily achieved by following install instructions.
 
 ## [FAQ](https://ahriman.readthedocs.io/en/latest/faq.html)
+
+## Live demos
+
+* [Build status page](https://ahriman-demo.arcanis.me). You can log in as `demo` user by using `demo` password. However, you will not be able to run tasks. [HTTP API documentation](https://ahriman-demo.arcanis.me/api-docs) is also available.
+* [Repository index](http://repo.arcanis.me/x86_64/index.html).
+* [Telegram feed](https://t.me/arcanisrepo).

SECURITY.md

@@ -0,0 +1,9 @@
+# Security Policy
+
+## Supported Versions
+
+The project follows bleeding edge philosophy, thus only the latest version is supported with the exception for release candidates (i.e. tags which are marked with `rc` suffix).
+
+## Reporting a Vulnerability
+
+In the most cases you can report (suspected) security vulnerabilities directly on github by using ["Security report" template](https://github.com/arcan1s/ahriman/issues/new?assignees=&labels=security&template=02-security-report.md&title=). However, if your report could lead to data leak or break the system we kindly ask you to contact [current maintainer](AUTHORS) directly by email.

docker/entrypoint.sh

@@ -4,9 +4,17 @@ set -e
 [ -n "$AHRIMAN_DEBUG" ] && set -x
 
 # configuration tune
-sed -i "s|root = /var/lib/ahriman|root = $AHRIMAN_REPOSITORY_ROOT|g" "/etc/ahriman.ini"
-sed -i "s|database = /var/lib/ahriman/ahriman.db|database = $AHRIMAN_REPOSITORY_ROOT/ahriman.db|g" "/etc/ahriman.ini"
-sed -i "s|host = 127.0.0.1|host = $AHRIMAN_HOST|g" "/etc/ahriman.ini"
+cat <<EOF > "/etc/ahriman.ini.d/00-docker.ini"
+[repository]
+root = $AHRIMAN_REPOSITORY_ROOT
+
+[settings]
+database = $AHRIMAN_REPOSITORY_ROOT/ahriman.db
+
+[web]
+host = $AHRIMAN_HOST
+
+EOF
 sed -i "s|handlers = syslog_handler|handlers = ${AHRIMAN_OUTPUT}_handler|g" "/etc/ahriman.ini.d/logging.ini"
 
 AHRIMAN_DEFAULT_ARGS=("--architecture" "$AHRIMAN_ARCHITECTURE")
@@ -22,18 +30,32 @@ fi
 [ -d "$AHRIMAN_REPOSITORY_ROOT" ] || mkdir "$AHRIMAN_REPOSITORY_ROOT"
 chown "$AHRIMAN_USER":"$AHRIMAN_USER" "$AHRIMAN_REPOSITORY_ROOT"
 
+# create .gnupg directory which is required for keys
+AHRIMAN_GNUPG_HOME="$(getent passwd "$AHRIMAN_USER" | cut -d : -f 6)/.gnupg"
+[ -d "$AHRIMAN_GNUPG_HOME" ] || mkdir -m700 "$AHRIMAN_GNUPG_HOME"
+chown "$AHRIMAN_USER":"$AHRIMAN_USER" "$AHRIMAN_GNUPG_HOME"
+
 # run built-in setup command
 AHRIMAN_SETUP_ARGS=("--build-as-user" "$AHRIMAN_USER")
 AHRIMAN_SETUP_ARGS+=("--packager" "$AHRIMAN_PACKAGER")
 AHRIMAN_SETUP_ARGS+=("--repository" "$AHRIMAN_REPOSITORY")
+if [ -z "$AHRIMAN_MULTILIB" ]; then
+    AHRIMAN_SETUP_ARGS+=("--no-multilib")
+fi
+if [ -n "$AHRIMAN_PACMAN_MIRROR" ]; then
+    AHRIMAN_SETUP_ARGS+=("--mirror" "$AHRIMAN_PACMAN_MIRROR")
+fi
 if [ -n "$AHRIMAN_PORT" ]; then
-    # in addition it must be handled in docker run command
     AHRIMAN_SETUP_ARGS+=("--web-port" "$AHRIMAN_PORT")
 fi
-ahriman "${AHRIMAN_DEFAULT_ARGS[@]}" repo-setup "${AHRIMAN_SETUP_ARGS[@]}"
+if [ -n "$AHRIMAN_UNIX_SOCKET" ]; then
+    AHRIMAN_SETUP_ARGS+=("--web-unix-socket" "$AHRIMAN_UNIX_SOCKET")
+fi
+ahriman "${AHRIMAN_DEFAULT_ARGS[@]}" service-setup "${AHRIMAN_SETUP_ARGS[@]}"
+
+# validate configuration if set
+[ -n "$AHRIMAN_VALIDATE_CONFIGURATION" ] && ahriman "${AHRIMAN_DEFAULT_ARGS[@]}" service-config-validate --exit-code
 
-# refresh database
-pacman -Syy &> /dev/null
 # create machine-id which is required by build tools
 systemd-machine-id-setup &> /dev/null
 

docs/advanced-usage.rst

@@ -11,8 +11,8 @@ Depending on the goal the package can be used in different ways. Nevertheless, i
    from ahriman.core.database import SQLite
 
    architecture = "x86_64"
-   configuration = Configuration.from_path(Path("/etc/ahriman.ini"), architecture, quiet=False)
-   sqlite = SQLite.load(configuration)
+   configuration = Configuration.from_path(Path("/etc/ahriman.ini"), architecture)
+   database = SQLite.load(configuration)
 
 At this point there are ``configuration`` and ``database`` instances which can be used later at any time anywhere, e.g.
 
@@ -27,7 +27,7 @@ Almost all actions are wrapped by ``ahriman.core.repository.Repository`` class
 
    from ahriman.core.repository import Repository
 
-   repository = Repository(architecture, configuration, database, no_report=False, unsafe=False)
+   repository = Repository(architecture, configuration, database, report=True, unsafe=False)
 
 And the ``repository`` instance can be used to perform repository maintenance
 
@@ -37,6 +37,6 @@ And the ``repository`` instance can be used to perform repository maintenance
    built_packages = repository.packages_built()
    update_result = repository.process_update(built_packages)
 
-   repository.process_triggers(update_result)
+   repository.triggers.on_result(update_result, repository.packages())
 
 For the more info please refer to the classes documentation.

docs/ahriman.1

@@ -1,16 +1,16 @@
-.TH AHRIMAN "1" "2022\-11\-14" "ahriman" "Generated Python Manual"
+.TH AHRIMAN "1" "2023\-05\-22" "ahriman" "Generated Python Manual"
 .SH NAME
 ahriman
 .SH SYNOPSIS
 .B ahriman
-[-h] [-a ARCHITECTURE] [-c CONFIGURATION] [--force] [-l LOCK] [--report | --no-report] [-q] [--unsafe] [-V] {aur-search,search,daemon,help,help-commands-unsafe,key-import,package-add,add,package-update,package-remove,remove,package-status,status,package-status-remove,package-status-update,status-update,patch-add,patch-list,patch-remove,patch-set-add,repo-backup,repo-check,check,repo-clean,clean,repo-config,config,repo-rebuild,rebuild,repo-remove-unknown,remove-unknown,repo-report,report,repo-restore,repo-setup,init,repo-init,setup,repo-sign,sign,repo-status-update,repo-sync,sync,repo-triggers,repo-update,update,shell,user-add,user-list,user-remove,version,web} ...
+[-h] [-a ARCHITECTURE] [-c CONFIGURATION] [--force] [-l LOCK] [--report | --no-report] [-q] [--unsafe] [-V] {aur-search,search,help,help-commands-unsafe,help-updates,help-version,version,package-add,add,package-update,package-remove,remove,package-status,status,package-status-remove,package-status-update,status-update,patch-add,patch-list,patch-remove,patch-set-add,repo-backup,repo-check,check,repo-daemon,daemon,repo-rebuild,rebuild,repo-remove-unknown,remove-unknown,repo-report,report,repo-restore,repo-sign,sign,repo-status-update,repo-sync,sync,repo-tree,repo-triggers,repo-update,update,service-clean,clean,repo-clean,service-config,config,repo-config,service-config-validate,config-validate,repo-config-validate,service-key-import,key-import,service-setup,init,repo-init,repo-setup,setup,service-shell,shell,user-add,user-list,user-remove,web} ...
 .SH DESCRIPTION
 ArcH linux ReposItory MANager
 
 .SH OPTIONS
 .TP
 \fB\-a\fR \fI\,ARCHITECTURE\/\fR, \fB\-\-architecture\fR \fI\,ARCHITECTURE\/\fR
-target architectures (can be used multiple times)
+target architectures. For several subcommands it can be used multiple times
 
 .TP
 \fB\-c\fR \fI\,CONFIGURATION\/\fR, \fB\-\-configuration\fR \fI\,CONFIGURATION\/\fR
@@ -26,7 +26,7 @@ lock file
 
 .TP
 \fB\-\-report\fR, \fB\-\-no\-report\fR
-force enable or disable reporting to web service (default: True)
+force enable or disable reporting to web service
 
 .TP
 \fB\-q\fR, \fB\-\-quiet\fR
@@ -46,17 +46,17 @@ COMMAND
 \fBahriman\fR \fI\,aur\-search\/\fR
 search for package
 .TP
-\fBahriman\fR \fI\,daemon\/\fR
-run application as daemon
-.TP
 \fBahriman\fR \fI\,help\/\fR
 show help message
 .TP
 \fBahriman\fR \fI\,help\-commands\-unsafe\/\fR
 list unsafe commands
 .TP
-\fBahriman\fR \fI\,key\-import\/\fR
-import PGP key
+\fBahriman\fR \fI\,help\-updates\/\fR
+check for service updates
+.TP
+\fBahriman\fR \fI\,help\-version\/\fR
+application version
 .TP
 \fBahriman\fR \fI\,package\-add\/\fR
 add package
@@ -91,11 +91,8 @@ backup repository data
 \fBahriman\fR \fI\,repo\-check\/\fR
 check for updates
 .TP
-\fBahriman\fR \fI\,repo\-clean\/\fR
-clean local caches
-.TP
-\fBahriman\fR \fI\,repo\-config\/\fR
-dump configuration
+\fBahriman\fR \fI\,repo\-daemon\/\fR
+run application as daemon
 .TP
 \fBahriman\fR \fI\,repo\-rebuild\/\fR
 rebuild repository
@@ -109,9 +106,6 @@ generate report
 \fBahriman\fR \fI\,repo\-restore\/\fR
 restore repository data
 .TP
-\fBahriman\fR \fI\,repo\-setup\/\fR
-initial service configuration
-.TP
 \fBahriman\fR \fI\,repo\-sign\/\fR
 sign packages
 .TP
@@ -121,14 +115,32 @@ update repository status
 \fBahriman\fR \fI\,repo\-sync\/\fR
 sync repository
 .TP
+\fBahriman\fR \fI\,repo\-tree\/\fR
+dump repository tree
+.TP
 \fBahriman\fR \fI\,repo\-triggers\/\fR
 run triggers
 .TP
 \fBahriman\fR \fI\,repo\-update\/\fR
 update packages
 .TP
-\fBahriman\fR \fI\,shell\/\fR
-envoke python shell
+\fBahriman\fR \fI\,service\-clean\/\fR
+clean local caches
+.TP
+\fBahriman\fR \fI\,service\-config\/\fR
+dump configuration
+.TP
+\fBahriman\fR \fI\,service\-config\-validate\/\fR
+validate system configuration
+.TP
+\fBahriman\fR \fI\,service\-key\-import\/\fR
+import PGP key
+.TP
+\fBahriman\fR \fI\,service\-setup\/\fR
+initial service configuration
+.TP
+\fBahriman\fR \fI\,service\-shell\/\fR
+invoke python shell
 .TP
 \fBahriman\fR \fI\,user\-add\/\fR
 create or update user
@@ -139,15 +151,12 @@ user known users and their access
 \fBahriman\fR \fI\,user\-remove\/\fR
 remove user
 .TP
-\fBahriman\fR \fI\,version\/\fR
-application version
-.TP
 \fBahriman\fR \fI\,web\/\fR
 web server
 
 .SH COMMAND \fI\,'ahriman aur\-search'\/\fR
 usage: ahriman aur\-search [\-h] [\-e] [\-\-info | \-\-no\-info]
-                          [\-\-sort\-by {description,first_submitted,id,last_modified,maintainer,name,num_votes,out_of_date,package_base,package_base_id,popularity,repository,url,url_path,version}]
+                          [\-\-sort\-by {description,first_submitted,id,last_modified,maintainer,name,num_votes,out_of_date,package_base,package_base_id,popularity,repository,submitter,url,url_path,version}]
                           search [search ...]
 
 search for package in AUR using API
@@ -163,44 +172,13 @@ return non\-zero exit status if result is empty
 
 .TP
 \fB\-\-info\fR, \fB\-\-no\-info\fR
-show additional package information (default: False)
+show additional package information
 
 .TP
-\fB\-\-sort\-by\fR \fI\,{description,first_submitted,id,last_modified,maintainer,name,num_votes,out_of_date,package_base,package_base_id,popularity,repository,url,url_path,version}\/\fR
+\fB\-\-sort\-by\fR \fI\,{description,first_submitted,id,last_modified,maintainer,name,num_votes,out_of_date,package_base,package_base_id,popularity,repository,submitter,url,url_path,version}\/\fR
 sort field by this field. In case if two packages have the same value of the specified field, they will be always sorted
 by name
 
-.SH COMMAND \fI\,'ahriman daemon'\/\fR
-usage: ahriman daemon [\-h] [\-i INTERVAL] [\-\-aur | \-\-no\-aur] [\-\-local | \-\-no\-local] [\-\-manual | \-\-no\-manual]
-                      [\-\-vcs | \-\-no\-vcs] [\-y]
-
-start process which periodically will run update process
-
-.SH OPTIONS \fI\,'ahriman daemon'\/\fR
-.TP
-\fB\-i\fR \fI\,INTERVAL\/\fR, \fB\-\-interval\fR \fI\,INTERVAL\/\fR
-interval between runs in seconds
-
-.TP
-\fB\-\-aur\fR, \fB\-\-no\-aur\fR
-enable or disable checking for AUR updates. Implies \-\-no\-vcs (default: True)
-
-.TP
-\fB\-\-local\fR, \fB\-\-no\-local\fR
-enable or disable checking of local packages for updates (default: True)
-
-.TP
-\fB\-\-manual\fR, \fB\-\-no\-manual\fR
-include or exclude manual updates (default: True)
-
-.TP
-\fB\-\-vcs\fR, \fB\-\-no\-vcs\fR
-enable or disable checking of VCS packages (default: True)
-
-.TP
-\fB\-y\fR, \fB\-\-refresh\fR
-download fresh package databases from the mirror before actions, \-yy to force refresh even if up to date
-
 .SH COMMAND \fI\,'ahriman help'\/\fR
 usage: ahriman help [\-h] [command]
 
@@ -221,23 +199,24 @@ list unsafe commands as defined in default args
 instead of showing commands, just test command line for unsafe subcommand and return 0 in case if command is safe and 1
 otherwise
 
-.SH COMMAND \fI\,'ahriman key\-import'\/\fR
-usage: ahriman key\-import [\-h] [\-\-key\-server KEY_SERVER] key
+.SH COMMAND \fI\,'ahriman help\-updates'\/\fR
+usage: ahriman help\-updates [\-h] [\-e]
 
-import PGP key from public sources to the repository user
+request AUR for current version and compare with current service version
 
+.SH OPTIONS \fI\,'ahriman help\-updates'\/\fR
 .TP
-\fBkey\fR
-PGP key to import from public server
+\fB\-e\fR, \fB\-\-exit\-code\fR
+return non\-zero exit code if updates available
 
-.SH OPTIONS \fI\,'ahriman key\-import'\/\fR
-.TP
-\fB\-\-key\-server\fR \fI\,KEY_SERVER\/\fR
-key server for key import
+.SH COMMAND \fI\,'ahriman help\-version'\/\fR
+usage: ahriman help\-version [\-h]
+
+print application and its dependencies versions
 
 .SH COMMAND \fI\,'ahriman package\-add'\/\fR
-usage: ahriman package\-add [\-h] [\-e] [\-n] [\-y] [\-s {auto,archive,aur,directory,local,remote,repository}]
-                           [\-\-without\-dependencies]
+usage: ahriman package\-add [\-h] [\-\-dependencies | \-\-no\-dependencies] [\-e] [\-n] [\-y]
+                           [\-s {auto,archive,aur,directory,local,remote,repository}]
                            package [package ...]
 
 add existing or new package to the build queue
@@ -247,6 +226,10 @@ add existing or new package to the build queue
 package source (base name, path to local files, remote URL)
 
 .SH OPTIONS \fI\,'ahriman package\-add'\/\fR
+.TP
+\fB\-\-dependencies\fR, \fB\-\-no\-dependencies\fR
+process missing package dependencies
+
 .TP
 \fB\-e\fR, \fB\-\-exit\-code\fR
 return non\-zero exit status if result is empty
@@ -263,10 +246,6 @@ download fresh package databases from the mirror before actions, \-yy to force r
 \fB\-s\fR \fI\,{auto,archive,aur,directory,local,remote,repository}\/\fR, \fB\-\-source\fR \fI\,{auto,archive,aur,directory,local,remote,repository}\/\fR
 explicitly specify the package source for this command
 
-.TP
-\fB\-\-without\-dependencies\fR
-do not add dependencies
-
 .SH COMMAND \fI\,'ahriman package\-remove'\/\fR
 usage: ahriman package\-remove [\-h] package [package ...]
 
@@ -277,7 +256,8 @@ remove package from the repository
 package name or base
 
 .SH COMMAND \fI\,'ahriman package\-status'\/\fR
-usage: ahriman package\-status [\-h] [\-\-ahriman] [\-e] [\-i] [\-s {unknown,pending,building,failed,success}] [package ...]
+usage: ahriman package\-status [\-h] [\-\-ahriman] [\-e] [\-\-info | \-\-no\-info] [\-s {unknown,pending,building,failed,success}]
+                              [package ...]
 
 request status of the package
 
@@ -295,7 +275,7 @@ get service status itself
 return non\-zero exit status if result is empty
 
 .TP
-\fB\-i\fR, \fB\-\-info\fR
+\fB\-\-info\fR, \fB\-\-no\-info\fR
 show additional package information
 
 .TP
@@ -414,43 +394,46 @@ return non\-zero exit status if result is empty
 
 .TP
 \fB\-\-vcs\fR, \fB\-\-no\-vcs\fR
-enable or disable checking of VCS packages (default: True)
+fetch actual version of VCS packages
 
 .TP
 \fB\-y\fR, \fB\-\-refresh\fR
 download fresh package databases from the mirror before actions, \-yy to force refresh even if up to date
 
-.SH COMMAND \fI\,'ahriman repo\-clean'\/\fR
-usage: ahriman repo\-clean [\-h] [\-\-cache | \-\-no\-cache] [\-\-chroot | \-\-no\-chroot] [\-\-manual | \-\-no\-manual]
-                          [\-\-packages | \-\-no\-packages] [\-\-pacman | \-\-no\-pacman]
+.SH COMMAND \fI\,'ahriman repo\-daemon'\/\fR
+usage: ahriman repo\-daemon [\-h] [\-i INTERVAL] [\-\-aur | \-\-no\-aur] [\-\-dependencies | \-\-no\-dependencies]
+                           [\-\-local | \-\-no\-local] [\-\-manual | \-\-no\-manual] [\-\-vcs | \-\-no\-vcs] [\-y]
 
-remove local caches
+start process which periodically will run update process
 
-.SH OPTIONS \fI\,'ahriman repo\-clean'\/\fR
+.SH OPTIONS \fI\,'ahriman repo\-daemon'\/\fR
 .TP
-\fB\-\-cache\fR, \fB\-\-no\-cache\fR
-clear directory with package caches (default: False)
+\fB\-i\fR \fI\,INTERVAL\/\fR, \fB\-\-interval\fR \fI\,INTERVAL\/\fR
+interval between runs in seconds
 
 .TP
-\fB\-\-chroot\fR, \fB\-\-no\-chroot\fR
-clear build chroot (default: False)
+\fB\-\-aur\fR, \fB\-\-no\-aur\fR
+enable or disable checking for AUR updates
+
+.TP
+\fB\-\-dependencies\fR, \fB\-\-no\-dependencies\fR
+process missing package dependencies
+
+.TP
+\fB\-\-local\fR, \fB\-\-no\-local\fR
+enable or disable checking of local packages for updates
 
 .TP
 \fB\-\-manual\fR, \fB\-\-no\-manual\fR
-clear manually added packages queue (default: False)
+include or exclude manual updates
 
 .TP
-\fB\-\-packages\fR, \fB\-\-no\-packages\fR
-clear directory with built packages (default: False)
+\fB\-\-vcs\fR, \fB\-\-no\-vcs\fR
+fetch actual version of VCS packages
 
 .TP
-\fB\-\-pacman\fR, \fB\-\-no\-pacman\fR
-clear directory with pacman local database cache (default: False)
-
-.SH COMMAND \fI\,'ahriman repo\-config'\/\fR
-usage: ahriman repo\-config [\-h]
-
-dump configuration for the specified architecture
+\fB\-y\fR, \fB\-\-refresh\fR
+download fresh package databases from the mirror before actions, \-yy to force refresh even if up to date
 
 .SH COMMAND \fI\,'ahriman repo\-rebuild'\/\fR
 usage: ahriman repo\-rebuild [\-h] [\-\-depends\-on DEPENDS_ON] [\-\-dry\-run] [\-\-from\-database] [\-e]
@@ -505,51 +488,6 @@ path of the input archive
 \fB\-o\fR \fI\,OUTPUT\/\fR, \fB\-\-output\fR \fI\,OUTPUT\/\fR
 root path of the extracted files
 
-.SH COMMAND \fI\,'ahriman repo\-setup'\/\fR
-usage: ahriman repo\-setup [\-h] [\-\-build\-as\-user BUILD_AS_USER] [\-\-build\-command BUILD_COMMAND]
-                          [\-\-from\-configuration FROM_CONFIGURATION] [\-\-multilib | \-\-no\-multilib] \-\-packager PACKAGER
-                          \-\-repository REPOSITORY [\-\-sign\-key SIGN_KEY] [\-\-sign\-target {disabled,pacakges,repository}]
-                          [\-\-web\-port WEB_PORT]
-
-create initial service configuration, requires root
-
-.SH OPTIONS \fI\,'ahriman repo\-setup'\/\fR
-.TP
-\fB\-\-build\-as\-user\fR \fI\,BUILD_AS_USER\/\fR
-force makepkg user to the specific one
-
-.TP
-\fB\-\-build\-command\fR \fI\,BUILD_COMMAND\/\fR
-build command prefix
-
-.TP
-\fB\-\-from\-configuration\fR \fI\,FROM_CONFIGURATION\/\fR
-path to default devtools pacman configuration
-
-.TP
-\fB\-\-multilib\fR, \fB\-\-no\-multilib\fR
-add or do not multilib repository (default: True)
-
-.TP
-\fB\-\-packager\fR \fI\,PACKAGER\/\fR
-packager name and email
-
-.TP
-\fB\-\-repository\fR \fI\,REPOSITORY\/\fR
-repository name
-
-.TP
-\fB\-\-sign\-key\fR \fI\,SIGN_KEY\/\fR
-sign key id
-
-.TP
-\fB\-\-sign\-target\fR \fI\,{disabled,pacakges,repository}\/\fR
-sign options
-
-.TP
-\fB\-\-web\-port\fR \fI\,WEB_PORT\/\fR
-port of the web service
-
 .SH COMMAND \fI\,'ahriman repo\-sign'\/\fR
 usage: ahriman repo\-sign [\-h] [package ...]
 
@@ -574,6 +512,11 @@ usage: ahriman repo\-sync [\-h]
 
 sync repository files to remote server according to current settings
 
+.SH COMMAND \fI\,'ahriman repo\-tree'\/\fR
+usage: ahriman repo\-tree [\-h]
+
+dump repository tree based on packages dependencies
+
 .SH COMMAND \fI\,'ahriman repo\-triggers'\/\fR
 usage: ahriman repo\-triggers [\-h] [trigger ...]
 
@@ -581,11 +524,11 @@ run triggers on empty build result as configured by settings
 
 .TP
 \fBtrigger\fR
-instead of running all triggers as set by configuration, just process specified ones oin order of metion
+instead of running all triggers as set by configuration, just process specified ones in order of mention
 
 .SH COMMAND \fI\,'ahriman repo\-update'\/\fR
-usage: ahriman repo\-update [\-h] [\-\-dry\-run] [\-e] [\-\-aur | \-\-no\-aur] [\-\-local | \-\-no\-local] [\-\-manual | \-\-no\-manual]
-                           [\-\-vcs | \-\-no\-vcs] [\-y]
+usage: ahriman repo\-update [\-h] [\-\-aur | \-\-no\-aur] [\-\-dependencies | \-\-no\-dependencies] [\-\-dry\-run] [\-e]
+                           [\-\-local | \-\-no\-local] [\-\-manual | \-\-no\-manual] [\-\-vcs | \-\-no\-vcs] [\-y]
                            [package ...]
 
 check for packages updates and run build process if requested
@@ -595,6 +538,14 @@ check for packages updates and run build process if requested
 filter check by package base
 
 .SH OPTIONS \fI\,'ahriman repo\-update'\/\fR
+.TP
+\fB\-\-aur\fR, \fB\-\-no\-aur\fR
+enable or disable checking for AUR updates
+
+.TP
+\fB\-\-dependencies\fR, \fB\-\-no\-dependencies\fR
+process missing package dependencies
+
 .TP
 \fB\-\-dry\-run\fR
 just perform check for updates, same as check command
@@ -603,28 +554,143 @@ just perform check for updates, same as check command
 \fB\-e\fR, \fB\-\-exit\-code\fR
 return non\-zero exit status if result is empty
 
-.TP
-\fB\-\-aur\fR, \fB\-\-no\-aur\fR
-enable or disable checking for AUR updates. Implies \-\-no\-vcs (default: True)
-
 .TP
 \fB\-\-local\fR, \fB\-\-no\-local\fR
-enable or disable checking of local packages for updates (default: True)
+enable or disable checking of local packages for updates
 
 .TP
 \fB\-\-manual\fR, \fB\-\-no\-manual\fR
-include or exclude manual updates (default: True)
+include or exclude manual updates
 
 .TP
 \fB\-\-vcs\fR, \fB\-\-no\-vcs\fR
-enable or disable checking of VCS packages (default: True)
+fetch actual version of VCS packages
 
 .TP
 \fB\-y\fR, \fB\-\-refresh\fR
 download fresh package databases from the mirror before actions, \-yy to force refresh even if up to date
 
-.SH COMMAND \fI\,'ahriman shell'\/\fR
-usage: ahriman shell [\-h] [code]
+.SH COMMAND \fI\,'ahriman service\-clean'\/\fR
+usage: ahriman service\-clean [\-h] [\-\-cache | \-\-no\-cache] [\-\-chroot | \-\-no\-chroot] [\-\-manual | \-\-no\-manual]
+                             [\-\-packages | \-\-no\-packages] [\-\-pacman | \-\-no\-pacman]
+
+remove local caches
+
+.SH OPTIONS \fI\,'ahriman service\-clean'\/\fR
+.TP
+\fB\-\-cache\fR, \fB\-\-no\-cache\fR
+clear directory with package caches
+
+.TP
+\fB\-\-chroot\fR, \fB\-\-no\-chroot\fR
+clear build chroot
+
+.TP
+\fB\-\-manual\fR, \fB\-\-no\-manual\fR
+clear manually added packages queue
+
+.TP
+\fB\-\-packages\fR, \fB\-\-no\-packages\fR
+clear directory with built packages
+
+.TP
+\fB\-\-pacman\fR, \fB\-\-no\-pacman\fR
+clear directory with pacman local database cache
+
+.SH COMMAND \fI\,'ahriman service\-config'\/\fR
+usage: ahriman service\-config [\-h] [\-\-secure | \-\-no\-secure]
+
+dump configuration for the specified architecture
+
+.SH OPTIONS \fI\,'ahriman service\-config'\/\fR
+.TP
+\fB\-\-secure\fR, \fB\-\-no\-secure\fR
+hide passwords and secrets from output
+
+.SH COMMAND \fI\,'ahriman service\-config\-validate'\/\fR
+usage: ahriman service\-config\-validate [\-h] [\-e]
+
+validate configuration and print found errors
+
+.SH OPTIONS \fI\,'ahriman service\-config\-validate'\/\fR
+.TP
+\fB\-e\fR, \fB\-\-exit\-code\fR
+return non\-zero exit status if configuration is invalid
+
+.SH COMMAND \fI\,'ahriman service\-key\-import'\/\fR
+usage: ahriman service\-key\-import [\-h] [\-\-key\-server KEY_SERVER] key
+
+import PGP key from public sources to the repository user
+
+.TP
+\fBkey\fR
+PGP key to import from public server
+
+.SH OPTIONS \fI\,'ahriman service\-key\-import'\/\fR
+.TP
+\fB\-\-key\-server\fR \fI\,KEY_SERVER\/\fR
+key server for key import
+
+.SH COMMAND \fI\,'ahriman service\-setup'\/\fR
+usage: ahriman service\-setup [\-h] [\-\-build\-as\-user BUILD_AS_USER] [\-\-build\-command BUILD_COMMAND]
+                             [\-\-from\-configuration FROM_CONFIGURATION] [\-\-makeflags\-jobs | \-\-no\-makeflags\-jobs]
+                             [\-\-mirror MIRROR] [\-\-multilib | \-\-no\-multilib] \-\-packager PACKAGER \-\-repository REPOSITORY
+                             [\-\-sign\-key SIGN_KEY] [\-\-sign\-target {disabled,packages,repository}] [\-\-web\-port WEB_PORT]
+                             [\-\-web\-unix\-socket WEB_UNIX_SOCKET]
+
+create initial service configuration, requires root
+
+.SH OPTIONS \fI\,'ahriman service\-setup'\/\fR
+.TP
+\fB\-\-build\-as\-user\fR \fI\,BUILD_AS_USER\/\fR
+force makepkg user to the specific one
+
+.TP
+\fB\-\-build\-command\fR \fI\,BUILD_COMMAND\/\fR
+build command prefix
+
+.TP
+\fB\-\-from\-configuration\fR \fI\,FROM_CONFIGURATION\/\fR
+path to default devtools pacman configuration
+
+.TP
+\fB\-\-makeflags\-jobs\fR, \fB\-\-no\-makeflags\-jobs\fR
+append MAKEFLAGS variable with parallelism set to number of cores
+
+.TP
+\fB\-\-mirror\fR \fI\,MIRROR\/\fR
+use the specified explicitly mirror instead of including mirrorlist
+
+.TP
+\fB\-\-multilib\fR, \fB\-\-no\-multilib\fR
+add or do not multilib repository
+
+.TP
+\fB\-\-packager\fR \fI\,PACKAGER\/\fR
+packager name and email
+
+.TP
+\fB\-\-repository\fR \fI\,REPOSITORY\/\fR
+repository name
+
+.TP
+\fB\-\-sign\-key\fR \fI\,SIGN_KEY\/\fR
+sign key id
+
+.TP
+\fB\-\-sign\-target\fR \fI\,{disabled,packages,repository}\/\fR
+sign options
+
+.TP
+\fB\-\-web\-port\fR \fI\,WEB_PORT\/\fR
+port of the web service
+
+.TP
+\fB\-\-web\-unix\-socket\fR \fI\,WEB_UNIX_SOCKET\/\fR
+path to unix socket used for interprocess communications
+
+.SH COMMAND \fI\,'ahriman service\-shell'\/\fR
+usage: ahriman service\-shell [\-h] [code]
 
 drop into python shell while having created application
 
@@ -633,7 +699,7 @@ drop into python shell while having created application
 instead of dropping into shell, just execute the specified code
 
 .SH COMMAND \fI\,'ahriman user\-add'\/\fR
-usage: ahriman user\-add [\-h] [\-\-as\-service] [\-p PASSWORD] [\-r {unauthorized,read,reporter,full}] [\-s] username
+usage: ahriman user\-add [\-h] [\-p PASSWORD] [\-r {unauthorized,read,reporter,full}] [\-s] username
 
 update user for web services with the given password and role. In case if password was not entered it will be asked interactively
 
@@ -642,10 +708,6 @@ update user for web services with the given password and role. In case if passwo
 username for web service
 
 .SH OPTIONS \fI\,'ahriman user\-add'\/\fR
-.TP
-\fB\-\-as\-service\fR
-add user as service user
-
 .TP
 \fB\-p\fR \fI\,PASSWORD\/\fR, \fB\-\-password\fR \fI\,PASSWORD\/\fR
 user password. Blank password will be treated as empty password, which is in particular must be used for OAuth2
@@ -678,7 +740,7 @@ return non\-zero exit status if result is empty
 filter users by role
 
 .SH COMMAND \fI\,'ahriman user\-remove'\/\fR
-usage: ahriman user\-remove [\-h] [\-s] username
+usage: ahriman user\-remove [\-h] username
 
 remove user from the user mapping and update the configuration
 
@@ -686,16 +748,6 @@ remove user from the user mapping and update the configuration
 \fBusername\fR
 username for web service
 
-.SH OPTIONS \fI\,'ahriman user\-remove'\/\fR
-.TP
-\fB\-s\fR, \fB\-\-secure\fR
-set file permissions to user\-only
-
-.SH COMMAND \fI\,'ahriman version'\/\fR
-usage: ahriman version [\-h]
-
-print application and its dependencies versions
-
 .SH COMMAND \fI\,'ahriman web'\/\fR
 usage: ahriman web [\-h]
 
@@ -704,7 +756,7 @@ start web server
 .SH COMMENTS
 Argument list can also be read from file by using @ prefix.
 
-.SH AUTHORS
+.SH AUTHOR
 .nf
 ahriman team
 .fi

docs/ahriman.application.handlers.rst

@@ -116,6 +116,14 @@ ahriman.application.handlers.search module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.application.handlers.service\_updates module
+----------------------------------------------------
+
+.. automodule:: ahriman.application.handlers.service_updates
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.application.handlers.setup module
 -----------------------------------------
 
@@ -156,6 +164,14 @@ ahriman.application.handlers.status\_update module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.application.handlers.structure module
+---------------------------------------------
+
+.. automodule:: ahriman.application.handlers.structure
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.application.handlers.triggers module
 --------------------------------------------
 
@@ -188,6 +204,14 @@ ahriman.application.handlers.users module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.application.handlers.validate module
+--------------------------------------------
+
+.. automodule:: ahriman.application.handlers.validate
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.application.handlers.versions module
 --------------------------------------------
 

docs/ahriman.core.configuration.rst

@@ -0,0 +1,37 @@
+ahriman.core.configuration package
+==================================
+
+Submodules
+----------
+
+ahriman.core.configuration.configuration module
+-----------------------------------------------
+
+.. automodule:: ahriman.core.configuration.configuration
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.core.configuration.schema module
+----------------------------------------
+
+.. automodule:: ahriman.core.configuration.schema
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.core.configuration.validator module
+-------------------------------------------
+
+.. automodule:: ahriman.core.configuration.validator
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+Module contents
+---------------
+
+.. automodule:: ahriman.core.configuration
+   :members:
+   :no-undoc-members:
+   :show-inheritance:

docs/ahriman.core.database.data.rst

@@ -1,45 +0,0 @@
-ahriman.core.database.data package
-==================================
-
-Submodules
-----------
-
-ahriman.core.database.data.package\_remotes module
---------------------------------------------------
-
-.. automodule:: ahriman.core.database.data.package_remotes
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
-ahriman.core.database.data.package\_statuses module
----------------------------------------------------
-
-.. automodule:: ahriman.core.database.data.package_statuses
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
-ahriman.core.database.data.patches module
------------------------------------------
-
-.. automodule:: ahriman.core.database.data.patches
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
-ahriman.core.database.data.users module
----------------------------------------
-
-.. automodule:: ahriman.core.database.data.users
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
-Module contents
----------------
-
-.. automodule:: ahriman.core.database.data
-   :members:
-   :no-undoc-members:
-   :show-inheritance:

docs/ahriman.core.database.migrations.rst

@@ -36,6 +36,30 @@ ahriman.core.database.migrations.m003\_patch\_variables module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.core.database.migrations.m004\_logs module
+--------------------------------------------------
+
+.. automodule:: ahriman.core.database.migrations.m004_logs
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.core.database.migrations.m005\_make\_opt\_depends module
+----------------------------------------------------------------
+
+.. automodule:: ahriman.core.database.migrations.m005_make_opt_depends
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.core.database.migrations.m006\_packages\_architecture\_required module
+------------------------------------------------------------------------------
+
+.. automodule:: ahriman.core.database.migrations.m006_packages_architecture_required
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 Module contents
 ---------------
 

docs/ahriman.core.database.operations.rst

@@ -20,6 +20,14 @@ ahriman.core.database.operations.build\_operations module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.core.database.operations.logs\_operations module
+--------------------------------------------------------
+
+.. automodule:: ahriman.core.database.operations.logs_operations
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.core.database.operations.operations module
 --------------------------------------------------
 

docs/ahriman.core.database.rst

@@ -7,7 +7,6 @@ Subpackages
 .. toctree::
    :maxdepth: 4
 
-   ahriman.core.database.data
    ahriman.core.database.migrations
    ahriman.core.database.operations
 

docs/ahriman.core.formatters.rst

@@ -68,6 +68,14 @@ ahriman.core.formatters.string\_printer module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.core.formatters.tree\_printer module
+--------------------------------------------
+
+.. automodule:: ahriman.core.formatters.tree_printer
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.core.formatters.update\_printer module
 ----------------------------------------------
 
@@ -84,6 +92,14 @@ ahriman.core.formatters.user\_printer module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.core.formatters.validation\_printer module
+--------------------------------------------------
+
+.. automodule:: ahriman.core.formatters.validation_printer
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.core.formatters.version\_printer module
 -----------------------------------------------
 

docs/ahriman.core.log.rst

@@ -0,0 +1,45 @@
+ahriman.core.log package
+========================
+
+Submodules
+----------
+
+ahriman.core.log.filtered\_access\_logger module
+------------------------------------------------
+
+.. automodule:: ahriman.core.log.filtered_access_logger
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.core.log.http\_log\_handler module
+------------------------------------------
+
+.. automodule:: ahriman.core.log.http_log_handler
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.core.log.lazy\_logging module
+-------------------------------------
+
+.. automodule:: ahriman.core.log.lazy_logging
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.core.log.log module
+---------------------------
+
+.. automodule:: ahriman.core.log.log
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+Module contents
+---------------
+
+.. automodule:: ahriman.core.log
+   :members:
+   :no-undoc-members:
+   :show-inheritance:

docs/ahriman.core.rst

@@ -10,9 +10,11 @@ Subpackages
    ahriman.core.alpm
    ahriman.core.auth
    ahriman.core.build_tools
+   ahriman.core.configuration
    ahriman.core.database
    ahriman.core.formatters
    ahriman.core.gitremote
+   ahriman.core.log
    ahriman.core.report
    ahriman.core.repository
    ahriman.core.sign
@@ -23,14 +25,6 @@ Subpackages
 Submodules
 ----------
 
-ahriman.core.configuration module
----------------------------------
-
-.. automodule:: ahriman.core.configuration
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
 ahriman.core.exceptions module
 ------------------------------
 
@@ -39,14 +33,6 @@ ahriman.core.exceptions module
    :no-undoc-members:
    :show-inheritance:
 
-ahriman.core.lazy\_logging module
----------------------------------
-
-.. automodule:: ahriman.core.lazy_logging
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
 ahriman.core.spawn module
 -------------------------
 

docs/ahriman.models.rst

@@ -36,6 +36,14 @@ ahriman.models.build\_status module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.models.context\_key module
+----------------------------------
+
+.. automodule:: ahriman.models.context_key
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.models.counters module
 ------------------------------
 
@@ -52,6 +60,14 @@ ahriman.models.internal\_status module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.models.log\_record\_id module
+-------------------------------------
+
+.. automodule:: ahriman.models.log_record_id
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.models.migration module
 -------------------------------
 
@@ -92,6 +108,14 @@ ahriman.models.package\_source module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.models.pacman\_synchronization module
+---------------------------------------------
+
+.. automodule:: ahriman.models.pacman_synchronization
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.models.pkgbuild\_patch module
 -------------------------------------
 
@@ -180,14 +204,6 @@ ahriman.models.user\_access module
    :no-undoc-members:
    :show-inheritance:
 
-ahriman.models.user\_identity module
-------------------------------------
-
-.. automodule:: ahriman.models.user_identity
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
 Module contents
 ---------------
 

docs/ahriman.web.rst

@@ -8,11 +8,28 @@ Subpackages
    :maxdepth: 4
 
    ahriman.web.middlewares
+   ahriman.web.schemas
    ahriman.web.views
 
 Submodules
 ----------
 
+ahriman.web.apispec module
+--------------------------
+
+.. automodule:: ahriman.web.apispec
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.cors module
+-----------------------
+
+.. automodule:: ahriman.web.cors
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.web.routes module
 -------------------------
 

docs/ahriman.web.schemas.rst

@@ -0,0 +1,165 @@
+ahriman.web.schemas package
+===========================
+
+Submodules
+----------
+
+ahriman.web.schemas.aur\_package\_schema module
+-----------------------------------------------
+
+.. automodule:: ahriman.web.schemas.aur_package_schema
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.schemas.auth\_schema module
+---------------------------------------
+
+.. automodule:: ahriman.web.schemas.auth_schema
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.schemas.counters\_schema module
+-------------------------------------------
+
+.. automodule:: ahriman.web.schemas.counters_schema
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.schemas.error\_schema module
+----------------------------------------
+
+.. automodule:: ahriman.web.schemas.error_schema
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.schemas.internal\_status\_schema module
+---------------------------------------------------
+
+.. automodule:: ahriman.web.schemas.internal_status_schema
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.schemas.log\_schema module
+--------------------------------------
+
+.. automodule:: ahriman.web.schemas.log_schema
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.schemas.login\_schema module
+----------------------------------------
+
+.. automodule:: ahriman.web.schemas.login_schema
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.schemas.logs\_schema module
+---------------------------------------
+
+.. automodule:: ahriman.web.schemas.logs_schema
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.schemas.oauth2\_schema module
+-----------------------------------------
+
+.. automodule:: ahriman.web.schemas.oauth2_schema
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.schemas.package\_name\_schema module
+------------------------------------------------
+
+.. automodule:: ahriman.web.schemas.package_name_schema
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.schemas.package\_names\_schema module
+-------------------------------------------------
+
+.. automodule:: ahriman.web.schemas.package_names_schema
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.schemas.package\_properties\_schema module
+------------------------------------------------------
+
+.. automodule:: ahriman.web.schemas.package_properties_schema
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.schemas.package\_schema module
+------------------------------------------
+
+.. automodule:: ahriman.web.schemas.package_schema
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.schemas.package\_status\_schema module
+--------------------------------------------------
+
+.. automodule:: ahriman.web.schemas.package_status_schema
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.schemas.pgp\_key\_id\_schema module
+-----------------------------------------------
+
+.. automodule:: ahriman.web.schemas.pgp_key_id_schema
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.schemas.pgp\_key\_schema module
+-------------------------------------------
+
+.. automodule:: ahriman.web.schemas.pgp_key_schema
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.schemas.remote\_schema module
+-----------------------------------------
+
+.. automodule:: ahriman.web.schemas.remote_schema
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.schemas.search\_schema module
+-----------------------------------------
+
+.. automodule:: ahriman.web.schemas.search_schema
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.schemas.status\_schema module
+-----------------------------------------
+
+.. automodule:: ahriman.web.schemas.status_schema
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+Module contents
+---------------
+
+.. automodule:: ahriman.web.schemas
+   :members:
+   :no-undoc-members:
+   :show-inheritance:

docs/ahriman.web.views.api.rst

@@ -0,0 +1,29 @@
+ahriman.web.views.api package
+=============================
+
+Submodules
+----------
+
+ahriman.web.views.api.docs module
+---------------------------------
+
+.. automodule:: ahriman.web.views.api.docs
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.views.api.swagger module
+------------------------------------
+
+.. automodule:: ahriman.web.views.api.swagger
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+Module contents
+---------------
+
+.. automodule:: ahriman.web.views.api
+   :members:
+   :no-undoc-members:
+   :show-inheritance:

docs/ahriman.web.views.rst

@@ -7,6 +7,7 @@ Subpackages
 .. toctree::
    :maxdepth: 4
 
+   ahriman.web.views.api
    ahriman.web.views.service
    ahriman.web.views.status
    ahriman.web.views.user

docs/ahriman.web.views.service.rst

@@ -12,6 +12,22 @@ ahriman.web.views.service.add module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.web.views.service.pgp module
+------------------------------------
+
+.. automodule:: ahriman.web.views.service.pgp
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.web.views.service.rebuild module
+----------------------------------------
+
+.. automodule:: ahriman.web.views.service.rebuild
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.web.views.service.remove module
 ---------------------------------------
 
@@ -36,6 +52,14 @@ ahriman.web.views.service.search module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.web.views.service.update module
+---------------------------------------
+
+.. automodule:: ahriman.web.views.service.update
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 Module contents
 ---------------
 

docs/ahriman.web.views.status.rst

@@ -4,6 +4,14 @@ ahriman.web.views.status package
 Submodules
 ----------
 
+ahriman.web.views.status.logs module
+------------------------------------
+
+.. automodule:: ahriman.web.views.status.logs
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.web.views.status.package module
 ---------------------------------------
 

docs/architecture.rst

@@ -28,7 +28,7 @@ This package contains application (aka executable) related classes and everythin
 ``ahriman.core`` package
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
-This package contains everything which is required for any time of application run and separated into several packages:
+This package contains everything required for the most of application actions and it is separated into several packages:
 
 * ``ahriman.core.alpm`` package controls pacman related functions. It provides wrappers for ``pyalpm`` library and safe calls for repository tools (``repo-add`` and ``repo-remove``). Also this package contains ``ahriman.core.alpm.remote`` package which provides wrapper for remote sources (e.g. AUR RPC and official repositories RPC).
 * ``ahriman.core.auth`` package provides classes for authorization methods used by web mostly. Base class is ``ahriman.core.auth.Auth`` which must be called by ``load`` method.
@@ -36,6 +36,7 @@ This package contains everything which is required for any time of application r
 * ``ahriman.core.database`` is everything including data and schema migrations for database.
 * ``ahriman.core.formatters`` package provides ``Printer`` sub-classes for printing data (e.g. package properties) to stdout which are used by some handlers.
 * ``ahriman.core.gitremote`` is a package with remote PKGBUILD triggers. Should not be called directly.
+* ``ahriman.core.log`` is a log utils package. It includes logger loader class, custom HTTP based logger and access logger for HTTP services with additional filters.
 * ``ahriman.core.report`` is a package with reporting triggers. Should not be called directly.
 * ``ahriman.core.repository`` contains several traits and base repository (``ahriman.core.repository.Repository`` class) implementation.
 * ``ahriman.core.sign`` package provides sign feature (only gpg calls are available).
@@ -53,7 +54,7 @@ This package also provides some generic functions and classes which may be used
 ``ahriman.models`` package
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-It provides models for any other part of application. Unlike ``ahriman.core`` package classes from here provides only conversion methods (e.g. create class from another or convert to). Mostly case classes and enumerations.
+It provides models for any other part of application. Unlike ``ahriman.core`` package classes from here provide only conversion methods (e.g. create class from another or convert to). Mostly case classes and enumerations.
 
 ``ahriman.web`` package
 ^^^^^^^^^^^^^^^^^^^^^^^
@@ -76,10 +77,26 @@ Application run
 * Return result (success or failure) of each subprocess and exit from application.
 * Some handlers may override their status and throw ``ExitCode`` exception. This exception is just silently suppressed and changes application exit code to ``1``.
 
-In most cases handlers spawn god class ``ahriman.application.application.Application`` class and call required methods.
+In the most cases handlers spawn god class ``ahriman.application.application.Application`` class and call required methods.
 
 Application is designed to run from ``systemd`` services and provides parametrized by architecture timer and service file for that.
 
+Subcommand design
+^^^^^^^^^^^^^^^^^
+
+All subcommands are divided into several groups depending on the role they are doing:
+
+* ``aur`` (``aur-search``) group is for AUR operations.
+* ``help`` (e.g. ``help``) are system commands.
+* ``package`` subcommands (e.g. ``package-add``) allow to perform single package actions.
+* ``patch`` subcommands (e.g. ``pacth-list``) are the special case of ``package`` subcommands introduced in order to control patches for packages.
+* ``repo`` subcommands (e.g. ``repo-check``) usually perform actions on whole repository.
+* ``service`` subcommands (e.g. ``service-setup``) perform actions which are related to whole service managing: create repository, show configuration.
+* ``user`` subcommands (``user-add``) are intended for user management.
+* ``web`` subcommands are related to web service management.
+
+For historical reasons and in order to keep backward compatibility some subcommands have aliases to their shorter forms or even other groups, but the service doesn't guarantee that they will remain unchanged.
+
 Database
 --------
 
@@ -97,14 +114,14 @@ Schema and data migrations
 
 The schema migration are applied according to current ``pragma user_info`` values, located at ``ahriman.core.database.migrations`` package and named as ``m000_migration_name.py`` (the preceding ``m`` is required in order to import migration content for tests). Additional class ``ahriman.core.database.migrations.Migrations`` reads all migrations automatically and applies them in alphabetical order.
 
-There are also data migrations which are located at ``ahriman.core.database.data`` package and move data from old-style (e.g. json files in filesystem, directory trees, etc) to the database. They are also part of migration and (unlike schema migrations) are applied only at specific version breakpoints (e.g. if ``user_version`` is more than 0 no initial migration will be applied).
+These migrations also contain data migrations. Though the recommended way is to migrate data directly from SQL requests, sometimes it is required to have external data (like packages list) in order to set correct data. To do so, special method `migrate_data` is used.
 
 Type conversions
 ^^^^^^^^^^^^^^^^
 
 By default, it parses rows into python dictionary. In addition, the following pseudo-types are supported:
 
-* ``Dict[str, Any]``, ``List[Any]`` - for storing JSON data structures in database (technically there is no restriction on types for dictionary keys and values, but it is recommended to use only string keys). The type is stored as ``json`` data type and ``json.loads`` and ``json.dumps`` methods are used in order to read and write from/to database respectively.
+* ``dict[str, Any]``, ``list[Any]`` - for storing JSON data structures in database (technically there is no restriction on types for dictionary keys and values, but it is recommended to use only string keys). The type is stored as ``json`` data type and ``json.loads`` and ``json.dumps`` methods are used in order to read and write from/to database respectively.
 
 Basic flows
 -----------
@@ -168,6 +185,15 @@ Utils
 
 For every external command run (which is actually not recommended if possible) custom wrapper for ``subprocess`` is used. Additional functions ``ahriman.core.auth.helpers`` provide safe calls for ``aiohttp_security`` methods and are required to make this dependency optional.
 
+Context variables
+^^^^^^^^^^^^^^^^^
+
+Package provides implicit global variables which can be accessed from ``ahriman.core`` package as ``context`` variable, wrapped by ``contextvars.ContextVar`` class. The value of the variable is defaulting to private ``_Context`` class which is defined in the same module. The default values - such as ``database`` and ``sign`` - are being set on the service initialization.
+
+The ``_Context`` class itself mimics default collection interface (as is Mapping) and can be modified by ``_Context.set`` method. The stored variables can be achieved by ``_Context.get`` method, which is unlike default ``Mapping`` interface also performs type and presence checks.
+
+In order to provide statically typed interface, the ``ahriman.models.context_key.ContextKey`` class is used for both ``_Content.get`` and ``_Content.set`` methods; the context instance itself, however, does not store information about types.
+
 Submodules
 ^^^^^^^^^^
 
@@ -196,18 +222,20 @@ means that there is user ``username`` with ``read`` access and password ``passwo
 
 OAuth provider uses library definitions (``aioauth-client``) in order *authenticate* users. It still requires user permission to be set in database, thus it inherits mapping provider without any changes. Whereas we could override ``check_credentials`` (authentication method) by something custom, OAuth flow is a bit more complex than just forward request, thus we have to implement the flow in login form.
 
-OAuth's implementation also allows authenticating users via username + password (in the same way as mapping does) though it is not recommended for end-users and password must be left blank. In particular this feature is used by service reporting (aka robots).
+OAuth's implementation also allows authenticating users via username + password (in the same way as mapping does) though it is not recommended for end-users and password must be left blank. In particular this feature can be used by service reporting (aka robots).
+
+In addition, web service checks the source socket used. In case if it belongs to ``socket.AF_UNIX`` family, it will skip any furher checks considering the request to be performed in safe environment (e.g. on the same physical machine). This feature, in particular is being used by the reporter instances in case if socket address is set in configuration.
 
 In order to configure users there are special commands.
 
 Triggers
 ^^^^^^^^
 
-Triggers are extensions which can be used in order to perform any actions on application start, after the update process and, finally, before the application exit. The package provides two default extensions - one is report generation and another one is remote upload feature.
+Triggers are extensions which can be used in order to perform any actions on application start, after the update process and, finally, before the application exit.
 
 The main idea is to load classes by their full path (e.g. ``ahriman.core.upload.UploadTrigger``) by using ``importlib``: get the last part of the import and treat it as class name, join remain part by ``.`` and interpret as module path, import module and extract attribute from it.
 
-The loaded triggers will be called with ``ahriman.models.result.Result`` and ``List[Packages]`` arguments, which describes the process result and current repository packages respectively. Any exception raised will be suppressed and will generate an exception message in logs.
+The loaded triggers will be called with ``ahriman.models.result.Result`` and ``list[Packages]`` arguments, which describes the process result and current repository packages respectively. Any exception raised will be suppressed and will generate an exception message in logs.
 
 In addition triggers can implement ``on_start`` and ``on_stop`` actions which will be called on the application start and right before the application exit. The ``on_start`` action is usually being called from handlers directly in order to make sure that no trigger will be run when it is not required (e.g. on user management). As soon as ``on_start`` action is called, the additional flag will be set; ``ahriman.core.triggers.TriggerLoader`` class implements ``__del__`` method in which, if the flag is set, the ``on_stop`` actions will be called.
 
@@ -241,15 +269,24 @@ Web application
 Web application requires the following python packages to be installed:
 
 * Core part requires ``aiohttp`` (application itself), ``aiohttp_jinja2`` and ``Jinja2`` (HTML generation from templates).
+* Additional web features also require ``aiohttp-apispec`` (autogenerated documentation), ``aiohttp_cors`` (CORS support, required by documentation)
 * In addition, ``aiohttp_debugtoolbar`` is required for debug panel. Please note that this option does not work together with authorization and basically must not be used in production.
 * In addition, authorization feature requires ``aiohttp_security``, ``aiohttp_session`` and ``cryptography``.
 * In addition to base authorization dependencies, OAuth2 also requires ``aioauth-client`` library.
+* In addition if you would like to disable authorization for local access (recommended way in order to run the application itself with reporting support), the ``requests-unixsocket`` library is required.
 
 Middlewares
 ^^^^^^^^^^^
 
 Service provides some custom middlewares, e.g. logging every exception (except for user ones) and user authorization.
 
+HEAD and OPTIONS requests
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+``HEAD`` request is automatically generated by ``ahriman.web.views.base.BaseView`` class. It just calls ``GET`` method, removes any data from body and returns the result. In case if no ``GET`` method available for this view, the ``aiohttp.web.HTTPMethodNotAllowed`` exception will be raised.
+
+On the other side, ``OPTIONS`` method is implemented in the ``ahriman.web.middlewares.exception_handler.exception_handler`` middleware. In case if ``aiohttp.web.HTTPMethodNotAllowed`` exception is raised and original method was ``OPTIONS``, the middleware handles it, converts to valid request and returns response to user.
+
 Web views
 ^^^^^^^^^
 
@@ -259,6 +296,7 @@ REST API supports both form and JSON data, but the last one is recommended.
 
 Different APIs are separated into different packages:
 
+* ``ahriman.web.views.api`` not a real API, but some views which provide OpenAPI support.
 * ``ahriman.web.views.service`` provides views for application controls.
 * ``ahriman.web.views.status`` package provides REST API for application reporting.
 * ``ahriman.web.views.user`` package provides login and logout methods which can be called without authorization.

docs/completions/bash/_ahriman

@@ -0,0 +1,569 @@
+# AUTOMATICALLY GENERATED by `shtab`
+
+_shtab_ahriman_subparsers=('aur-search' 'search' 'help' 'help-commands-unsafe' 'help-updates' 'help-version' 'version' 'package-add' 'add' 'package-update' 'package-remove' 'remove' 'package-status' 'status' 'package-status-remove' 'package-status-update' 'status-update' 'patch-add' 'patch-list' 'patch-remove' 'patch-set-add' 'repo-backup' 'repo-check' 'check' 'repo-daemon' 'daemon' 'repo-rebuild' 'rebuild' 'repo-remove-unknown' 'remove-unknown' 'repo-report' 'report' 'repo-restore' 'repo-sign' 'sign' 'repo-status-update' 'repo-sync' 'sync' 'repo-tree' 'repo-triggers' 'repo-update' 'update' 'service-clean' 'clean' 'repo-clean' 'service-config' 'config' 'repo-config' 'service-config-validate' 'config-validate' 'repo-config-validate' 'service-key-import' 'key-import' 'service-setup' 'init' 'repo-init' 'repo-setup' 'setup' 'service-shell' 'shell' 'user-add' 'user-list' 'user-remove' 'web')
+
+_shtab_ahriman_option_strings=('-h' '--help' '-a' '--architecture' '-c' '--configuration' '--force' '-l' '--lock' '--report' '--no-report' '-q' '--quiet' '--unsafe' '-V' '--version')
+_shtab_ahriman_aur_search_option_strings=('-h' '--help' '-e' '--exit-code' '--info' '--no-info' '--sort-by')
+_shtab_ahriman_search_option_strings=('-h' '--help' '-e' '--exit-code' '--info' '--no-info' '--sort-by')
+_shtab_ahriman_help_option_strings=('-h' '--help')
+_shtab_ahriman_help_commands_unsafe_option_strings=('-h' '--help' '--command')
+_shtab_ahriman_help_updates_option_strings=('-h' '--help' '-e' '--exit-code')
+_shtab_ahriman_help_version_option_strings=('-h' '--help')
+_shtab_ahriman_version_option_strings=('-h' '--help')
+_shtab_ahriman_package_add_option_strings=('-h' '--help' '--dependencies' '--no-dependencies' '-e' '--exit-code' '-n' '--now' '-y' '--refresh' '-s' '--source')
+_shtab_ahriman_add_option_strings=('-h' '--help' '--dependencies' '--no-dependencies' '-e' '--exit-code' '-n' '--now' '-y' '--refresh' '-s' '--source')
+_shtab_ahriman_package_update_option_strings=('-h' '--help' '--dependencies' '--no-dependencies' '-e' '--exit-code' '-n' '--now' '-y' '--refresh' '-s' '--source')
+_shtab_ahriman_package_remove_option_strings=('-h' '--help')
+_shtab_ahriman_remove_option_strings=('-h' '--help')
+_shtab_ahriman_package_status_option_strings=('-h' '--help' '--ahriman' '-e' '--exit-code' '--info' '--no-info' '-s' '--status')
+_shtab_ahriman_status_option_strings=('-h' '--help' '--ahriman' '-e' '--exit-code' '--info' '--no-info' '-s' '--status')
+_shtab_ahriman_package_status_remove_option_strings=('-h' '--help')
+_shtab_ahriman_package_status_update_option_strings=('-h' '--help' '-s' '--status')
+_shtab_ahriman_status_update_option_strings=('-h' '--help' '-s' '--status')
+_shtab_ahriman_patch_add_option_strings=('-h' '--help')
+_shtab_ahriman_patch_list_option_strings=('-h' '--help' '-e' '--exit-code' '-v' '--variable')
+_shtab_ahriman_patch_remove_option_strings=('-h' '--help' '-v' '--variable')
+_shtab_ahriman_patch_set_add_option_strings=('-h' '--help' '-t' '--track')
+_shtab_ahriman_repo_backup_option_strings=('-h' '--help')
+_shtab_ahriman_repo_check_option_strings=('-h' '--help' '-e' '--exit-code' '--vcs' '--no-vcs' '-y' '--refresh')
+_shtab_ahriman_check_option_strings=('-h' '--help' '-e' '--exit-code' '--vcs' '--no-vcs' '-y' '--refresh')
+_shtab_ahriman_repo_daemon_option_strings=('-h' '--help' '-i' '--interval' '--aur' '--no-aur' '--dependencies' '--no-dependencies' '--local' '--no-local' '--manual' '--no-manual' '--vcs' '--no-vcs' '-y' '--refresh')
+_shtab_ahriman_daemon_option_strings=('-h' '--help' '-i' '--interval' '--aur' '--no-aur' '--dependencies' '--no-dependencies' '--local' '--no-local' '--manual' '--no-manual' '--vcs' '--no-vcs' '-y' '--refresh')
+_shtab_ahriman_repo_rebuild_option_strings=('-h' '--help' '--depends-on' '--dry-run' '--from-database' '-e' '--exit-code')
+_shtab_ahriman_rebuild_option_strings=('-h' '--help' '--depends-on' '--dry-run' '--from-database' '-e' '--exit-code')
+_shtab_ahriman_repo_remove_unknown_option_strings=('-h' '--help' '--dry-run')
+_shtab_ahriman_remove_unknown_option_strings=('-h' '--help' '--dry-run')
+_shtab_ahriman_repo_report_option_strings=('-h' '--help')
+_shtab_ahriman_report_option_strings=('-h' '--help')
+_shtab_ahriman_repo_restore_option_strings=('-h' '--help' '-o' '--output')
+_shtab_ahriman_repo_sign_option_strings=('-h' '--help')
+_shtab_ahriman_sign_option_strings=('-h' '--help')
+_shtab_ahriman_repo_status_update_option_strings=('-h' '--help' '-s' '--status')
+_shtab_ahriman_repo_sync_option_strings=('-h' '--help')
+_shtab_ahriman_sync_option_strings=('-h' '--help')
+_shtab_ahriman_repo_tree_option_strings=('-h' '--help')
+_shtab_ahriman_repo_triggers_option_strings=('-h' '--help')
+_shtab_ahriman_repo_update_option_strings=('-h' '--help' '--aur' '--no-aur' '--dependencies' '--no-dependencies' '--dry-run' '-e' '--exit-code' '--local' '--no-local' '--manual' '--no-manual' '--vcs' '--no-vcs' '-y' '--refresh')
+_shtab_ahriman_update_option_strings=('-h' '--help' '--aur' '--no-aur' '--dependencies' '--no-dependencies' '--dry-run' '-e' '--exit-code' '--local' '--no-local' '--manual' '--no-manual' '--vcs' '--no-vcs' '-y' '--refresh')
+_shtab_ahriman_service_clean_option_strings=('-h' '--help' '--cache' '--no-cache' '--chroot' '--no-chroot' '--manual' '--no-manual' '--packages' '--no-packages' '--pacman' '--no-pacman')
+_shtab_ahriman_clean_option_strings=('-h' '--help' '--cache' '--no-cache' '--chroot' '--no-chroot' '--manual' '--no-manual' '--packages' '--no-packages' '--pacman' '--no-pacman')
+_shtab_ahriman_repo_clean_option_strings=('-h' '--help' '--cache' '--no-cache' '--chroot' '--no-chroot' '--manual' '--no-manual' '--packages' '--no-packages' '--pacman' '--no-pacman')
+_shtab_ahriman_service_config_option_strings=('-h' '--help' '--secure' '--no-secure')
+_shtab_ahriman_config_option_strings=('-h' '--help' '--secure' '--no-secure')
+_shtab_ahriman_repo_config_option_strings=('-h' '--help' '--secure' '--no-secure')
+_shtab_ahriman_service_config_validate_option_strings=('-h' '--help' '-e' '--exit-code')
+_shtab_ahriman_config_validate_option_strings=('-h' '--help' '-e' '--exit-code')
+_shtab_ahriman_repo_config_validate_option_strings=('-h' '--help' '-e' '--exit-code')
+_shtab_ahriman_service_key_import_option_strings=('-h' '--help' '--key-server')
+_shtab_ahriman_key_import_option_strings=('-h' '--help' '--key-server')
+_shtab_ahriman_service_setup_option_strings=('-h' '--help' '--build-as-user' '--build-command' '--from-configuration' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--repository' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
+_shtab_ahriman_init_option_strings=('-h' '--help' '--build-as-user' '--build-command' '--from-configuration' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--repository' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
+_shtab_ahriman_repo_init_option_strings=('-h' '--help' '--build-as-user' '--build-command' '--from-configuration' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--repository' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
+_shtab_ahriman_repo_setup_option_strings=('-h' '--help' '--build-as-user' '--build-command' '--from-configuration' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--repository' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
+_shtab_ahriman_setup_option_strings=('-h' '--help' '--build-as-user' '--build-command' '--from-configuration' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--repository' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
+_shtab_ahriman_service_shell_option_strings=('-h' '--help')
+_shtab_ahriman_shell_option_strings=('-h' '--help')
+_shtab_ahriman_user_add_option_strings=('-h' '--help' '-p' '--password' '-r' '--role' '-s' '--secure')
+_shtab_ahriman_user_list_option_strings=('-h' '--help' '-e' '--exit-code' '-r' '--role')
+_shtab_ahriman_user_remove_option_strings=('-h' '--help')
+_shtab_ahriman_web_option_strings=('-h' '--help')
+
+
+
+_shtab_ahriman_pos_0_choices=('aur-search' 'search' 'help' 'help-commands-unsafe' 'help-updates' 'help-version' 'version' 'package-add' 'add' 'package-update' 'package-remove' 'remove' 'package-status' 'status' 'package-status-remove' 'package-status-update' 'status-update' 'patch-add' 'patch-list' 'patch-remove' 'patch-set-add' 'repo-backup' 'repo-check' 'check' 'repo-daemon' 'daemon' 'repo-rebuild' 'rebuild' 'repo-remove-unknown' 'remove-unknown' 'repo-report' 'report' 'repo-restore' 'repo-sign' 'sign' 'repo-status-update' 'repo-sync' 'sync' 'repo-tree' 'repo-triggers' 'repo-update' 'update' 'service-clean' 'clean' 'repo-clean' 'service-config' 'config' 'repo-config' 'service-config-validate' 'config-validate' 'repo-config-validate' 'service-key-import' 'key-import' 'service-setup' 'init' 'repo-init' 'repo-setup' 'setup' 'service-shell' 'shell' 'user-add' 'user-list' 'user-remove' 'web')
+_shtab_ahriman_aur_search___sort_by_choices=('description' 'first_submitted' 'id' 'last_modified' 'maintainer' 'name' 'num_votes' 'out_of_date' 'package_base' 'package_base_id' 'popularity' 'repository' 'submitter' 'url' 'url_path' 'version')
+_shtab_ahriman_search___sort_by_choices=('description' 'first_submitted' 'id' 'last_modified' 'maintainer' 'name' 'num_votes' 'out_of_date' 'package_base' 'package_base_id' 'popularity' 'repository' 'submitter' 'url' 'url_path' 'version')
+_shtab_ahriman_package_add__s_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
+_shtab_ahriman_package_add___source_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
+_shtab_ahriman_add__s_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
+_shtab_ahriman_add___source_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
+_shtab_ahriman_package_update__s_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
+_shtab_ahriman_package_update___source_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
+_shtab_ahriman_package_status__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_package_status___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_status__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_status___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_package_status_update__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_package_status_update___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_status_update__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_status_update___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_repo_status_update__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_repo_status_update___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_service_setup___sign_target_choices=('disabled' 'packages' 'repository')
+_shtab_ahriman_init___sign_target_choices=('disabled' 'packages' 'repository')
+_shtab_ahriman_repo_init___sign_target_choices=('disabled' 'packages' 'repository')
+_shtab_ahriman_repo_setup___sign_target_choices=('disabled' 'packages' 'repository')
+_shtab_ahriman_setup___sign_target_choices=('disabled' 'packages' 'repository')
+_shtab_ahriman_user_add__r_choices=('unauthorized' 'read' 'reporter' 'full')
+_shtab_ahriman_user_add___role_choices=('unauthorized' 'read' 'reporter' 'full')
+_shtab_ahriman_user_list__r_choices=('unauthorized' 'read' 'reporter' 'full')
+_shtab_ahriman_user_list___role_choices=('unauthorized' 'read' 'reporter' 'full')
+
+_shtab_ahriman_pos_0_nargs=A...
+_shtab_ahriman__h_nargs=0
+_shtab_ahriman___help_nargs=0
+_shtab_ahriman___force_nargs=0
+_shtab_ahriman___report_nargs=0
+_shtab_ahriman___no_report_nargs=0
+_shtab_ahriman__q_nargs=0
+_shtab_ahriman___quiet_nargs=0
+_shtab_ahriman___unsafe_nargs=0
+_shtab_ahriman__V_nargs=0
+_shtab_ahriman___version_nargs=0
+_shtab_ahriman_aur_search_pos_0_nargs=+
+_shtab_ahriman_aur_search__h_nargs=0
+_shtab_ahriman_aur_search___help_nargs=0
+_shtab_ahriman_aur_search__e_nargs=0
+_shtab_ahriman_aur_search___exit_code_nargs=0
+_shtab_ahriman_aur_search___info_nargs=0
+_shtab_ahriman_aur_search___no_info_nargs=0
+_shtab_ahriman_search_pos_0_nargs=+
+_shtab_ahriman_search__h_nargs=0
+_shtab_ahriman_search___help_nargs=0
+_shtab_ahriman_search__e_nargs=0
+_shtab_ahriman_search___exit_code_nargs=0
+_shtab_ahriman_search___info_nargs=0
+_shtab_ahriman_search___no_info_nargs=0
+_shtab_ahriman_help__h_nargs=0
+_shtab_ahriman_help___help_nargs=0
+_shtab_ahriman_help_commands_unsafe__h_nargs=0
+_shtab_ahriman_help_commands_unsafe___help_nargs=0
+_shtab_ahriman_help_updates__h_nargs=0
+_shtab_ahriman_help_updates___help_nargs=0
+_shtab_ahriman_help_updates__e_nargs=0
+_shtab_ahriman_help_updates___exit_code_nargs=0
+_shtab_ahriman_help_version__h_nargs=0
+_shtab_ahriman_help_version___help_nargs=0
+_shtab_ahriman_version__h_nargs=0
+_shtab_ahriman_version___help_nargs=0
+_shtab_ahriman_package_add_pos_0_nargs=+
+_shtab_ahriman_package_add__h_nargs=0
+_shtab_ahriman_package_add___help_nargs=0
+_shtab_ahriman_package_add___dependencies_nargs=0
+_shtab_ahriman_package_add___no_dependencies_nargs=0
+_shtab_ahriman_package_add__e_nargs=0
+_shtab_ahriman_package_add___exit_code_nargs=0
+_shtab_ahriman_package_add__n_nargs=0
+_shtab_ahriman_package_add___now_nargs=0
+_shtab_ahriman_package_add__y_nargs=0
+_shtab_ahriman_package_add___refresh_nargs=0
+_shtab_ahriman_add_pos_0_nargs=+
+_shtab_ahriman_add__h_nargs=0
+_shtab_ahriman_add___help_nargs=0
+_shtab_ahriman_add___dependencies_nargs=0
+_shtab_ahriman_add___no_dependencies_nargs=0
+_shtab_ahriman_add__e_nargs=0
+_shtab_ahriman_add___exit_code_nargs=0
+_shtab_ahriman_add__n_nargs=0
+_shtab_ahriman_add___now_nargs=0
+_shtab_ahriman_add__y_nargs=0
+_shtab_ahriman_add___refresh_nargs=0
+_shtab_ahriman_package_update_pos_0_nargs=+
+_shtab_ahriman_package_update__h_nargs=0
+_shtab_ahriman_package_update___help_nargs=0
+_shtab_ahriman_package_update___dependencies_nargs=0
+_shtab_ahriman_package_update___no_dependencies_nargs=0
+_shtab_ahriman_package_update__e_nargs=0
+_shtab_ahriman_package_update___exit_code_nargs=0
+_shtab_ahriman_package_update__n_nargs=0
+_shtab_ahriman_package_update___now_nargs=0
+_shtab_ahriman_package_update__y_nargs=0
+_shtab_ahriman_package_update___refresh_nargs=0
+_shtab_ahriman_package_remove_pos_0_nargs=+
+_shtab_ahriman_package_remove__h_nargs=0
+_shtab_ahriman_package_remove___help_nargs=0
+_shtab_ahriman_remove_pos_0_nargs=+
+_shtab_ahriman_remove__h_nargs=0
+_shtab_ahriman_remove___help_nargs=0
+_shtab_ahriman_package_status_pos_0_nargs=*
+_shtab_ahriman_package_status__h_nargs=0
+_shtab_ahriman_package_status___help_nargs=0
+_shtab_ahriman_package_status___ahriman_nargs=0
+_shtab_ahriman_package_status__e_nargs=0
+_shtab_ahriman_package_status___exit_code_nargs=0
+_shtab_ahriman_package_status___info_nargs=0
+_shtab_ahriman_package_status___no_info_nargs=0
+_shtab_ahriman_status_pos_0_nargs=*
+_shtab_ahriman_status__h_nargs=0
+_shtab_ahriman_status___help_nargs=0
+_shtab_ahriman_status___ahriman_nargs=0
+_shtab_ahriman_status__e_nargs=0
+_shtab_ahriman_status___exit_code_nargs=0
+_shtab_ahriman_status___info_nargs=0
+_shtab_ahriman_status___no_info_nargs=0
+_shtab_ahriman_package_status_remove_pos_0_nargs=+
+_shtab_ahriman_package_status_remove__h_nargs=0
+_shtab_ahriman_package_status_remove___help_nargs=0
+_shtab_ahriman_package_status_update_pos_0_nargs=*
+_shtab_ahriman_package_status_update__h_nargs=0
+_shtab_ahriman_package_status_update___help_nargs=0
+_shtab_ahriman_status_update_pos_0_nargs=*
+_shtab_ahriman_status_update__h_nargs=0
+_shtab_ahriman_status_update___help_nargs=0
+_shtab_ahriman_patch_add__h_nargs=0
+_shtab_ahriman_patch_add___help_nargs=0
+_shtab_ahriman_patch_list__h_nargs=0
+_shtab_ahriman_patch_list___help_nargs=0
+_shtab_ahriman_patch_list__e_nargs=0
+_shtab_ahriman_patch_list___exit_code_nargs=0
+_shtab_ahriman_patch_remove__h_nargs=0
+_shtab_ahriman_patch_remove___help_nargs=0
+_shtab_ahriman_patch_set_add__h_nargs=0
+_shtab_ahriman_patch_set_add___help_nargs=0
+_shtab_ahriman_repo_backup__h_nargs=0
+_shtab_ahriman_repo_backup___help_nargs=0
+_shtab_ahriman_repo_check_pos_0_nargs=*
+_shtab_ahriman_repo_check__h_nargs=0
+_shtab_ahriman_repo_check___help_nargs=0
+_shtab_ahriman_repo_check__e_nargs=0
+_shtab_ahriman_repo_check___exit_code_nargs=0
+_shtab_ahriman_repo_check___vcs_nargs=0
+_shtab_ahriman_repo_check___no_vcs_nargs=0
+_shtab_ahriman_repo_check__y_nargs=0
+_shtab_ahriman_repo_check___refresh_nargs=0
+_shtab_ahriman_check_pos_0_nargs=*
+_shtab_ahriman_check__h_nargs=0
+_shtab_ahriman_check___help_nargs=0
+_shtab_ahriman_check__e_nargs=0
+_shtab_ahriman_check___exit_code_nargs=0
+_shtab_ahriman_check___vcs_nargs=0
+_shtab_ahriman_check___no_vcs_nargs=0
+_shtab_ahriman_check__y_nargs=0
+_shtab_ahriman_check___refresh_nargs=0
+_shtab_ahriman_repo_daemon__h_nargs=0
+_shtab_ahriman_repo_daemon___help_nargs=0
+_shtab_ahriman_repo_daemon___aur_nargs=0
+_shtab_ahriman_repo_daemon___no_aur_nargs=0
+_shtab_ahriman_repo_daemon___dependencies_nargs=0
+_shtab_ahriman_repo_daemon___no_dependencies_nargs=0
+_shtab_ahriman_repo_daemon___local_nargs=0
+_shtab_ahriman_repo_daemon___no_local_nargs=0
+_shtab_ahriman_repo_daemon___manual_nargs=0
+_shtab_ahriman_repo_daemon___no_manual_nargs=0
+_shtab_ahriman_repo_daemon___vcs_nargs=0
+_shtab_ahriman_repo_daemon___no_vcs_nargs=0
+_shtab_ahriman_repo_daemon__y_nargs=0
+_shtab_ahriman_repo_daemon___refresh_nargs=0
+_shtab_ahriman_daemon__h_nargs=0
+_shtab_ahriman_daemon___help_nargs=0
+_shtab_ahriman_daemon___aur_nargs=0
+_shtab_ahriman_daemon___no_aur_nargs=0
+_shtab_ahriman_daemon___dependencies_nargs=0
+_shtab_ahriman_daemon___no_dependencies_nargs=0
+_shtab_ahriman_daemon___local_nargs=0
+_shtab_ahriman_daemon___no_local_nargs=0
+_shtab_ahriman_daemon___manual_nargs=0
+_shtab_ahriman_daemon___no_manual_nargs=0
+_shtab_ahriman_daemon___vcs_nargs=0
+_shtab_ahriman_daemon___no_vcs_nargs=0
+_shtab_ahriman_daemon__y_nargs=0
+_shtab_ahriman_daemon___refresh_nargs=0
+_shtab_ahriman_repo_rebuild__h_nargs=0
+_shtab_ahriman_repo_rebuild___help_nargs=0
+_shtab_ahriman_repo_rebuild___dry_run_nargs=0
+_shtab_ahriman_repo_rebuild___from_database_nargs=0
+_shtab_ahriman_repo_rebuild__e_nargs=0
+_shtab_ahriman_repo_rebuild___exit_code_nargs=0
+_shtab_ahriman_rebuild__h_nargs=0
+_shtab_ahriman_rebuild___help_nargs=0
+_shtab_ahriman_rebuild___dry_run_nargs=0
+_shtab_ahriman_rebuild___from_database_nargs=0
+_shtab_ahriman_rebuild__e_nargs=0
+_shtab_ahriman_rebuild___exit_code_nargs=0
+_shtab_ahriman_repo_remove_unknown__h_nargs=0
+_shtab_ahriman_repo_remove_unknown___help_nargs=0
+_shtab_ahriman_repo_remove_unknown___dry_run_nargs=0
+_shtab_ahriman_remove_unknown__h_nargs=0
+_shtab_ahriman_remove_unknown___help_nargs=0
+_shtab_ahriman_remove_unknown___dry_run_nargs=0
+_shtab_ahriman_repo_report__h_nargs=0
+_shtab_ahriman_repo_report___help_nargs=0
+_shtab_ahriman_report__h_nargs=0
+_shtab_ahriman_report___help_nargs=0
+_shtab_ahriman_repo_restore__h_nargs=0
+_shtab_ahriman_repo_restore___help_nargs=0
+_shtab_ahriman_repo_sign_pos_0_nargs=*
+_shtab_ahriman_repo_sign__h_nargs=0
+_shtab_ahriman_repo_sign___help_nargs=0
+_shtab_ahriman_sign_pos_0_nargs=*
+_shtab_ahriman_sign__h_nargs=0
+_shtab_ahriman_sign___help_nargs=0
+_shtab_ahriman_repo_status_update__h_nargs=0
+_shtab_ahriman_repo_status_update___help_nargs=0
+_shtab_ahriman_repo_sync__h_nargs=0
+_shtab_ahriman_repo_sync___help_nargs=0
+_shtab_ahriman_sync__h_nargs=0
+_shtab_ahriman_sync___help_nargs=0
+_shtab_ahriman_repo_tree__h_nargs=0
+_shtab_ahriman_repo_tree___help_nargs=0
+_shtab_ahriman_repo_triggers_pos_0_nargs=*
+_shtab_ahriman_repo_triggers__h_nargs=0
+_shtab_ahriman_repo_triggers___help_nargs=0
+_shtab_ahriman_repo_update_pos_0_nargs=*
+_shtab_ahriman_repo_update__h_nargs=0
+_shtab_ahriman_repo_update___help_nargs=0
+_shtab_ahriman_repo_update___aur_nargs=0
+_shtab_ahriman_repo_update___no_aur_nargs=0
+_shtab_ahriman_repo_update___dependencies_nargs=0
+_shtab_ahriman_repo_update___no_dependencies_nargs=0
+_shtab_ahriman_repo_update___dry_run_nargs=0
+_shtab_ahriman_repo_update__e_nargs=0
+_shtab_ahriman_repo_update___exit_code_nargs=0
+_shtab_ahriman_repo_update___local_nargs=0
+_shtab_ahriman_repo_update___no_local_nargs=0
+_shtab_ahriman_repo_update___manual_nargs=0
+_shtab_ahriman_repo_update___no_manual_nargs=0
+_shtab_ahriman_repo_update___vcs_nargs=0
+_shtab_ahriman_repo_update___no_vcs_nargs=0
+_shtab_ahriman_repo_update__y_nargs=0
+_shtab_ahriman_repo_update___refresh_nargs=0
+_shtab_ahriman_update_pos_0_nargs=*
+_shtab_ahriman_update__h_nargs=0
+_shtab_ahriman_update___help_nargs=0
+_shtab_ahriman_update___aur_nargs=0
+_shtab_ahriman_update___no_aur_nargs=0
+_shtab_ahriman_update___dependencies_nargs=0
+_shtab_ahriman_update___no_dependencies_nargs=0
+_shtab_ahriman_update___dry_run_nargs=0
+_shtab_ahriman_update__e_nargs=0
+_shtab_ahriman_update___exit_code_nargs=0
+_shtab_ahriman_update___local_nargs=0
+_shtab_ahriman_update___no_local_nargs=0
+_shtab_ahriman_update___manual_nargs=0
+_shtab_ahriman_update___no_manual_nargs=0
+_shtab_ahriman_update___vcs_nargs=0
+_shtab_ahriman_update___no_vcs_nargs=0
+_shtab_ahriman_update__y_nargs=0
+_shtab_ahriman_update___refresh_nargs=0
+_shtab_ahriman_service_clean__h_nargs=0
+_shtab_ahriman_service_clean___help_nargs=0
+_shtab_ahriman_service_clean___cache_nargs=0
+_shtab_ahriman_service_clean___no_cache_nargs=0
+_shtab_ahriman_service_clean___chroot_nargs=0
+_shtab_ahriman_service_clean___no_chroot_nargs=0
+_shtab_ahriman_service_clean___manual_nargs=0
+_shtab_ahriman_service_clean___no_manual_nargs=0
+_shtab_ahriman_service_clean___packages_nargs=0
+_shtab_ahriman_service_clean___no_packages_nargs=0
+_shtab_ahriman_service_clean___pacman_nargs=0
+_shtab_ahriman_service_clean___no_pacman_nargs=0
+_shtab_ahriman_clean__h_nargs=0
+_shtab_ahriman_clean___help_nargs=0
+_shtab_ahriman_clean___cache_nargs=0
+_shtab_ahriman_clean___no_cache_nargs=0
+_shtab_ahriman_clean___chroot_nargs=0
+_shtab_ahriman_clean___no_chroot_nargs=0
+_shtab_ahriman_clean___manual_nargs=0
+_shtab_ahriman_clean___no_manual_nargs=0
+_shtab_ahriman_clean___packages_nargs=0
+_shtab_ahriman_clean___no_packages_nargs=0
+_shtab_ahriman_clean___pacman_nargs=0
+_shtab_ahriman_clean___no_pacman_nargs=0
+_shtab_ahriman_repo_clean__h_nargs=0
+_shtab_ahriman_repo_clean___help_nargs=0
+_shtab_ahriman_repo_clean___cache_nargs=0
+_shtab_ahriman_repo_clean___no_cache_nargs=0
+_shtab_ahriman_repo_clean___chroot_nargs=0
+_shtab_ahriman_repo_clean___no_chroot_nargs=0
+_shtab_ahriman_repo_clean___manual_nargs=0
+_shtab_ahriman_repo_clean___no_manual_nargs=0
+_shtab_ahriman_repo_clean___packages_nargs=0
+_shtab_ahriman_repo_clean___no_packages_nargs=0
+_shtab_ahriman_repo_clean___pacman_nargs=0
+_shtab_ahriman_repo_clean___no_pacman_nargs=0
+_shtab_ahriman_service_config__h_nargs=0
+_shtab_ahriman_service_config___help_nargs=0
+_shtab_ahriman_service_config___secure_nargs=0
+_shtab_ahriman_service_config___no_secure_nargs=0
+_shtab_ahriman_config__h_nargs=0
+_shtab_ahriman_config___help_nargs=0
+_shtab_ahriman_config___secure_nargs=0
+_shtab_ahriman_config___no_secure_nargs=0
+_shtab_ahriman_repo_config__h_nargs=0
+_shtab_ahriman_repo_config___help_nargs=0
+_shtab_ahriman_repo_config___secure_nargs=0
+_shtab_ahriman_repo_config___no_secure_nargs=0
+_shtab_ahriman_service_config_validate__h_nargs=0
+_shtab_ahriman_service_config_validate___help_nargs=0
+_shtab_ahriman_service_config_validate__e_nargs=0
+_shtab_ahriman_service_config_validate___exit_code_nargs=0
+_shtab_ahriman_config_validate__h_nargs=0
+_shtab_ahriman_config_validate___help_nargs=0
+_shtab_ahriman_config_validate__e_nargs=0
+_shtab_ahriman_config_validate___exit_code_nargs=0
+_shtab_ahriman_repo_config_validate__h_nargs=0
+_shtab_ahriman_repo_config_validate___help_nargs=0
+_shtab_ahriman_repo_config_validate__e_nargs=0
+_shtab_ahriman_repo_config_validate___exit_code_nargs=0
+_shtab_ahriman_service_key_import__h_nargs=0
+_shtab_ahriman_service_key_import___help_nargs=0
+_shtab_ahriman_key_import__h_nargs=0
+_shtab_ahriman_key_import___help_nargs=0
+_shtab_ahriman_service_setup__h_nargs=0
+_shtab_ahriman_service_setup___help_nargs=0
+_shtab_ahriman_service_setup___makeflags_jobs_nargs=0
+_shtab_ahriman_service_setup___no_makeflags_jobs_nargs=0
+_shtab_ahriman_service_setup___multilib_nargs=0
+_shtab_ahriman_service_setup___no_multilib_nargs=0
+_shtab_ahriman_init__h_nargs=0
+_shtab_ahriman_init___help_nargs=0
+_shtab_ahriman_init___makeflags_jobs_nargs=0
+_shtab_ahriman_init___no_makeflags_jobs_nargs=0
+_shtab_ahriman_init___multilib_nargs=0
+_shtab_ahriman_init___no_multilib_nargs=0
+_shtab_ahriman_repo_init__h_nargs=0
+_shtab_ahriman_repo_init___help_nargs=0
+_shtab_ahriman_repo_init___makeflags_jobs_nargs=0
+_shtab_ahriman_repo_init___no_makeflags_jobs_nargs=0
+_shtab_ahriman_repo_init___multilib_nargs=0
+_shtab_ahriman_repo_init___no_multilib_nargs=0
+_shtab_ahriman_repo_setup__h_nargs=0
+_shtab_ahriman_repo_setup___help_nargs=0
+_shtab_ahriman_repo_setup___makeflags_jobs_nargs=0
+_shtab_ahriman_repo_setup___no_makeflags_jobs_nargs=0
+_shtab_ahriman_repo_setup___multilib_nargs=0
+_shtab_ahriman_repo_setup___no_multilib_nargs=0
+_shtab_ahriman_setup__h_nargs=0
+_shtab_ahriman_setup___help_nargs=0
+_shtab_ahriman_setup___makeflags_jobs_nargs=0
+_shtab_ahriman_setup___no_makeflags_jobs_nargs=0
+_shtab_ahriman_setup___multilib_nargs=0
+_shtab_ahriman_setup___no_multilib_nargs=0
+_shtab_ahriman_service_shell__h_nargs=0
+_shtab_ahriman_service_shell___help_nargs=0
+_shtab_ahriman_service_shell__v_nargs=0
+_shtab_ahriman_service_shell___verbose_nargs=0
+_shtab_ahriman_shell__h_nargs=0
+_shtab_ahriman_shell___help_nargs=0
+_shtab_ahriman_shell__v_nargs=0
+_shtab_ahriman_shell___verbose_nargs=0
+_shtab_ahriman_user_add__h_nargs=0
+_shtab_ahriman_user_add___help_nargs=0
+_shtab_ahriman_user_add__s_nargs=0
+_shtab_ahriman_user_add___secure_nargs=0
+_shtab_ahriman_user_list__h_nargs=0
+_shtab_ahriman_user_list___help_nargs=0
+_shtab_ahriman_user_list__e_nargs=0
+_shtab_ahriman_user_list___exit_code_nargs=0
+_shtab_ahriman_user_remove__h_nargs=0
+_shtab_ahriman_user_remove___help_nargs=0
+_shtab_ahriman_web__h_nargs=0
+_shtab_ahriman_web___help_nargs=0
+
+
+# $1=COMP_WORDS[1]
+_shtab_compgen_files() {
+  compgen -f -- $1  # files
+}
+
+# $1=COMP_WORDS[1]
+_shtab_compgen_dirs() {
+  compgen -d -- $1  # recurse into subdirs
+}
+
+# $1=COMP_WORDS[1]
+_shtab_replace_nonword() {
+  echo "${1//[^[:word:]]/_}"
+}
+
+# set default values (called for the initial parser & any subparsers)
+_set_parser_defaults() {
+  local subparsers_var="${prefix}_subparsers[@]"
+  sub_parsers=${!subparsers_var}
+
+  local current_option_strings_var="${prefix}_option_strings[@]"
+  current_option_strings=${!current_option_strings_var}
+
+  completed_positional_actions=0
+
+  _set_new_action "pos_${completed_positional_actions}" true
+}
+
+# $1=action identifier
+# $2=positional action (bool)
+# set all identifiers for an action's parameters
+_set_new_action() {
+  current_action="${prefix}_$(_shtab_replace_nonword $1)"
+
+  local current_action_compgen_var=${current_action}_COMPGEN
+  current_action_compgen="${!current_action_compgen_var}"
+
+  local current_action_choices_var="${current_action}_choices[@]"
+  current_action_choices="${!current_action_choices_var}"
+
+  local current_action_nargs_var="${current_action}_nargs"
+  if [ -n "${!current_action_nargs_var}" ]; then
+    current_action_nargs="${!current_action_nargs_var}"
+  else
+    current_action_nargs=1
+  fi
+
+  current_action_args_start_index=$(( $word_index + 1 ))
+
+  current_action_is_positional=$2
+}
+
+# Notes:
+# `COMPREPLY`: what will be rendered after completion is triggered
+# `completing_word`: currently typed word to generate completions for
+# `${!var}`: evaluates the content of `var` and expand its content as a variable
+#     hello="world"
+#     x="hello"
+#     ${!x} -> ${hello} -> "world"
+_shtab_ahriman() {
+  local completing_word="${COMP_WORDS[COMP_CWORD]}"
+  COMPREPLY=()
+
+  prefix=_shtab_ahriman
+  word_index=0
+  _set_parser_defaults
+  word_index=1
+
+  # determine what arguments are appropriate for the current state
+  # of the arg parser
+  while [ $word_index -ne $COMP_CWORD ]; do
+    local this_word="${COMP_WORDS[$word_index]}"
+
+    if [[ -n $sub_parsers && " ${sub_parsers[@]} " =~ " ${this_word} " ]]; then
+      # valid subcommand: add it to the prefix & reset the current action
+      prefix="${prefix}_$(_shtab_replace_nonword $this_word)"
+      _set_parser_defaults
+    fi
+
+    if [[ " ${current_option_strings[@]} " =~ " ${this_word} " ]]; then
+      # a new action should be acquired (due to recognised option string or
+      # no more input expected from current action);
+      # the next positional action can fill in here
+      _set_new_action $this_word false
+    fi
+
+    if [[ "$current_action_nargs" != "*" ]] && \
+       [[ "$current_action_nargs" != "+" ]] && \
+       [[ "$current_action_nargs" != *"..." ]] && \
+       (( $word_index + 1 - $current_action_args_start_index >= \
+          $current_action_nargs )); then
+      $current_action_is_positional && let "completed_positional_actions += 1"
+      _set_new_action "pos_${completed_positional_actions}" true
+    fi
+
+    let "word_index+=1"
+  done
+
+  # Generate the completions
+
+  if [[ "${completing_word}" == -* ]]; then
+    # optional argument started: use option strings
+    COMPREPLY=( $(compgen -W "${current_option_strings[*]}" -- "${completing_word}") )
+  else
+    # use choices & compgen
+    local IFS=$'\n' # items may contain spaces, so delimit using newline
+    COMPREPLY=( $([ -n "${current_action_compgen}" ] \
+                  && "${current_action_compgen}" "${completing_word}") )
+    unset IFS
+    COMPREPLY+=( $(compgen -W "${current_action_choices[*]}" -- "${completing_word}") )
+  fi
+
+  return 0
+}
+
+complete -o filenames -F _shtab_ahriman ahriman

docs/completions/zsh/_ahriman

@@ -0,0 +1,638 @@
+#compdef ahriman
+
+# AUTOMATICALLY GENERATED by `shtab`
+
+
+_shtab_ahriman_commands() {
+  local _commands=(
+    "add:add existing or new package to the build queue"
+    "aur-search:search for package in AUR using API"
+    "check:check for packages updates. Same as repo-update --dry-run --no-manual"
+    "clean:remove local caches"
+    "config:dump configuration for the specified architecture"
+    "config-validate:validate configuration and print found errors"
+    "daemon:start process which periodically will run update process"
+    "help:show help message for application or command and exit"
+    "help-commands-unsafe:list unsafe commands as defined in default args"
+    "help-updates:request AUR for current version and compare with current service version"
+    "help-version:print application and its dependencies versions"
+    "init:create initial service configuration, requires root"
+    "key-import:import PGP key from public sources to the repository user"
+    "package-add:add existing or new package to the build queue"
+    "package-remove:remove package from the repository"
+    "package-status:request status of the package"
+    "package-status-remove:remove the package from the status page"
+    "package-status-update:update package status on the status page"
+    "package-update:add existing or new package to the build queue"
+    "patch-add:create or update patched PKGBUILD function or variable"
+    "patch-list:list available patches for the package"
+    "patch-remove:remove patches for the package"
+    "patch-set-add:create or update source patches"
+    "rebuild:force rebuild whole repository"
+    "remove:remove package from the repository"
+    "remove-unknown:remove packages which are missing in AUR and do not have local PKGBUILDs"
+    "repo-backup:backup repository settings and database"
+    "repo-check:check for packages updates. Same as repo-update --dry-run --no-manual"
+    "repo-clean:remove local caches"
+    "repo-config:dump configuration for the specified architecture"
+    "repo-config-validate:validate configuration and print found errors"
+    "repo-daemon:start process which periodically will run update process"
+    "repo-init:create initial service configuration, requires root"
+    "repo-rebuild:force rebuild whole repository"
+    "repo-remove-unknown:remove packages which are missing in AUR and do not have local PKGBUILDs"
+    "repo-report:generate repository report according to current settings"
+    "repo-restore:restore settings and database"
+    "repo-setup:create initial service configuration, requires root"
+    "repo-sign:(re-)sign packages and repository database according to current settings"
+    "repo-status-update:update repository status on the status page"
+    "repo-sync:sync repository files to remote server according to current settings"
+    "repo-tree:dump repository tree based on packages dependencies"
+    "repo-triggers:run triggers on empty build result as configured by settings"
+    "repo-update:check for packages updates and run build process if requested"
+    "report:generate repository report according to current settings"
+    "search:search for package in AUR using API"
+    "service-clean:remove local caches"
+    "service-config:dump configuration for the specified architecture"
+    "service-config-validate:validate configuration and print found errors"
+    "service-key-import:import PGP key from public sources to the repository user"
+    "service-setup:create initial service configuration, requires root"
+    "service-shell:drop into python shell while having created application"
+    "setup:create initial service configuration, requires root"
+    "shell:drop into python shell while having created application"
+    "sign:(re-)sign packages and repository database according to current settings"
+    "status:request status of the package"
+    "status-update:update package status on the status page"
+    "sync:sync repository files to remote server according to current settings"
+    "update:check for packages updates and run build process if requested"
+    "user-add:update user for web services with the given password and role. In case if password was not entered it will be asked interactively"
+    "user-list:list users from the user mapping and their roles"
+    "user-remove:remove user from the user mapping and update the configuration"
+    "version:print application and its dependencies versions"
+    "web:start web server"
+  )
+  _describe 'ahriman commands' _commands
+}
+
+_shtab_ahriman_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "*"{-a,--architecture}"[target architectures. For several subcommands it can be used multiple times]:architecture:"
+  {-c,--configuration}"[configuration path]:configuration:"
+  "--force[force run, remove file lock]"
+  {-l,--lock}"[lock file]:lock:"
+  {--report,--no-report}"[force enable or disable reporting to web service]:report:"
+  {-q,--quiet}"[force disable any logging]"
+  "--unsafe[allow to run ahriman as non-ahriman user. Some actions might be unavailable]"
+  "(- : *)"{-V,--version}"[show program\'s version number and exit]"
+)
+
+_shtab_ahriman_add_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {--dependencies,--no-dependencies}"[process missing package dependencies]:dependencies:"
+  {-e,--exit-code}"[return non-zero exit status if result is empty]"
+  {-n,--now}"[run update function after]"
+  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date]"
+  {-s,--source}"[explicitly specify the package source for this command]:source:(auto archive aur directory local remote repository)"
+  "(*):package source (base name, path to local files, remote URL):"
+)
+
+_shtab_ahriman_aur_search_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {-e,--exit-code}"[return non-zero exit status if result is empty]"
+  {--info,--no-info}"[show additional package information]:info:"
+  "--sort-by[sort field by this field. In case if two packages have the same value of the specified field, they will be always sorted by name]:sort_by:(description first_submitted id last_modified maintainer name num_votes out_of_date package_base package_base_id popularity repository submitter url url_path version)"
+  "(*):search terms, can be specified multiple times, the result will match all terms:"
+)
+
+_shtab_ahriman_check_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {-e,--exit-code}"[return non-zero exit status if result is empty]"
+  {--vcs,--no-vcs}"[fetch actual version of VCS packages]:vcs:"
+  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date]"
+  "(*)::filter check by package base:"
+)
+
+_shtab_ahriman_clean_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {--cache,--no-cache}"[clear directory with package caches]:cache:"
+  {--chroot,--no-chroot}"[clear build chroot]:chroot:"
+  {--manual,--no-manual}"[clear manually added packages queue]:manual:"
+  {--packages,--no-packages}"[clear directory with built packages]:packages:"
+  {--pacman,--no-pacman}"[clear directory with pacman local database cache]:pacman:"
+)
+
+_shtab_ahriman_config_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {--secure,--no-secure}"[hide passwords and secrets from output]:secure:"
+)
+
+_shtab_ahriman_config_validate_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {-e,--exit-code}"[return non-zero exit status if configuration is invalid]"
+)
+
+_shtab_ahriman_daemon_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {-i,--interval}"[interval between runs in seconds]:interval:"
+  {--aur,--no-aur}"[enable or disable checking for AUR updates]:aur:"
+  {--dependencies,--no-dependencies}"[process missing package dependencies]:dependencies:"
+  {--local,--no-local}"[enable or disable checking of local packages for updates]:local:"
+  {--manual,--no-manual}"[include or exclude manual updates]:manual:"
+  {--vcs,--no-vcs}"[fetch actual version of VCS packages]:vcs:"
+  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date]"
+)
+
+_shtab_ahriman_help_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  ":show help message for specific command:"
+)
+
+_shtab_ahriman_help_commands_unsafe_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "--command[instead of showing commands, just test command line for unsafe subcommand and return 0 in case if command is safe and 1 otherwise]:command:"
+)
+
+_shtab_ahriman_help_updates_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {-e,--exit-code}"[return non-zero exit code if updates available]"
+)
+
+_shtab_ahriman_help_version_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+)
+
+_shtab_ahriman_init_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "--build-as-user[force makepkg user to the specific one]:build_as_user:"
+  "--build-command[build command prefix]:build_command:"
+  "--from-configuration[path to default devtools pacman configuration]:from_configuration:"
+  {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores]:makeflags_jobs:"
+  "--mirror[use the specified explicitly mirror instead of including mirrorlist]:mirror:"
+  {--multilib,--no-multilib}"[add or do not multilib repository]:multilib:"
+  "--packager[packager name and email]:packager:"
+  "--repository[repository name]:repository:"
+  "--sign-key[sign key id]:sign_key:"
+  "*--sign-target[sign options]:sign_target:(disabled packages repository)"
+  "--web-port[port of the web service]:web_port:"
+  "--web-unix-socket[path to unix socket used for interprocess communications]:web_unix_socket:"
+)
+
+_shtab_ahriman_key_import_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "--key-server[key server for key import]:key_server:"
+  ":PGP key to import from public server:"
+)
+
+_shtab_ahriman_package_add_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {--dependencies,--no-dependencies}"[process missing package dependencies]:dependencies:"
+  {-e,--exit-code}"[return non-zero exit status if result is empty]"
+  {-n,--now}"[run update function after]"
+  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date]"
+  {-s,--source}"[explicitly specify the package source for this command]:source:(auto archive aur directory local remote repository)"
+  "(*):package source (base name, path to local files, remote URL):"
+)
+
+_shtab_ahriman_package_remove_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "(*):package name or base:"
+)
+
+_shtab_ahriman_package_status_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "--ahriman[get service status itself]"
+  {-e,--exit-code}"[return non-zero exit status if result is empty]"
+  {--info,--no-info}"[show additional package information]:info:"
+  {-s,--status}"[filter packages by status]:status:(unknown pending building failed success)"
+  "(*)::filter status by package base:"
+)
+
+_shtab_ahriman_package_status_remove_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "(*):remove specified packages from status page:"
+)
+
+_shtab_ahriman_package_status_update_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {-s,--status}"[new package build status]:status:(unknown pending building failed success)"
+  "(*)::set status for specified packages. If no packages supplied, service status will be updated:"
+)
+
+_shtab_ahriman_package_update_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {--dependencies,--no-dependencies}"[process missing package dependencies]:dependencies:"
+  {-e,--exit-code}"[return non-zero exit status if result is empty]"
+  {-n,--now}"[run update function after]"
+  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date]"
+  {-s,--source}"[explicitly specify the package source for this command]:source:(auto archive aur directory local remote repository)"
+  "(*):package source (base name, path to local files, remote URL):"
+)
+
+_shtab_ahriman_patch_add_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  ":package base:"
+  ":PKGBUILD variable or function name. If variable is a function, it must end with ():"
+  ":path to file which contains function or variable value. If not set, the value will be read from stdin:"
+)
+
+_shtab_ahriman_patch_list_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {-e,--exit-code}"[return non-zero exit status if result is empty]"
+  "*"{-v,--variable}"[if set, show only patches for specified PKGBUILD variables]:variable:"
+  ":package base:"
+)
+
+_shtab_ahriman_patch_remove_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "*"{-v,--variable}"[should be used for single-function patches in case if you wold like to remove only specified PKGBUILD variables. In case if not set, it will remove all patches related to the package]:variable:"
+  ":package base:"
+)
+
+_shtab_ahriman_patch_set_add_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "*"{-t,--track}"[files which has to be tracked]:track:"
+  ":path to directory with changed files for patch addition\/update:"
+)
+
+_shtab_ahriman_rebuild_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "*--depends-on[only rebuild packages that depend on specified packages]:depends_on:"
+  "--dry-run[just perform check for packages without rebuild process itself]"
+  "--from-database[read packages from database instead of filesystem. This feature in particular is required in case if you would like to restore repository from another repository instance. Note, however, that in order to restore packages you need to have original ahriman instance run with web service and have run repo-update at least once.]"
+  {-e,--exit-code}"[return non-zero exit status if result is empty]"
+)
+
+_shtab_ahriman_remove_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "(*):package name or base:"
+)
+
+_shtab_ahriman_remove_unknown_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "--dry-run[just perform check for packages without removal]"
+)
+
+_shtab_ahriman_repo_backup_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  ":path of the output archive:"
+)
+
+_shtab_ahriman_repo_check_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {-e,--exit-code}"[return non-zero exit status if result is empty]"
+  {--vcs,--no-vcs}"[fetch actual version of VCS packages]:vcs:"
+  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date]"
+  "(*)::filter check by package base:"
+)
+
+_shtab_ahriman_repo_clean_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {--cache,--no-cache}"[clear directory with package caches]:cache:"
+  {--chroot,--no-chroot}"[clear build chroot]:chroot:"
+  {--manual,--no-manual}"[clear manually added packages queue]:manual:"
+  {--packages,--no-packages}"[clear directory with built packages]:packages:"
+  {--pacman,--no-pacman}"[clear directory with pacman local database cache]:pacman:"
+)
+
+_shtab_ahriman_repo_config_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {--secure,--no-secure}"[hide passwords and secrets from output]:secure:"
+)
+
+_shtab_ahriman_repo_config_validate_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {-e,--exit-code}"[return non-zero exit status if configuration is invalid]"
+)
+
+_shtab_ahriman_repo_daemon_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {-i,--interval}"[interval between runs in seconds]:interval:"
+  {--aur,--no-aur}"[enable or disable checking for AUR updates]:aur:"
+  {--dependencies,--no-dependencies}"[process missing package dependencies]:dependencies:"
+  {--local,--no-local}"[enable or disable checking of local packages for updates]:local:"
+  {--manual,--no-manual}"[include or exclude manual updates]:manual:"
+  {--vcs,--no-vcs}"[fetch actual version of VCS packages]:vcs:"
+  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date]"
+)
+
+_shtab_ahriman_repo_init_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "--build-as-user[force makepkg user to the specific one]:build_as_user:"
+  "--build-command[build command prefix]:build_command:"
+  "--from-configuration[path to default devtools pacman configuration]:from_configuration:"
+  {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores]:makeflags_jobs:"
+  "--mirror[use the specified explicitly mirror instead of including mirrorlist]:mirror:"
+  {--multilib,--no-multilib}"[add or do not multilib repository]:multilib:"
+  "--packager[packager name and email]:packager:"
+  "--repository[repository name]:repository:"
+  "--sign-key[sign key id]:sign_key:"
+  "*--sign-target[sign options]:sign_target:(disabled packages repository)"
+  "--web-port[port of the web service]:web_port:"
+  "--web-unix-socket[path to unix socket used for interprocess communications]:web_unix_socket:"
+)
+
+_shtab_ahriman_repo_rebuild_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "*--depends-on[only rebuild packages that depend on specified packages]:depends_on:"
+  "--dry-run[just perform check for packages without rebuild process itself]"
+  "--from-database[read packages from database instead of filesystem. This feature in particular is required in case if you would like to restore repository from another repository instance. Note, however, that in order to restore packages you need to have original ahriman instance run with web service and have run repo-update at least once.]"
+  {-e,--exit-code}"[return non-zero exit status if result is empty]"
+)
+
+_shtab_ahriman_repo_remove_unknown_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "--dry-run[just perform check for packages without removal]"
+)
+
+_shtab_ahriman_repo_report_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+)
+
+_shtab_ahriman_repo_restore_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {-o,--output}"[root path of the extracted files]:output:"
+  ":path of the input archive:"
+)
+
+_shtab_ahriman_repo_setup_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "--build-as-user[force makepkg user to the specific one]:build_as_user:"
+  "--build-command[build command prefix]:build_command:"
+  "--from-configuration[path to default devtools pacman configuration]:from_configuration:"
+  {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores]:makeflags_jobs:"
+  "--mirror[use the specified explicitly mirror instead of including mirrorlist]:mirror:"
+  {--multilib,--no-multilib}"[add or do not multilib repository]:multilib:"
+  "--packager[packager name and email]:packager:"
+  "--repository[repository name]:repository:"
+  "--sign-key[sign key id]:sign_key:"
+  "*--sign-target[sign options]:sign_target:(disabled packages repository)"
+  "--web-port[port of the web service]:web_port:"
+  "--web-unix-socket[path to unix socket used for interprocess communications]:web_unix_socket:"
+)
+
+_shtab_ahriman_repo_sign_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "(*)::sign only specified packages:"
+)
+
+_shtab_ahriman_repo_status_update_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {-s,--status}"[new status]:status:(unknown pending building failed success)"
+)
+
+_shtab_ahriman_repo_sync_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+)
+
+_shtab_ahriman_repo_tree_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+)
+
+_shtab_ahriman_repo_triggers_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "(*)::instead of running all triggers as set by configuration, just process specified ones in order of mention:"
+)
+
+_shtab_ahriman_repo_update_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {--aur,--no-aur}"[enable or disable checking for AUR updates]:aur:"
+  {--dependencies,--no-dependencies}"[process missing package dependencies]:dependencies:"
+  "--dry-run[just perform check for updates, same as check command]"
+  {-e,--exit-code}"[return non-zero exit status if result is empty]"
+  {--local,--no-local}"[enable or disable checking of local packages for updates]:local:"
+  {--manual,--no-manual}"[include or exclude manual updates]:manual:"
+  {--vcs,--no-vcs}"[fetch actual version of VCS packages]:vcs:"
+  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date]"
+  "(*)::filter check by package base:"
+)
+
+_shtab_ahriman_report_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+)
+
+_shtab_ahriman_search_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {-e,--exit-code}"[return non-zero exit status if result is empty]"
+  {--info,--no-info}"[show additional package information]:info:"
+  "--sort-by[sort field by this field. In case if two packages have the same value of the specified field, they will be always sorted by name]:sort_by:(description first_submitted id last_modified maintainer name num_votes out_of_date package_base package_base_id popularity repository submitter url url_path version)"
+  "(*):search terms, can be specified multiple times, the result will match all terms:"
+)
+
+_shtab_ahriman_service_clean_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {--cache,--no-cache}"[clear directory with package caches]:cache:"
+  {--chroot,--no-chroot}"[clear build chroot]:chroot:"
+  {--manual,--no-manual}"[clear manually added packages queue]:manual:"
+  {--packages,--no-packages}"[clear directory with built packages]:packages:"
+  {--pacman,--no-pacman}"[clear directory with pacman local database cache]:pacman:"
+)
+
+_shtab_ahriman_service_config_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {--secure,--no-secure}"[hide passwords and secrets from output]:secure:"
+)
+
+_shtab_ahriman_service_config_validate_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {-e,--exit-code}"[return non-zero exit status if configuration is invalid]"
+)
+
+_shtab_ahriman_service_key_import_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "--key-server[key server for key import]:key_server:"
+  ":PGP key to import from public server:"
+)
+
+_shtab_ahriman_service_setup_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "--build-as-user[force makepkg user to the specific one]:build_as_user:"
+  "--build-command[build command prefix]:build_command:"
+  "--from-configuration[path to default devtools pacman configuration]:from_configuration:"
+  {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores]:makeflags_jobs:"
+  "--mirror[use the specified explicitly mirror instead of including mirrorlist]:mirror:"
+  {--multilib,--no-multilib}"[add or do not multilib repository]:multilib:"
+  "--packager[packager name and email]:packager:"
+  "--repository[repository name]:repository:"
+  "--sign-key[sign key id]:sign_key:"
+  "*--sign-target[sign options]:sign_target:(disabled packages repository)"
+  "--web-port[port of the web service]:web_port:"
+  "--web-unix-socket[path to unix socket used for interprocess communications]:web_unix_socket:"
+)
+
+_shtab_ahriman_service_shell_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  ":instead of dropping into shell, just execute the specified code:"
+)
+
+_shtab_ahriman_setup_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "--build-as-user[force makepkg user to the specific one]:build_as_user:"
+  "--build-command[build command prefix]:build_command:"
+  "--from-configuration[path to default devtools pacman configuration]:from_configuration:"
+  {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores]:makeflags_jobs:"
+  "--mirror[use the specified explicitly mirror instead of including mirrorlist]:mirror:"
+  {--multilib,--no-multilib}"[add or do not multilib repository]:multilib:"
+  "--packager[packager name and email]:packager:"
+  "--repository[repository name]:repository:"
+  "--sign-key[sign key id]:sign_key:"
+  "*--sign-target[sign options]:sign_target:(disabled packages repository)"
+  "--web-port[port of the web service]:web_port:"
+  "--web-unix-socket[path to unix socket used for interprocess communications]:web_unix_socket:"
+)
+
+_shtab_ahriman_shell_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  ":instead of dropping into shell, just execute the specified code:"
+)
+
+_shtab_ahriman_sign_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "(*)::sign only specified packages:"
+)
+
+_shtab_ahriman_status_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  "--ahriman[get service status itself]"
+  {-e,--exit-code}"[return non-zero exit status if result is empty]"
+  {--info,--no-info}"[show additional package information]:info:"
+  {-s,--status}"[filter packages by status]:status:(unknown pending building failed success)"
+  "(*)::filter status by package base:"
+)
+
+_shtab_ahriman_status_update_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {-s,--status}"[new package build status]:status:(unknown pending building failed success)"
+  "(*)::set status for specified packages. If no packages supplied, service status will be updated:"
+)
+
+_shtab_ahriman_sync_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+)
+
+_shtab_ahriman_update_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {--aur,--no-aur}"[enable or disable checking for AUR updates]:aur:"
+  {--dependencies,--no-dependencies}"[process missing package dependencies]:dependencies:"
+  "--dry-run[just perform check for updates, same as check command]"
+  {-e,--exit-code}"[return non-zero exit status if result is empty]"
+  {--local,--no-local}"[enable or disable checking of local packages for updates]:local:"
+  {--manual,--no-manual}"[include or exclude manual updates]:manual:"
+  {--vcs,--no-vcs}"[fetch actual version of VCS packages]:vcs:"
+  "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date]"
+  "(*)::filter check by package base:"
+)
+
+_shtab_ahriman_user_add_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {-p,--password}"[user password. Blank password will be treated as empty password, which is in particular must be used for OAuth2 authorization type.]:password:"
+  {-r,--role}"[user access level]:role:(unauthorized read reporter full)"
+  {-s,--secure}"[set file permissions to user-only]"
+  ":username for web service:"
+)
+
+_shtab_ahriman_user_list_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  {-e,--exit-code}"[return non-zero exit status if result is empty]"
+  {-r,--role}"[filter users by role]:role:(unauthorized read reporter full)"
+  ":filter users by username:"
+)
+
+_shtab_ahriman_user_remove_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+  ":username for web service:"
+)
+
+_shtab_ahriman_version_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+)
+
+_shtab_ahriman_web_options=(
+  "(- : *)"{-h,--help}"[show this help message and exit]"
+)
+
+
+_shtab_ahriman() {
+  local context state line curcontext="$curcontext" one_or_more='(-)*' remainder='(*)'
+
+  if ((${_shtab_ahriman_options[(I)${(q)one_or_more}*]} + ${_shtab_ahriman_options[(I)${(q)remainder}*]} == 0)); then  # noqa: E501
+    _shtab_ahriman_options+=(': :_shtab_ahriman_commands' '*::: :->ahriman')
+  fi
+  _arguments -C $_shtab_ahriman_options
+
+  case $state in
+    ahriman)
+      words=($line[1] "${words[@]}")
+      (( CURRENT += 1 ))
+      curcontext="${curcontext%:*:*}:_shtab_ahriman-$line[1]:"
+      case $line[1] in
+        add) _arguments -C $_shtab_ahriman_add_options ;;
+        aur-search) _arguments -C $_shtab_ahriman_aur_search_options ;;
+        check) _arguments -C $_shtab_ahriman_check_options ;;
+        clean) _arguments -C $_shtab_ahriman_clean_options ;;
+        config) _arguments -C $_shtab_ahriman_config_options ;;
+        config-validate) _arguments -C $_shtab_ahriman_config_validate_options ;;
+        daemon) _arguments -C $_shtab_ahriman_daemon_options ;;
+        help) _arguments -C $_shtab_ahriman_help_options ;;
+        help-commands-unsafe) _arguments -C $_shtab_ahriman_help_commands_unsafe_options ;;
+        help-updates) _arguments -C $_shtab_ahriman_help_updates_options ;;
+        help-version) _arguments -C $_shtab_ahriman_help_version_options ;;
+        init) _arguments -C $_shtab_ahriman_init_options ;;
+        key-import) _arguments -C $_shtab_ahriman_key_import_options ;;
+        package-add) _arguments -C $_shtab_ahriman_package_add_options ;;
+        package-remove) _arguments -C $_shtab_ahriman_package_remove_options ;;
+        package-status) _arguments -C $_shtab_ahriman_package_status_options ;;
+        package-status-remove) _arguments -C $_shtab_ahriman_package_status_remove_options ;;
+        package-status-update) _arguments -C $_shtab_ahriman_package_status_update_options ;;
+        package-update) _arguments -C $_shtab_ahriman_package_update_options ;;
+        patch-add) _arguments -C $_shtab_ahriman_patch_add_options ;;
+        patch-list) _arguments -C $_shtab_ahriman_patch_list_options ;;
+        patch-remove) _arguments -C $_shtab_ahriman_patch_remove_options ;;
+        patch-set-add) _arguments -C $_shtab_ahriman_patch_set_add_options ;;
+        rebuild) _arguments -C $_shtab_ahriman_rebuild_options ;;
+        remove) _arguments -C $_shtab_ahriman_remove_options ;;
+        remove-unknown) _arguments -C $_shtab_ahriman_remove_unknown_options ;;
+        repo-backup) _arguments -C $_shtab_ahriman_repo_backup_options ;;
+        repo-check) _arguments -C $_shtab_ahriman_repo_check_options ;;
+        repo-clean) _arguments -C $_shtab_ahriman_repo_clean_options ;;
+        repo-config) _arguments -C $_shtab_ahriman_repo_config_options ;;
+        repo-config-validate) _arguments -C $_shtab_ahriman_repo_config_validate_options ;;
+        repo-daemon) _arguments -C $_shtab_ahriman_repo_daemon_options ;;
+        repo-init) _arguments -C $_shtab_ahriman_repo_init_options ;;
+        repo-rebuild) _arguments -C $_shtab_ahriman_repo_rebuild_options ;;
+        repo-remove-unknown) _arguments -C $_shtab_ahriman_repo_remove_unknown_options ;;
+        repo-report) _arguments -C $_shtab_ahriman_repo_report_options ;;
+        repo-restore) _arguments -C $_shtab_ahriman_repo_restore_options ;;
+        repo-setup) _arguments -C $_shtab_ahriman_repo_setup_options ;;
+        repo-sign) _arguments -C $_shtab_ahriman_repo_sign_options ;;
+        repo-status-update) _arguments -C $_shtab_ahriman_repo_status_update_options ;;
+        repo-sync) _arguments -C $_shtab_ahriman_repo_sync_options ;;
+        repo-tree) _arguments -C $_shtab_ahriman_repo_tree_options ;;
+        repo-triggers) _arguments -C $_shtab_ahriman_repo_triggers_options ;;
+        repo-update) _arguments -C $_shtab_ahriman_repo_update_options ;;
+        report) _arguments -C $_shtab_ahriman_report_options ;;
+        search) _arguments -C $_shtab_ahriman_search_options ;;
+        service-clean) _arguments -C $_shtab_ahriman_service_clean_options ;;
+        service-config) _arguments -C $_shtab_ahriman_service_config_options ;;
+        service-config-validate) _arguments -C $_shtab_ahriman_service_config_validate_options ;;
+        service-key-import) _arguments -C $_shtab_ahriman_service_key_import_options ;;
+        service-setup) _arguments -C $_shtab_ahriman_service_setup_options ;;
+        service-shell) _arguments -C $_shtab_ahriman_service_shell_options ;;
+        setup) _arguments -C $_shtab_ahriman_setup_options ;;
+        shell) _arguments -C $_shtab_ahriman_shell_options ;;
+        sign) _arguments -C $_shtab_ahriman_sign_options ;;
+        status) _arguments -C $_shtab_ahriman_status_options ;;
+        status-update) _arguments -C $_shtab_ahriman_status_update_options ;;
+        sync) _arguments -C $_shtab_ahriman_sync_options ;;
+        update) _arguments -C $_shtab_ahriman_update_options ;;
+        user-add) _arguments -C $_shtab_ahriman_user_add_options ;;
+        user-list) _arguments -C $_shtab_ahriman_user_list_options ;;
+        user-remove) _arguments -C $_shtab_ahriman_user_remove_options ;;
+        version) _arguments -C $_shtab_ahriman_version_options ;;
+        web) _arguments -C $_shtab_ahriman_web_options ;;
+      esac
+  esac
+}
+
+
+
+typeset -A opt_args
+_shtab_ahriman "$@"

docs/conf.py

@@ -25,27 +25,17 @@ sys.path.insert(0, str(basedir))
 on_rtd = os.environ.get("READTHEDOCS", None) == "True"
 
 for module in (
-        "aioauth_client",
-        "aiohttp",
-        "aiohttp.web",
-        "aiohttp.web_exceptions",
-        "aiohttp.web_response",
-        "aiohttp.web_urldispatcher",
-        "aiohttp_jinja2",
-        "aiohttp_security",
-        "aiohttp_session",
-        "aiohttp_session.cookie_storage",
-        "boto3",
-        "cryptography",
         "pyalpm",
 ):
+    if module in sys.modules:
+        continue
     sys.modules[module] = mock.Mock()
 
 
 # -- Project information -----------------------------------------------------
 
 project = "ahriman"
-copyright = "2021-2022, ahriman team"
+copyright = "2021-2023, ahriman team"
 author = "ahriman team"
 
 # The full version, including alpha/beta/rc tags
@@ -89,7 +79,7 @@ html_theme = "default" if on_rtd else "alabaster"
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ["_static"]
+html_static_path = []
 
 add_module_names = False
 

docs/configuration.rst

@@ -12,6 +12,14 @@ There are two variable types which have been added to default ones, they are pat
 
 Path values, except for casting to ``pathlib.Path`` type, will be also expanded to absolute paths relative to the configuration path. E.g. if path is set to ``ahriman.ini.d/logging.ini`` and root configuration path is ``/etc/ahriman.ini``, the value will be expanded to ``/etc/ahriman.ini.d/logging.ini``. In order to disable path expand, use the full path, e.g. ``/etc/ahriman.ini.d/logging.ini``.
 
+There is also additional subcommand which will allow to validate configuration and print found errors. In order to do so, run ``service-config-validate`` subcommand, e.g.:
+
+.. code-block:: shell
+
+   ahriman -a x86_64 service-config-validate
+
+It will check current settings on common errors and compare configuration with known schema.
+
 ``settings`` group
 ------------------
 
@@ -20,11 +28,12 @@ Base configuration settings.
 * ``include`` - path to directory with configuration files overrides, string, required.
 * ``database`` - path to SQLite database, string, required.
 * ``logging`` - path to logging configuration, string, required. Check ``logging.ini`` for reference.
+* ``suppress_http_log_errors`` - suppress http log errors, boolean, optional, default ``no``. If set to ``yes``, any http log errors (e.g. if web server is not available, but http logging is enabled) will be suppressed.
 
 ``alpm`` group
 --------------
 
-libalpm and AUR related configuration.
+libalpm and AUR related configuration. Group name can refer to architecture, e.g. ``alpm:x86_64`` can be used for x86_64 architecture specific settings.
 
 * ``database`` - path to pacman system database cache, string, required.
 * ``mirror`` - package database mirror used by pacman for syncronization, string, required. This option supports standard pacman substitutions with ``$arch`` and ``$repo``. Note that the mentioned mirror should contain all repositories which are set by ``alpm.repositories`` option.
@@ -41,10 +50,11 @@ Base authorization settings. ``OAuth`` provider requires ``aioauth-client`` libr
 * ``allow_read_only`` - allow requesting status APIs without authorization, boolean, required.
 * ``client_id`` - OAuth2 application client ID, string, required in case if ``oauth`` is used.
 * ``client_secret`` - OAuth2 application client secret key, string, required in case if ``oauth`` is used.
+* ``cookie_secret_key`` - secret key which will be used for cookies encryption, string, optional. It must be 32 url-safe base64-encoded bytes and can be generated as following ``base64.urlsafe_b64encode(os.urandom(32)).decode("utf8")``. If not set, it will be generated automatically; note, however, that in this case, all sessions will be automatically expired during restart.
 * ``max_age`` - parameter which controls both cookie expiration and token expiration inside the service, integer, optional, default is 7 days.
 * ``oauth_provider`` - OAuth2 provider class name as is in ``aioauth-client`` (e.g. ``GoogleClient``, ``GithubClient`` etc), string, required in case if ``oauth`` is used.
 * ``oauth_scopes`` - scopes list for OAuth2 provider, which will allow retrieving user email (which is used for checking user permissions), e.g. ``https://www.googleapis.com/auth/userinfo.email`` for ``GoogleClient`` or ``user:email`` for ``GithubClient``, space separated list of strings, required in case if ``oauth`` is used.
-* ``salt`` - password hash salt, string, required in case if authorization enabled (automatically generated by ``create-user`` subcommand).
+* ``salt`` - password hash salt, string, required in case if authorization enabled (automatically generated by ``user-add`` subcommand).
 
 Authorized users are stored inside internal database, if any of external provides are used the password field for non-service users must be empty. 
 
@@ -59,6 +69,7 @@ Build related configuration. Group name can refer to architecture, e.g. ``build:
 * ``makepkg_flags`` - additional flags passed to ``makepkg`` command, space separated list of strings, optional.
 * ``makechrootpkg_flags`` - additional flags passed to ``makechrootpkg`` command, space separated list of strings, optional.
 * ``triggers`` - list of ``ahriman.core.triggers.Trigger`` class implementation (e.g. ``ahriman.core.report.ReportTrigger ahriman.core.upload.UploadTrigger``) which will be loaded and run at the end of processing, space separated list of strings, optional. You can also specify triggers by their paths, e.g. ``/usr/lib/python3.10/site-packages/ahriman/core/report/report.py.ReportTrigger``. Triggers are run in the order of mention.
+* ``vcs_allowed_age`` - maximal age in seconds of the VCS packages before their version will be updated with its remote source, int, optional, default ``604800``.
 
 ``repository`` group
 --------------------
@@ -77,12 +88,36 @@ Settings for signing packages or repository. Group name can refer to architectur
 * ``key`` - default PGP key, string, required. This key will also be used for database signing if enabled.
 * ``key_*`` settings - PGP key which will be used for specific packages, string, optional. For example, if there is ``key_yay`` option the specified key will be used for yay package and default key for others.
 
+``web:*`` groups
+----------------
+
+Web server settings. If any of ``host``/``port`` is not set, web integration will be disabled. Group name can refer to architecture, e.g. ``web:x86_64`` can be used for x86_64 architecture specific settings. This feature requires ``aiohttp`` libraries to be installed.
+
+* ``address`` - optional address in form ``proto://host:port`` (``port`` can be omitted in case of default ``proto`` ports), will be used instead of ``http://{host}:{port}`` in case if set, string, optional. This option is required in case if ``OAuth`` provider is used.
+* ``debug`` - enable debug toolbar, boolean, optional, default ``no``.
+* ``debug_check_host`` - check hosts to access debug toolbar, boolean, optional, default ``no``.
+* ``debug_allowed_hosts`` - allowed hosts to get access to debug toolbar, space separated list of string, optional.
+* ``host`` - host to bind, string, optional.
+* ``index_url`` - full url of the repository index page, string, optional.
+* ``password`` - password to authorize in web service in order to update service status, string, required in case if authorization enabled.
+* ``port`` - port to bind, int, optional.
+* ``static_path`` - path to directory with static files, string, required.
+* ``templates`` - path to templates directory, string, required.
+* ``unix_socket`` - path to the listening unix socket, string, optional. If set, server will create the socket on the specified address which can (and will) be used by application. Note, that unlike usual host/port configuration, unix socket allows to perform requests without authorization.
+* ``unix_socket_unsafe`` - set unsafe (o+w) permissions to unix socket, boolean, optional, default ``yes``. This option is enabled by default, because it is supposed that unix socket is created in safe environment (only web service is supposed to be used in unsafe), but it can be disabled by configuration.
+* ``username`` - username to authorize in web service in order to update service status, string, required in case if authorization enabled.
+
 ``remote-pull`` group
 ---------------------
 
 Remote git source synchronization settings. Unlike ``Upload`` triggers those triggers are used for PKGBUILD synchronization - fetch from remote repository PKGBUILDs before updating process.
 
-It supports authorization; to do so you'd need to prefix the url with authorization part, e.g. ``https://key:token@github.com/arcan1s/ahriman.git``. It is highly recommended to use application tokens instead of your user authorization details.
+It supports authorization; to do so you'd need to prefix the url with authorization part, e.g. ``https://key:token@github.com/arcan1s/ahriman.git``. It is highly recommended to use application tokens instead of your user authorization details. Alternatively, you can use any other option supported by git, e.g.:
+
+* by SSH key: generate SSH key as ``ahriman`` user and put public part of it to the repository keys.
+* by git credentials helper: consult with the `related man page <https://git-scm.com/docs/gitcredentials>`_.
+
+Available options are:
 
 * ``target`` - list of remote pull triggers to be used, space separated list of strings, optional, defaults to ``gitremote``. It must point to valid section (or to section with architecture), e.g. ``gitremote`` must point to either ``gitremote`` or ``gitremote:x86_64`` (the one with architecture has higher priority).
 
@@ -97,7 +132,12 @@ Remote pull trigger
 
 Remote git source synchronization settings. Same as remote pull triggers those triggers are used for PKGBUILD synchronization - push updated PKGBUILDs to the remote repository after build process.
 
-It supports authorization; to do so you'd need to prefix the url with authorization part, e.g. ``https://key:token@github.com/arcan1s/ahriman.git``. It is highly recommended to use application tokens instead of your user authorization details.
+It supports authorization; to do so you'd need to prefix the url with authorization part, e.g. ``https://key:token@github.com/arcan1s/ahriman.git``. It is highly recommended to use application tokens instead of your user authorization details. Alternatively, you can use any other option supported by git, e.g.:
+
+* by SSH key: generate SSH key as ``ahriman`` user and put public part of it to the repository keys.
+* by git credentials helper: consult with the `related man page <https://git-scm.com/docs/gitcredentials>`_.
+
+Available options are:
 
 * ``target`` - list of remote push triggers to be used, space separated list of strings, optional, defaults to ``gitremote``. It must point to valid section (or to section with architecture), e.g. ``gitremote`` must point to either ``gitremote`` or ``gitremote:x86_64`` (the one with architecture has higher priority).
 
@@ -115,7 +155,7 @@ Report generation settings.
 
 * ``target`` - list of reports to be generated, space separated list of strings, required. It must point to valid section (or to section with architecture), e.g. ``somerandomname`` must point to existing section, ``email`` must point to either ``email`` or ``email:x86_64`` (the one with architecture has higher priority).
 
-Type will be read from several ways:
+Type will be read from several sources:
 
 * In case if ``type`` option set inside the section, it will be used.
 * Otherwise, it will look for type from section name removing architecture name.
@@ -180,7 +220,7 @@ Remote synchronization settings.
 
 * ``target`` - list of synchronizations to be used, space separated list of strings, required. It must point to valid section (or to section with architecture), e.g. ``somerandomname`` must point to existing section, ``github`` must point to one of ``github`` of ``github:x86_64`` (with architecture it has higher priority).
 
-Type will be read from several ways:
+Type will be read from several sources:
 
 * In case if ``type`` option set inside the section, it will be used.
 * Otherwise, it will look for type from section name removing architecture name.
@@ -223,21 +263,4 @@ Requires ``boto3`` library to be installed. Section name must be either ``s3`` (
 * ``bucket`` - bucket name (e.g. ``bucket``), string, required.
 * ``chunk_size`` - chunk size for calculating entity tags, int, optional, default 8 * 1024 * 1024.
 * ``region`` - bucket region (e.g. ``eu-central-1``), string, required.
-* ``secret_key`` - AWS secret access key, string, required.
-
-``web:*`` groups
-----------------
-
-Web server settings. If any of ``host``/``port`` is not set, web integration will be disabled. Group name can refer to architecture, e.g. ``web:x86_64`` can be used for x86_64 architecture specific settings. This feature requires ``aiohttp`` libraries to be installed.
-
-* ``address`` - optional address in form ``proto://host:port`` (``port`` can be omitted in case of default ``proto`` ports), will be used instead of ``http://{host}:{port}`` in case if set, string, optional. This option is required in case if ``OAuth`` provider is used.
-* ``debug`` - enable debug toolbar, boolean, optional, default ``no``.
-* ``debug_check_host`` - check hosts to access debug toolbar, boolean, optional, default ``no``.
-* ``debug_allowed_hosts`` - allowed hosts to get access to debug toolbar, space separated list of string, optional.
-* ``host`` - host to bind, string, optional.
-* ``index_url`` - full url of the repository index page, string, optional.
-* ``password`` - password to authorize in web service in order to update service status, string, required in case if authorization enabled.  
-* ``port`` - port to bind, int, optional.
-* ``static_path`` - path to directory with static files, string, required.
-* ``templates`` - path to templates directory, string, required.
-* ``username`` - username to authorize in web service in order to update service status, string, required in case if authorization enabled.  
+* ``secret_key`` - AWS secret access key, string, required.

docs/faq.rst

@@ -18,7 +18,7 @@ TL;DR
 .. code-block:: shell
 
    yay -S ahriman
-   sudo ahriman -a x86_64 repo-setup --packager "ahriman bot <ahriman@example.com>" --repository "repository"
+   ahriman -a x86_64 service-setup --packager "ahriman bot <ahriman@example.com>" --repository "repository"
    systemctl enable --now ahriman@x86_64.timer
 
 Long answer
@@ -26,6 +26,33 @@ Long answer
 
 The idea is to install the package as usual, create working directory tree, create configuration for ``sudo`` and ``devtools``. Detailed description of the setup instruction can be found :doc:`here <setup>`.
 
+How to validate settings
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+There is special command which can be used in order to validate current configuration:
+
+.. code-block:: shell
+
+   ahriman -a x86_64 service-config-validate --exit-code
+
+This command will print found errors, based on `cerberus <https://docs.python-cerberus.org/>`_, e.g.:
+
+.. code-block:: shell
+
+   auth
+                   ssalt: unknown field
+                   target: none or more than one rule validate
+                           oneof definition 0: unallowed value mapping
+                           oneof definition 1: field 'salt' is required
+                           oneof definition 2: unallowed value mapping
+                           oneof definition 2: field 'salt' is required
+                           oneof definition 2: field 'client_id' is required
+                           oneof definition 2: field 'client_secret' is required
+   gitremote
+                   pull_url: unknown field
+
+If an additional flag ``--exit-code`` is supplied, the application will return non-zero exit code, which can be used partially in scripts.
+
 What does "architecture specific" mean / How to configure for different architectures
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -117,65 +144,60 @@ Before using this command you will need to create local directory, put ``PKGBUIL
 How to fetch PKGBUILDs from remote repository
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-For that purpose you could use ``RemotePullTrigger`` trigger. To do so you will need:
+For that purpose you could use ``RemotePullTrigger`` trigger. To do so you will need to configure trigger as following:
 
-#.
-   Append ``triggers`` option in ``build`` section with the following line:
+.. code-block:: ini
 
-   .. code-block:: ini
+   [remote-pull]
+   target = gitremote
 
-      [build]
-      triggers = ahriman.core.gitremote.RemotePullTrigger
-
-#.
-   Configure trigger as following:
-
-   .. code-block:: ini
-
-      [remote-pull]
-      target = gitremote
-
-      [gitremote]
-      pull_url = https://github.com/username/repository
+   [gitremote]
+   pull_url = https://github.com/username/repository
 
 During the next application run it will fetch repository from the specified url and will try to find packages there which can be used as local sources.
 
 How to push updated PKGBUILDs to remote repository
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-For that purpose you'd need to use another trigger called ``RemotePushTrigger``. Configure it as following:
+For that purpose you'd need to use another trigger called ``RemotePushTrigger``. Configure trigger as following:
 
-#.
-   Append ``triggers`` option in ``build`` section with the trigger name:
+.. code-block:: ini
 
-   .. code-block:: ini
+   [remote-push]
+   target = gitremote
 
-      [build]
-      triggers = ahriman.core.gitremote.RemotePushTrigger
-
-#.
-   Configure trigger as following:
-
-   .. code-block:: ini
-
-      [remote-push]
-      target = gitremote
-
-      [gitremote]
-      push_url = https://github.com/username/repository
+   [gitremote]
+   push_url = https://github.com/username/repository
 
 Unlike ``RemotePullTrigger`` trigger, the ``RemotePushTrigger`` more likely will require authorization. It is highly recommended to use application tokens for that instead of using your password (e.g. for Github you can generate tokens `here <https://github.com/settings/tokens>`_ with scope ``public_repo``). Authorization can be supplied by using authorization part of the url, e.g. ``https://key:token@github.com/username/repository``.
 
 How to change PKGBUILDs before build
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Well it is supported also. The recommended way is to patch specific function, e.g. by running ``sudo -u ahriman ahriman patch-add ahriman version``. This command will prompt for new value of the PKGBUILD variable ``version``. You can also write it to file and read from it ``sudo -u ahriman ahriman patch-add ahriman version version.patch``.
+Well it is supported also. The recommended way is to patch specific function, e.g. by running
+
+.. code-block:: shell
+
+   sudo -u ahriman ahriman patch-add ahriman version
+
+This command will prompt for new value of the PKGBUILD variable ``version``. You can also write it to file and read from it:
+
+.. code-block:: shell
+
+   sudo -u ahriman ahriman patch-add ahriman version version.patch
 
 Alternatively you can create full-diff patches, which are calculated by using ``git diff`` from current PKGBUILD master branch:
 
-#. Clone sources from AUR.
-#. Make changes you would like to (e.g. edit ``PKGBUILD``, add external patches).
-#. Run ``sudo -u ahriman ahriman patch-set-add /path/to/local/directory/with/PKGBUILD``.
+#.
+   Clone sources from AUR.
+#.
+   Make changes you would like to (e.g. edit ``PKGBUILD``, add external patches).
+#.
+   Run command
+
+   .. code-block:: shell
+
+   sudo -u ahriman ahriman patch-set-add /path/to/local/directory/with/PKGBUILD
 
 The last command will calculate diff from current tree to the ``HEAD`` and will store it locally. Patches will be applied on any package actions (e.g. it can be used for dependency management).
 
@@ -197,7 +219,7 @@ TL;DR
 
 .. code-block:: shell
 
-   sudo -u ahriman ahriman key-import ...
+   sudo -u ahriman ahriman service-key-import ...
 
 How to update VCS packages
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -219,6 +241,62 @@ Also, there is command ``repo-remove-unknown`` which checks packages in AUR and
 
 Remove commands also remove any package files (patches, caches etc).
 
+How to sign repository
+^^^^^^^^^^^^^^^^^^^^^^
+
+Repository sign feature is available in several configurations. The recommended way is just to sign repository database file by single key instead of trying to sign each package. However, the steps are pretty same, just configuration is a bit differ. For more details about options kindly refer to :doc:`configuration reference <configuration>`.
+
+#.
+   First you would need to create the key on your local machine:
+
+   .. code-block:: shell
+
+      gpg --full-generate-key
+
+   This command will prompt you for several questions. Most of them may be left default, but you will need to fill real name and email address with some data. Because at the moment the service doesn't support passphrases, it must be left blank.
+
+#.
+   The command above will generate key and print its hash, something like ``8BE91E5A773FB48AC05CC1EDBED105AED6246B39``. Copy it.
+
+#.
+   Export your private key by using the hash above:
+
+   .. code-block:: shell
+
+      gpg --export-secret-keys -a 8BE91E5A773FB48AC05CC1EDBED105AED6246B39 > repository-key.gpg
+
+#.
+
+   Copy the specified key to the build machine (i.e. where the service is running).
+
+#.
+   Import the specified key to the service user:
+
+   .. code-block:: shell
+
+      sudo -u ahriman gpg --import repository-key.gpg
+
+   Don't forget to remove the key from filesystem after import.
+
+#.
+   Change trust level to ``ultimate``:
+
+   .. code-block:: shell
+
+      sudo -u ahriman gpg --edit-key 8BE91E5A773FB48AC05CC1EDBED105AED6246B39
+
+   The command above will drop you into gpg shell, in which you will need to type ``trust``, choose ``5 = I trust ultimately``, confirm and exit ``quit``.
+
+#.
+   Proceed with service configuration according to the :doc:`configuration <configuration>`:
+
+   .. code-block:: ini
+
+      [sign]
+      target = repository
+      key = 8BE91E5A773FB48AC05CC1EDBED105AED6246B39
+
+
 How to rebuild packages after library update
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -290,17 +368,17 @@ The default action (in case if no arguments provided) is ``repo-update``. Basica
 
    docker run --privileged -v /path/to/local/repo:/var/lib/ahriman arcan1s/ahriman:latest
 
-``--privileged`` flag is required to make mount possible inside container. In addition, you can pass own configuration overrides by using the same ``-v`` flag, e.g.:
+``--privileged`` flag is required to make mount possible inside container. In order to make data available outside of container, you would need to mount local (parent) directory inside container by using ``-v /path/to/local/repo:/var/lib/ahriman`` argument, where ``/path/to/local/repo`` is a path to repository on local machine. In addition, you can pass own configuration overrides by using the same ``-v`` flag, e.g.:
 
 .. code-block:: shell
 
-   docker run -v /path/to/local/repo:/var/lib/ahriman -v /etc/ahriman.ini:/etc/ahriman.ini.d/10-overrides.ini arcan1s/ahriman:latest
+   docker run --privileged -v /path/to/local/repo:/var/lib/ahriman -v /path/to/overrides/overrides.ini:/etc/ahriman.ini.d/10-overrides.ini arcan1s/ahriman:latest
 
 The action can be specified during run, e.g.:
 
 .. code-block:: shell
 
-   docker run arcan1s/ahriman:latest package-add ahriman --now
+   docker run --privileged -v /path/to/local/repo:/var/lib/ahriman arcan1s/ahriman:latest package-add ahriman --now
 
 For more details please refer to docker FAQ.
 
@@ -313,18 +391,33 @@ The following environment variables are supported:
 * ``AHRIMAN_DEBUG`` - if set all commands will be logged to console.
 * ``AHRIMAN_FORCE_ROOT`` - force run ahriman as root instead of guessing by subcommand.
 * ``AHRIMAN_HOST`` - host for the web interface, default is ``0.0.0.0``.
+* ``AHRIMAN_MULTILIB`` - if set (default) multilib repository will be used, disabled otherwise.
 * ``AHRIMAN_OUTPUT`` - controls logging handler, e.g. ``syslog``, ``console``. The name must be found in logging configuration. Note that if ``syslog`` (the default) handler is used you will need to mount ``/dev/log`` inside container because it is not available there.
 * ``AHRIMAN_PACKAGER`` - packager name from which packages will be built, default is ``ahriman bot <ahriman@example.com>``.
+* ``AHRIMAN_PACMAN_MIRROR`` - override pacman mirror server if set.
 * ``AHRIMAN_PORT`` - HTTP server port if any, default is empty.
 * ``AHRIMAN_REPOSITORY`` - repository name, default is ``aur-clone``.
 * ``AHRIMAN_REPOSITORY_ROOT`` - repository root. Because of filesystem rights it is required to override default repository root. By default, it uses ``ahriman`` directory inside ahriman's home, which can be passed as mount volume.
-* ``AHRIMAN_USER`` - ahriman user, usually must not be overwritten, default is ``ahriman``. 
+* ``AHRIMAN_UNIX_SOCKET`` - full path to unix socket which is used by web server, default is empty. Note that more likely you would like to put it inside ``AHRIMAN_REPOSITORY_ROOT`` directory (e.g. ``/var/lib/ahriman/ahriman/ahriman-web.sock``) or to ``/tmp``.
+* ``AHRIMAN_USER`` - ahriman user, usually must not be overwritten, default is ``ahriman``.
+* ``AHRIMAN_VALIDATE_CONFIGURATION`` - if set validate service configuration
 
 You can pass any of these variables by using ``-e`` argument, e.g.:
 
 .. code-block:: shell
 
-   docker run -e AHRIMAN_PORT=8080 arcan1s/ahriman:latest
+   docker run --privileged -e AHRIMAN_PORT=8080 -v /path/to/local/repo:/var/lib/ahriman arcan1s/ahriman:latest
+
+Daemon service
+^^^^^^^^^^^^^^
+
+There is special ``repo-daemon`` subcommand which emulates systemd timer and will perform repository update periodically:
+
+.. code-block:: shell
+
+   docker run --privileged -v /path/to/local/repo:/var/lib/ahriman arcan1s/ahriman:latest repo-daemon
+
+This command uses same rules as ``repo-update``, thus, e.g. requires ``--privileged`` flag.
 
 Web service setup
 ^^^^^^^^^^^^^^^^^
@@ -333,26 +426,119 @@ Well for that you would need to have web container instance running forever; it
 
 .. code-block:: shell
 
-   docker run -p 8080:8080 -e AHRIMAN_PORT=8080 -v /path/to/local/repo:/var/lib/ahriman arcan1s/ahriman:latest
+   docker run --privileged -p 8080:8080 -e AHRIMAN_PORT=8080 -e AHRIMAN_UNIX_SOCKET=/var/lib/ahriman/ahriman/ahriman-web.sock -v /path/to/local/repo:/var/lib/ahriman arcan1s/ahriman:latest
 
 Note about ``AHRIMAN_PORT`` environment variable which is required in order to enable web service. An additional port bind by ``-p 8080:8080`` is required to pass docker port outside of container.
 
-For every next container run use arguments ``-e AHRIMAN_PORT=8080 --net=host``, e.g.:
+The ``AHRIMAN_UNIX_SOCKET`` variable is not required, however, highly recommended as it can be used for interprocess communications. If you set this variable you would like to be sure that this path is available outside of container if you are going to use multiple docker instances.
+
+If you are using ``AHRIMAN_UNIX_SOCKET`` variable, for every next container run it has to be passed also, e.g.:
 
 .. code-block:: shell
 
-   docker run --privileged -e AHRIMAN_PORT=8080 --net=host -v /path/to/local/repo:/var/lib/ahriman arcan1s/ahriman:latest
+   docker run --privileged -e AHRIMAN_UNIX_SOCKET=/var/lib/ahriman/ahriman/ahriman-web.sock -v /path/to/local/repo:/var/lib/ahriman arcan1s/ahriman:latest
 
-Daemon service
-^^^^^^^^^^^^^^
-
-There is special subcommand which emulates systemd timer and will perform repository update periodically:
+Otherwise, you would need to pass ``AHRIMAN_PORT`` and mount container network to the host system (``--net=host``), e.g.:
 
 .. code-block:: shell
 
-   docker run arcan1s/ahriman:latest daemon
+   docker run --privileged --net=host -e AHRIMAN_PORT=8080 -v /path/to/local/repo:/var/lib/ahriman arcan1s/ahriman:latest
 
-This command uses same rules as ``repo-update``, thus, e.g. requires ``--privileged`` flag.
+
+Non-x86_64 architecture setup
+-----------------------------
+
+The following section describes how to setup ahriman with architecture different from x86_64, as example i686. For most cases you have base repository available, e.g. archlinux32 repositories for i686 architecture; in case if base repository is not available, steps are a bit different, however, idea remains the same.
+
+Physical server setup
+^^^^^^^^^^^^^^^^^^^^^
+
+In this example we are going to use files and packages which are provided by official repositories of the used architecture. Note, that versions might be different, thus you need to find correct versions on the distribution web site, e.g. `archlinux32 packages <https://www.archlinux32.org/packages/>`_.
+
+#.
+   First, considering having base Arch Linux system, we need to install keyring for the specified repositories:
+
+   .. code-block:: shell
+
+      wget http://pool.mirror.archlinux32.org/i686/core/archlinux32-keyring-20220927-1.0-any.pkg.tar.zst
+      pacman -U archlinux32-keyring-20220927-1.0-any.pkg.tar.zst
+
+#.
+   In order to run ``devtools`` scripts for custom architecture they also need specific ``makepkg`` configuration, it can be retrieved by installing the ``devtools`` package of the distribution:
+
+   .. code-block:: shell
+
+      wget http://pool.mirror.archlinux32.org/i686/extra/devtools-20221208-1.0-any.pkg.tar.zst
+      pacman -U devtools-20221208-1.0-any.pkg.tar.zst
+
+   Alternatively, you can create your own ``makepkg`` configuration and save it as ``/usr/share/devtools/makepkg-i686.conf``.
+
+#.
+   Setup repository as usual:
+
+   .. code-block:: shell
+
+      ahriman -a i686 service-setup --mirror 'http://de.mirror.archlinux32.org/$arch/$repo'--no-multilib ...
+
+   In addition to usual options, you need to specify the following options:
+
+   * ``--mirror`` - link to the mirrors which will be used instead of official repositories.
+   * ``--no-multilib`` - in the example we are using i686 architecture for which multilib repository doesn't exist.
+
+Docker container setup
+^^^^^^^^^^^^^^^^^^^^^^
+
+There are two possible ways to achieve same setup, by using docker container. The first one is just mount required files inside container and run it as usual (with specific environment variables). Another one is to create own container based on official one:
+
+#.
+   Clone official container as base:
+
+   .. code-block:: dockerfile
+
+      FROM arcan1s/ahriman:latest
+
+#.
+   Init pacman keys. This command is required in order to populate distribution keys:
+
+   .. code-block:: dockerfile
+
+      RUN pacman-key --init
+
+#.
+   Install packages as it was described above:
+
+   .. code-block:: dockerfile
+
+      RUN pacman --noconfirm -Sy wget
+      RUN wget http://pool.mirror.archlinux32.org/i686/extra/devtools-20221208-1.0-any.pkg.tar.zst && pacman --noconfirm -U devtools-20221208-1.0-any.pkg.tar.zst
+      RUN wget http://pool.mirror.archlinux32.org/i686/core/archlinux32-keyring-20220927-1.0-any.pkg.tar.zst && pacman --noconfirm -U archlinux32-keyring-20220927-1.0-any.pkg.tar.zst
+
+#.
+   At that point you should have full ``Dockerfile`` like:
+
+   .. code-block:: dockerfile
+
+      FROM arcan1s/ahriman:latest
+
+      RUN pacman-key --init
+
+      RUN pacman --noconfirm -Sy wget
+      RUN wget http://pool.mirror.archlinux32.org/i686/extra/devtools-20221208-1.0-any.pkg.tar.zst && pacman --noconfirm -U devtools-20221208-1.0-any.pkg.tar.zst
+      RUN wget http://pool.mirror.archlinux32.org/i686/core/archlinux32-keyring-20220927-1.0-any.pkg.tar.zst && pacman --noconfirm -U archlinux32-keyring-20220927-1.0-any.pkg.tar.zst
+
+#.
+   After that you can build you own container, e.g.:
+
+   .. code-block:: shell
+
+      docker build --tag ahriman-i686:latest
+
+#.
+   Now you can run locally built container as usual with passing environment variables for setup command:
+
+   .. code-block:: shell
+
+      docker run --privileged -p 8080:8080 -e AHRIMAN_ARCHITECTURE=i686 -e AHRIMAN_PACMAN_MIRROR='http://de.mirror.archlinux32.org/$arch/$repo' -e AHRIMAN_MULTILIB= ahriman-i686:latest
 
 Remote synchronization
 ----------------------
@@ -610,19 +796,41 @@ How to enable basic authorization
       [auth]
       target = configuration
 
-#. 
-   Create user for the service:
+#.
+   In order to provide access for reporting from application instances you can (recommended way) use unix sockets by configuring the following (note, that it requires ``python-requests-unixsocket`` package to be installed):
+
+   .. code-block:: ini
+
+      [web]
+      unix_socket = /var/lib/ahriman/ahriman-web.sock
+
+   This socket path must be available for web service instance and must be available for application instances (e.g. in case if you are using docker container, see above, you need to be sure that the socket is passed to the root filesystem).
+
+   By the way, unix socket variable will be automatically set in case if ``--web-unix-socket`` argument is supplied to the ``setup`` subcommand.
+
+   Alternatively, you need to create user for the service:
 
    .. code-block:: shell
 
-      sudo -u ahriman ahriman user-add --as-service -r write api
+      sudo -u ahriman ahriman user-add -r full api
 
-   This command will ask for the password, just type it in stdin; *do not* leave the field blank, user will not be able to authorize.
+   This command will ask for the password, just type it in stdin; *do not* leave the field blank, user will not be able to authorize, and finally configure the application:
 
-#. 
-   Create end-user ``sudo -u ahriman ahriman user-add -r write my-first-user`` with password.
+   .. code-block:: ini
 
-#. Restart web service ``systemctl restart ahriman-web@x86_64``.
+      [web]
+      username = api
+      password = pa55w0rd
+
+#.
+   Create end-user with password:
+
+   .. code-block:: shell
+
+      sudo -u ahriman ahriman user-add -r full my-first-user
+
+#.
+   Restart web service ``systemctl restart ahriman-web@x86_64``.
 
 How to enable OAuth authorization
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -656,12 +864,24 @@ How to enable OAuth authorization
 
    .. code-block:: shell
 
-      sudo -u ahriman ahriman user-add --as-service -r write api
+      sudo -u ahriman ahriman user-add --as-service -r full api
 
 #. 
-   Create end-user ``sudo -u ahriman ahriman user-add -r write my-first-user``. When it will ask for the password leave it blank.
+   Create end-user:
 
-#. Restart web service ``systemctl restart ahriman-web@x86_64``.
+   .. code-block:: shell
+
+      sudo -u ahriman ahriman user-add -r full my-first-user
+
+   When it will ask for the password leave it blank.
+
+#.
+   Restart web service ``systemctl restart ahriman-web@x86_64``.
+
+How to implement own interface
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+You can write your own interface by using API which is provided by the web service. Full autogenerated API documentation is available at ``http://localhost:8080/api-docs``.
 
 Backup and restore
 ------------------
@@ -673,7 +893,7 @@ The service provides several commands aim to do easy repository backup and resto
 
    .. code-block:: shell
 
-      sudo ahriman repo-backup /tmp/repo.tar.gz
+      ahriman repo-backup /tmp/repo.tar.gz
 
    This command will pack all configuration files together with database file into the archive specified as command line argument (i.e. ``/tmp/repo.tar.gz``). In addition it will also archive ``cache`` directory (the one which contains local clones used by e.g. local packages) and ``.gnupg`` of the ``ahriman`` user.
 
@@ -681,14 +901,14 @@ The service provides several commands aim to do easy repository backup and resto
    Copy created archive from source server ``server1.example.com`` to target ``server2.example.com``.
 
 #. 
-   Install ahriman as usual on the target server ``server2.example.com`` if you didn't yet.
+   Install package as usual on the target server ``server2.example.com`` if you didn't yet.
 
 #. 
    Extract archive e.g. by using subcommand:
 
    .. code-block:: shell
 
-      sudo ahriman repo-restore /tmp/repo.tar.gz
+      ahriman repo-restore /tmp/repo.tar.gz
 
    An additional argument ``-o``/``--output`` can be used to specify extraction root (``/`` by default).
 

docs/index.rst

@@ -16,6 +16,13 @@ Features
 * Triggers for repository updates, e.g. synchronization to remote services (rsync, s3 and github) and report generation (email, html, telegram).
 * Repository status interface with optional authorization and control options.
 
+Live demos
+----------
+
+* `Build status page <https://ahriman-demo.arcanis.me>`_. You can login as ``demo`` user by using ``demo`` password. Note, however, you will not be able to run tasks. `HTTP API documentation <https://ahriman-demo.arcanis.me/api-docs>`_ is also available.
+* `Repository index <http://repo.arcanis.me/x86_64/index.html>`_.
+* `Telegram feed <https://t.me/arcanisrepo>`_.
+
 Contents
 --------
 

docs/setup.rst

@@ -10,9 +10,9 @@ Initial setup
 
    .. code-block:: shell
 
-      sudo ahriman -a x86_64 repo-setup ...
+      sudo ahriman -a x86_64 service-setup ...
 
-   ``repo-setup`` literally does the following steps:
+   ``service-setup`` literally does the following steps:
 
    #.
       Create ``/var/lib/ahriman/.makepkg.conf`` with ``makepkg.conf`` overrides if required (at least you might want to set ``PACKAGER``):
@@ -32,11 +32,11 @@ Initial setup
             ln -s /usr/bin/archbuild /usr/local/bin/ahriman-x86_64-build
 
       #. 
-         Create configuration file (same as previous ``pacman-{name}.conf``):
+         Create configuration file (same as previous ``{name}.conf``):
 
          .. code-block:: shell
 
-            cp /usr/share/devtools/pacman-{extra,ahriman}.conf
+            cp /usr/share/devtools/pacman.conf.d/{extra,ahriman}.conf
 
       #. 
          Change configuration file, add your own repository, add multilib repository etc:
@@ -44,11 +44,11 @@ Initial setup
          .. code-block:: shell
 
             echo '[multilib]' | tee -a /usr/share/devtools/pacman-ahriman.conf
-            echo 'Include = /etc/pacman.d/mirrorlist' | tee -a /usr/share/devtools/pacman-ahriman.conf
+            echo 'Include = /etc/pacman.d/mirrorlist' | tee -a /usr/share/devtools/pacman.conf.d/ahriman.conf
 
             echo '[aur-clone]' | tee -a /usr/share/devtools/pacman-ahriman.conf
-            echo 'SigLevel = Optional TrustAll' | tee -a /usr/share/devtools/pacman-ahriman.conf
-            echo 'Server = file:///var/lib/ahriman/repository/$arch' | tee -a /usr/share/devtools/pacman-ahriman.conf
+            echo 'SigLevel = Optional TrustAll' | tee -a /usr/share/devtools/pacman.conf.d/ahriman.conf
+            echo 'Server = file:///var/lib/ahriman/repository/$arch' | tee -a /usr/share/devtools/pacman.conf.d/ahriman.conf
 
       #. 
          Set ``build_command`` option to point to your command:
@@ -88,4 +88,6 @@ Initial setup
 
    .. code-block:: shell
 
-       sudo -u ahriman ahriman -a x86_64 package-add ahriman --now
+       sudo -u ahriman ahriman -a x86_64 package-add ahriman --now --refresh
+
+   The ``--refresh`` flag is required in order to handle local database update.

docs/triggers.rst

@@ -19,7 +19,7 @@ For the configuration details and settings explanation kindly refer to the :doc:
 
 This trigger will be called before any action (``on_start``) and pulls remote PKGBUILD repository locally; after that it copies found PKGBUILDs from the cloned repository to the local cache. It is useful in case if you have patched PGKBUILDs (or even missing in AUR) which you would like to use for package building and, technically, just simplifies the local package building.
 
-In order to update those packages you would need to clone your repository separately, make changes in PKGBUILD (e.g. bump version and update checksums), commit them and push back. On the next ahriman's repository update, it will pull changes you commited and will perform package update.
+In order to update those packages you would need to clone your repository separately, make changes in PKGBUILD (e.g. bump version and update checksums), commit them and push back. On the next ahriman's repository update, it will pull changes you committed and will perform package update.
 
 ``ahriman.core.gitremote.RemotePushTrigger``
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -36,6 +36,40 @@ Trigger which can be used for reporting. It implements ``on_result`` method and
 
 This trigger takes build result (``on_result``) and performs syncing of the local packages to the remote mirror (e.g. S3 or just by rsync).
 
+Context variables
+-----------------
+
+By default, only configuration and architecture are passed to triggers. However, some triggers might want to have access to other high-level wrappers. In order to provide such ability and avoid (double) initialization, the service provides a global context variables, which can be accessed from ``ahriman.core`` package:
+
+.. code-block:: python
+
+   from ahriman.core import context
+
+   ctx = context.get()
+
+Just because context is wrapped inside ``contexvars.ContextVar``, you need to explicitly extract variable by ``get()`` method. Later you can extract any variable if it is set, e.g.:
+
+.. code-block:: python
+
+   from ahriman.core.database import SQLite
+   from ahriman.models.context_key import ContextKey
+
+   database = ctx.get(ContextKey("database", SQLite))
+
+In order to provide typed API, all variables are stored together with their type. The ``get(ContextKey)`` method will throw ``KeyError`` in case if key is missing. Alternatively you can set your own variable inside context:
+
+.. code-block:: python
+
+   ctx.set(ContextKey("answer", int), 42)
+   context.set(ctx)
+
+Note, however, that there are several limitations:
+
+* Context variables are immutable, thus you cannot override value if the key already presented.
+* The ``return_type`` of ``ContextKey`` should match the value type, otherwise exception will be thrown.
+
+The ``context`` also implements collection methods such as ``__iter__`` and ``__len__``.
+
 Trigger example
 ---------------
 
@@ -91,3 +125,8 @@ Setup the trigger
 First, put the trigger in any path it can be exported, e.g. by packing the resource into python package (which will lead to import path as ``package.slack_reporter.SlackReporter``) or just put file somewhere it can be accessed by application (e.g. ``/usr/local/lib/slack_reporter.py.SlackReporter``).
 
 After that run application as usual and receive notification in your slack channel.
+
+Trigger configuration schema
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Triggers can expose their configuration schema. It can be achieved by implementing ``CONFIGURATION_SCHEMA`` class variable according to `cerberus <https://docs.python-cerberus.org/>`_ documentation. For more details and examples, please refer to built-in triggers implementations.

package/archlinux/PKGBUILD

@@ -1,25 +1,28 @@
 # Maintainer: Evgeniy Alekseev
 
 pkgname='ahriman'
-pkgver=2.3.0rc4
+pkgver=2.9.0
 pkgrel=1
 pkgdesc="ArcH linux ReposItory MANager"
 arch=('any')
 url="https://github.com/arcan1s/ahriman"
 license=('GPL3')
-depends=('devtools' 'git' 'pyalpm' 'python-inflection' 'python-passlib' 'python-requests' 'python-setuptools' 'python-srcinfo')
+depends=('devtools' 'git' 'pyalpm' 'python-cerberus' 'python-inflection' 'python-passlib' 'python-requests' 'python-srcinfo')
 makedepends=('python-build' 'python-installer' 'python-wheel')
 optdepends=('breezy: -bzr packages support'
             'darcs: -darcs packages support'
             'mercurial: -hg packages support'
             'python-aioauth-client: web server with OAuth2 authorization'
             'python-aiohttp: web server'
+            'python-aiohttp-apispec>=3.0.0: web server'
+            'python-aiohttp-cors: web server'
             'python-aiohttp-debugtoolbar: web server with enabled debug panel'
             'python-aiohttp-jinja2: web server'
             'python-aiohttp-security: web server with authorization'
             'python-aiohttp-session: web server with authorization'
             'python-boto3: sync to s3'
             'python-cryptography: web server with authorization'
+            'python-requests-unixsocket: client report to web server by unix socket'
             'python-jinja: html report generation'
             'rsync: sync by using rsync'
             'subversion: -svn packages support')

package/lib/systemd/system/ahriman-web@.service

@@ -9,4 +9,4 @@ User=ahriman
 Group=ahriman
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target

package/share/ahriman/settings/ahriman.ini

@@ -2,11 +2,12 @@
 include = ahriman.ini.d
 logging = ahriman.ini.d/logging.ini
 database = /var/lib/ahriman/ahriman.db
+suppress_http_log_errors = yes
 
 [alpm]
 database = /var/lib/pacman
 mirror = https://geo.mirror.pkgbuild.com/$repo/os/$arch
-repositories = core extra community multilib
+repositories = core extra multilib
 root = /
 use_ahriman_cache = yes
 
@@ -23,7 +24,8 @@ build_command = extra-x86_64-build
 ignore_packages =
 makechrootpkg_flags =
 makepkg_flags = --nocolor --ignorearch
-triggers = ahriman.core.report.ReportTrigger ahriman.core.upload.UploadTrigger
+triggers = ahriman.core.gitremote.RemotePullTrigger ahriman.core.report.ReportTrigger ahriman.core.upload.UploadTrigger ahriman.core.gitremote.RemotePushTrigger
+vcs_allowed_age = 604800
 
 [repository]
 name = aur-clone
@@ -32,6 +34,12 @@ root = /var/lib/ahriman
 [sign]
 target =
 
+[remote-pull]
+target =
+
+[remote-push]
+target =
+
 [report]
 target = console
 
@@ -64,4 +72,5 @@ debug_check_host = no
 debug_allowed_hosts =
 host = 127.0.0.1
 static_path = /usr/share/ahriman/templates/static
-templates = /usr/share/ahriman/templates
+templates = /usr/share/ahriman/templates
+unix_socket_unsafe = yes

package/share/ahriman/settings/ahriman.ini.d/logging.ini

@@ -20,11 +20,11 @@ formatter = syslog_format
 args = ("/dev/log",)
 
 [formatter_generic_format]
-format = [%(levelname)s %(asctime)s] [%(threadName)s] [%(name)s]: %(message)s
+format = [%(levelname)s %(asctime)s] [%(name)s]: %(message)s
 datefmt =
 
 [formatter_syslog_format]
-format = [%(levelname)s] [%(threadName)s] [%(name)s]: %(message)s
+format = [%(levelname)s] [%(name)s]: %(message)s
 datefmt =
 
 [logger_root]

package/share/ahriman/templates/api.jinja2

@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>ahriman API</title>
+
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <!-- Embed elements Elements via Web Component -->
+    <script src="https://unpkg.com/@stoplight/elements/web-components.min.js"></script>
+    <link rel="stylesheet" href="https://unpkg.com/@stoplight/elements/styles.min.css" type="text/css">
+
+    <link rel="shortcut icon" href="/static/favicon.ico">
+</head>
+<body>
+
+    <elements-api
+            apiDescriptionUrl="/api-docs/swagger.json"
+            router="hash"
+            layout="sidebar"
+    />
+
+</body>
+</html>

package/share/ahriman/templates/build-status.jinja2

@@ -12,35 +12,56 @@
 
     <body>
 
-        <div class="container">
-            <h1>ahriman
-                <img id="badge-version" src="https://img.shields.io/badge/version-unknown-informational" alt="unknown">
-                <img id="badge-repository" src="https://img.shields.io/badge/repository-unknown-informational" alt="unknown">
-                <img id="badge-architecture" src="https://img.shields.io/badge/architecture-unknown-informational" alt="unknown">
-                <img id="badge-status" src="https://img.shields.io/badge/service%20status-unknown-inactive" alt="unknown">
-            </h1>
-        </div>
+        {% include "utils/bootstrap-scripts.jinja2" %}
 
         <div class="container">
-            <div id="toolbar">
+            <h1 id="badge-repository">ahriman</h1>
+        </div>
+
+        <div id="alert-placeholder" class="toast-container p3 top-0 start-50 translate-middle-x"></div>
+
+        <div class="container">
+            <div id="toolbar" class="dropdown">
+                <a id="badge-status" tabindex="0" role="button" class="btn btn-outline-secondary" data-bs-toggle="popover" data-bs-trigger="focus" data-bs-content="no run data"><i class="bi bi-info-circle"></i></a>
+
                 {% if not auth.enabled or auth.username is not none %}
-                    <button id="add-btn" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#add-form" hidden>
-                        <i class="bi bi-plus"></i> add
+                    <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
+                        <i class="bi bi-box"></i> packages
                     </button>
-                    <button id="update-btn" class="btn btn-secondary" onclick="updatePackages()" hidden>
-                        <i class="bi bi-play"></i> update
-                    </button>
-                    <button id="remove-btn" class="btn btn-danger" onclick="removePackages()" disabled hidden>
-                        <i class="bi bi-trash"></i> remove
+                    <ul class="dropdown-menu">
+                        <li>
+                            <button id="package-add-btn" class="btn dropdown-item" data-bs-toggle="modal" data-bs-target="#package-add-modal" hidden>
+                                <i class="bi bi-plus"></i> add
+                            </button>
+                        </li>
+                        <li>
+                            <button id="package-update-btn" class="btn dropdown-item" onclick="updatePackages()" hidden>
+                                <i class="bi bi-play"></i> update
+                            </button>
+                        </li>
+                        <li>
+                            <button id="package-rebuild-btn" class="btn dropdown-item" data-bs-toggle="modal" data-bs-target="#package-rebuild-modal" hidden>
+                                <i class="bi bi-arrow-clockwise"></i> rebuild
+                            </button>
+                        </li>
+                        <li>
+                            <button id="package-remove-btn" class="btn dropdown-item" onclick="removePackages()" disabled hidden>
+                                <i class="bi bi-trash"></i> remove
+                            </button>
+                        </li>
+                    </ul>
+
+                    <button id="key-import-btn" type="button" class="btn btn-info" data-bs-toggle="modal" data-bs-target="#key-import-modal" hidden>
+                        <i class="bi bi-key"></i> import key
                     </button>
                 {% endif %}
-                <button class="btn btn-secondary" onclick="reload()">
+
+                <button type="button" class="btn btn-secondary" onclick="reload()">
                     <i class="bi bi-arrow-clockwise"></i> reload
                 </button>
             </div>
 
             <table id="packages" class="table table-striped table-hover"
-                   data-click-to-select="true"
                    data-export-options='{"fileName": "packages"}'
                    data-page-list="[10, 25, 50, 100, all]"
                    data-page-size="10"
@@ -76,25 +97,30 @@
         <div class="container">
             <footer class="d-flex flex-wrap justify-content-between align-items-center border-top">
                 <ul class="nav">
-                    <li><a class="nav-link" href="https://github.com/arcan1s/ahriman" title="sources">ahriman</a></li>
+                    <li><a id="badge-version" class="nav-link" href="https://github.com/arcan1s/ahriman" title="sources"><i class="bi bi-github"></i> ahriman</a></li>
                     <li><a class="nav-link" href="https://github.com/arcan1s/ahriman/releases" title="releases list">releases</a></li>
                     <li><a class="nav-link" href="https://github.com/arcan1s/ahriman/issues" title="issues tracker">report a bug</a></li>
+                    <li><a class="nav-link" href="/api-docs" title="API documentation">api</a></li>
                 </ul>
 
                 {% if index_url is not none %}
                     <ul class="nav">
-                        <li><a class="nav-link" href="{{ index_url }}" title="repo index">repo index</a></li>
+                        <li><a class="nav-link" href="{{ index_url }}" title="repo index"><i class="bi bi-house"></i> repo index</a></li>
                     </ul>
                 {% endif %}
 
                 {% if auth.enabled %}
-                    {% if auth.username is none %}
-                        {{ auth.control|safe }}
-                    {% else %}
-                        <form action="/api/v1/logout" method="post">
-                            <button class="btn btn-link" style="text-decoration: none">logout ({{ auth.username }})</button>
-                        </form>
-                    {% endif %}
+                    <ul class="nav">
+                        {% if auth.username is none %}
+                            <li>{{ auth.control|safe }}</li>
+                        {% else %}
+                            <li>
+                                <form action="/api/v1/logout" method="post">
+                                    <button class="btn btn-link" style="text-decoration: none"><i class="bi bi-box-arrow-right"></i> logout ({{ auth.username }})</button>
+                                </form>
+                            </li>
+                        {% endif %}
+                    </ul>
                 {% endif %}
             </footer>
         </div>
@@ -103,12 +129,13 @@
             {% include "build-status/login-modal.jinja2" %}
         {% endif %}
 
-        {% include "utils/bootstrap-scripts.jinja2" %}
-
-        {% include "build-status/failed-modal.jinja2" %}
-        {% include "build-status/success-modal.jinja2" %}
+        {% include "build-status/alerts.jinja2" %}
 
         {% include "build-status/package-add-modal.jinja2" %}
+        {% include "build-status/package-rebuild-modal.jinja2" %}
+        {% include "build-status/key-import-modal.jinja2" %}
+
+        {% include "build-status/package-info-modal.jinja2" %}
 
         {% include "build-status/table.jinja2" %}
 

package/share/ahriman/templates/build-status/alerts.jinja2

@@ -0,0 +1,45 @@
+<script>
+    const alertPlaceholder = $("#alert-placeholder");
+
+    function createAlert(title, message, clz) {
+        const wrapper = document.createElement("div");
+        wrapper.classList.add("toast", clz);
+        wrapper.role = "alert";
+        wrapper.ariaLive = "assertive";
+        wrapper.ariaAtomic = "true";
+        wrapper.style.width = "500px"; // 500px is default modal size
+
+        const header = document.createElement("div");
+        header.classList.add("toast-header");
+        header.innerHTML = `<strong class="me-auto">${safe(title)}</strong> <button type="button" class="btn-close" data-bs-dismiss="toast" aria-label="close"></button>`;
+        wrapper.appendChild(header);
+
+        const body = document.createElement("div");
+        body.classList.add("toast-body", "text-bg-light");
+        body.innerText = message;
+        wrapper.appendChild(body);
+
+        alertPlaceholder.append(wrapper);
+        const toast = new bootstrap.Toast(wrapper);
+        wrapper.addEventListener("hidden.bs.toast", () => {
+            wrapper.remove();  // bootstrap doesn't remove elements
+            reload();
+        });
+        toast.show();
+    }
+
+    function showFailure(title, description, jqXHR, errorThrown) {
+        let details;
+        try {
+            details = $.parseJSON(jqXHR.responseText).error; // execution handler json error response
+        } catch (_) {
+            details = errorThrown;
+        }
+        createAlert(title, description(details), "text-bg-danger");
+    }
+
+    function showSuccess(title, description) {
+        createAlert(title, description, "text-bg-success");
+    }
+
+</script>

package/share/ahriman/templates/build-status/failed-modal.jinja2

@@ -1,28 +0,0 @@
-<div id="failed-form" tabindex="-1" role="dialog" class="modal fade">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header bg-danger">
-                <h4 class="modal-title">failed</h4>
-                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="close"></button>
-            </div>
-            <div class="modal-body">
-                <p>Packages update has failed.</p>
-                <p id="error-details"></p>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-primary" data-bs-dismiss="modal">close</button>
-            </div>
-        </div>
-    </div>
-</div>
-
-<script>
-    const failedForm = $("#failed-form");
-    const errorDetails = $("#error-details");
-    failedForm.on("hidden.bs.modal", () => { reload(); });
-
-    function showFailure(details) {
-        errorDetails.text(details);
-        failedForm.modal("show");
-    }
-</script>

package/share/ahriman/templates/build-status/key-import-modal.jinja2

@@ -0,0 +1,93 @@
+<div id="key-import-modal" tabindex="-1" role="dialog" class="modal fade">
+    <div class="modal-dialog modal-xl" role="document">
+        <div class="modal-content">
+            <form id="key-import-form" onsubmit="return false">
+                <div class="modal-header">
+                    <h4 class="modal-title">Import key from PGP server</h4>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="close"></button>
+                </div>
+                <div class="modal-body">
+                    <div class="form-group row">
+                        <label for="key-fingerprint-input" class="col-sm-2 col-form-label">fingerprint</label>
+                        <div class="col-sm-10">
+                            <input id="key-fingerprint-input" type="text" class="form-control" placeholder="PGP key fingerprint" name="key" required>
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <label for="key-server-input" class="col-sm-2 col-form-label">key server</label>
+                        <div class="col-sm-10">
+                            <input id="key-server-input" type="text" class="form-control" placeholder="PGP key server" name="server" value="keyserver.ubuntu.com" required>
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <div class="col-sm-2"></div>
+                        <div class="col-sm-10">
+                            <pre class="language-less"><samp id="key-body-input" class="pre-scrollable language-less"></samp><button id="key-copy-btn" type="button" class="btn language-less" onclick="copyPgpKey()"><i class="bi bi-clipboard"></i> copy</button></pre>
+                        </div>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="submit" class="btn btn-primary" onclick="importPgpKey()"><i class="bi bi-play"></i> import</button>
+                    <button type="submit" class="btn btn-success" onclick="fetchPgpKey()"><i class="bi bi-arrow-clockwise"></i> fetch</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+
+<script>
+    const keyImportModal = $("#key-import-modal");
+    const keyImportForm = $("#key-import-form");
+    keyImportModal.on("hidden.bs.modal", () => {
+        keyBodyInput.text("");
+        keyImportForm.trigger("reset");
+    });
+
+    const keyBodyInput = $("#key-body-input");
+    const keyCopyButton = $("#key-copy-btn");
+
+    const keyFingerprintInput = $("#key-fingerprint-input");
+    const keyServerInput = $("#key-server-input");
+
+    async function copyPgpKey() {
+        const logs = keyBodyInput.text();
+        await copyToClipboard(logs, keyCopyButton);
+    }
+
+    function fetchPgpKey() {
+        const key = keyFingerprintInput.val();
+        const server = keyServerInput.val();
+
+        if (key && server) {
+            $.ajax({
+                url: "/api/v1/service/pgp",
+                data: {"key": key, "server": server},
+                type: "GET",
+                dataType: "json",
+                success: response => { keyBodyInput.text(response.key); },
+            });
+        }
+    }
+
+    function importPgpKey() {
+        const key = keyFingerprintInput.val();
+        const server = keyServerInput.val();
+
+        if (key && server) {
+            $.ajax({
+                url: "/api/v1/service/pgp",
+                data: JSON.stringify({key: key, server: server}),
+                type: "POST",
+                contentType: "application/json",
+                success: _ => {
+                    keyImportModal.modal("hide");
+                    showSuccess("Success", `Key ${key} has been imported`);
+                },
+                error: (jqXHR, _, errorThrown) => {
+                    const message = _ => { return `Could not import key ${key} from ${server}`; };
+                    showFailure("Action failed", message, jqXHR, errorThrown);
+                },
+            });
+        }
+    }
+</script>

package/share/ahriman/templates/build-status/login-modal.jinja2

@@ -1,9 +1,9 @@
-<div id="loginForm" tabindex="-1" role="dialog" class="modal fade">
+<div id="login-modal" tabindex="-1" role="dialog" class="modal fade">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <form action="/api/v1/login" method="post">
                 <div class="modal-header">
-                    <h4 class="modal-title">login</h4>
+                    <h4 class="modal-title">Login</h4>
                     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="close"></button>
                 </div>
                 <div class="modal-body">
@@ -16,14 +16,36 @@
                     <div class="form-group row">
                         <label for="password" class="col-sm-2 col-form-label">password</label>
                         <div class="col-sm-10">
-                            <input id="password" type="password" class="form-control" placeholder="enter password" name="password" required>
+                            <div class="input-group">
+                                <input id="password" type="password" class="form-control" placeholder="enter password" name="password" required>
+                                <div class="input-group-append">
+                                    <button class="btn btn-outline-secondary" type="button" onclick="showPassword()"><i id="show-hide-password-btn" class="bi bi-eye"></i></button>
+                                </div>
+                            </div>
                         </div>
                     </div>
                 </div>
                 <div class="modal-footer">
-                    <button class="btn btn-primary">login</button>
+                    <button class="btn btn-primary"><i class="bi bi-person"></i> login</button>
                 </div>
             </form>
         </div>
     </div>
 </div>
+
+<script>
+    const passwordInput = $("#password");
+    const showHidePasswordButton = $("#show-hide-password-btn");
+
+    function showPassword() {
+        if (passwordInput.attr("type") === "password") {
+            passwordInput.attr("type", "text");
+            showHidePasswordButton.removeClass("bi-eye");
+            showHidePasswordButton.addClass("bi-eye-slash");
+        } else {
+            passwordInput.attr("type", "password");
+            showHidePasswordButton.removeClass("bi-eye-slash");
+            showHidePasswordButton.addClass("bi-eye");
+        }
+    }
+</script>

package/share/ahriman/templates/build-status/package-add-modal.jinja2

@@ -1,61 +1,78 @@
-<div id="add-form" tabindex="-1" role="dialog" class="modal fade">
+<div id="package-add-modal" tabindex="-1" role="dialog" class="modal fade">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
-            <div class="modal-header">
-                <h4 class="modal-title">add new packages</h4>
-                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="close"></button>
-            </div>
-            <div class="modal-body">
-                <div class="form-group row">
-                    <label for="package" class="col-sm-2 col-form-label">package</label>
-                    <div class="col-sm-10">
-                        <input id="package-form" type="text" list="known-packages-dlist" autocomplete="off" class="form-control" placeholder="AUR package" name="package" required>
-                        <datalist id="known-packages-dlist"></datalist>
+            <form id="package-add-form" onsubmit="return false">
+                <div class="modal-header">
+                    <h4 class="modal-title">Add new packages</h4>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="close"></button>
+                </div>
+                <div class="modal-body">
+                    <div class="form-group row">
+                        <label for="package-input" class="col-sm-2 col-form-label">package</label>
+                        <div class="col-sm-10">
+                            <input id="package-input" type="text" list="known-packages-dlist" autocomplete="off" class="form-control" placeholder="AUR package" name="package" required>
+                            <datalist id="known-packages-dlist"></datalist>
+                        </div>
                     </div>
                 </div>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">close</button>
-                <button type="button" class="btn btn-success" data-bs-dismiss="modal" onclick="requestPackages()">request</button>
-                <button type="button" class="btn btn-primary" data-bs-dismiss="modal" onclick="addPackages()">add</button>
-            </div>
+                <div class="modal-footer">
+                    <button type="submit" class="btn btn-primary" onclick="packagesAdd()"><i class="bi bi-play"></i> add</button>
+                    <button type="submit" class="btn btn-success" onclick="packagesRequest()"><i class="bi bi-plus"></i> request</button>
+                </div>
+            </form>
         </div>
     </div>
 </div>
 
 <script>
-    const packageInput = $("#package-form");
-    const knownPackages = $("#known-packages-dlist");
+    const packageAddModal = $("#package-add-modal");
+    const packageAddForm = $("#package-add-form");
+    packageAddModal.on("hidden.bs.modal", () => { packageAddForm.trigger("reset"); });
+
+    const packageInput = $("#package-input");
+    const knownPackagesList = $("#known-packages-dlist");
     packageInput.keyup(() => {
         clearTimeout(packageInput.data("timeout"));
         packageInput.data("timeout", setTimeout($.proxy(() => {
             const value = packageInput.val();
 
-            $.ajax({
-                url: "/api/v1/service/search",
-                data: {"for": value},
-                type: "GET",
-                dataType: "json",
-                success: response => {
-                    const options = response.map(pkg => {
-                        const option = document.createElement("option");
-                        option.value = pkg.package;
-                        option.innerText = `${pkg.package} (${pkg.description})`;
-                        return option;
-                    });
-                    knownPackages.empty().append(options);
-                },
-            })
+            if (value.length >= 3) {
+                $.ajax({
+                    url: "/api/v1/service/search",
+                    data: {"for": value},
+                    type: "GET",
+                    dataType: "json",
+                    success: response => {
+                        const options = response.map(pkg => {
+                            const option = document.createElement("option");
+                            option.value = pkg.package;
+                            option.innerText = `${pkg.package} (${pkg.description})`;
+                            return option;
+                        });
+                        knownPackagesList.empty().append(options);
+                    },
+                });
+            }
         }, this), 500));
     });
 
-    function addPackages() {
-        const packages = [packageInput.val()];
-        doPackageAction("/api/v1/service/add", packages);
+    function packagesAdd() {
+        const packages = packageInput.val();
+        if (packages) {
+            packageAddModal.modal("hide");
+            const onSuccess = update => { return `Packages ${update} have been added`; };
+            const onFailure = error => { return `Package addition failed: ${error}`; };
+            doPackageAction("/api/v1/service/add", [packages], onSuccess, onFailure);
+        }
     }
 
-    function requestPackages() {
-        const packages = [packageInput.val()];
-        doPackageAction("/api/v1/service/request", packages);
+    function packagesRequest() {
+        const packages = packageInput.val();
+        if (packages) {
+            packageAddModal.modal("hide");
+            const onSuccess = update => { return `Packages ${update} have been requested`; };
+            const onFailure = error => { return `Package request failed: ${error}`; };
+            doPackageAction("/api/v1/service/request", [packages], onSuccess, onFailure);
+        }
     }
 </script>

package/share/ahriman/templates/build-status/package-info-modal.jinja2

@@ -0,0 +1,70 @@
+<div id="package-info-modal" tabindex="-1" role="dialog" class="modal fade">
+    <div class="modal-dialog modal-xl" role="document">
+        <div class="modal-content">
+            <div id="package-info-modal-header" class="modal-header">
+                <h4 id="package-info" class="modal-title"></h4>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="close"></button>
+            </div>
+            <div class="modal-body">
+                <pre class="language-logs"><samp id="package-info-logs-input" class="pre-scrollable language-logs"></samp><button id="logs-copy-btn" type="button" class="btn language-logs" onclick="copyLogs()"><i class="bi bi-clipboard"></i> copy</button></pre>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" onclick="showLogs()"><i class="bi bi-arrow-clockwise"></i> reload</button>
+                <button type="button" class="btn btn-primary" data-bs-dismiss="modal"><i class="bi bi-x"></i> close</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script>
+    const packageInfoModal = $("#package-info-modal");
+    const packageInfoModalHeader = $("#package-info-modal-header");
+    const packageInfo = $("#package-info");
+
+    const packageInfoLogsInput = $("#package-info-logs-input");
+    const packageInfoLogsCopyButton = $("#logs-copy-btn");
+
+    async function copyLogs() {
+        const logs = packageInfoLogsInput.text();
+        await copyToClipboard(logs, packageInfoLogsCopyButton);
+    }
+
+    function showLogs(packageBase) {
+        const isPackageBaseSet = packageBase !== undefined;
+        if (isPackageBaseSet)
+            packageInfoModal.data("package", packageBase); // set package base as currently used
+        else
+            packageBase = packageInfoModal.data("package"); // read package base from the current window attribute
+
+        const headerClass = status => {
+            if (status === "pending") return ["bg-warning"];
+            if (status === "building") return ["bg-warning"];
+            if (status === "failed") return ["bg-danger", "text-white"];
+            if (status === "success") return ["bg-success", "text-white"];
+            return ["bg-secondary", "text-white"];
+        };
+
+        $.ajax({
+            url: `/api/v1/packages/${packageBase}/logs`,
+            type: "GET",
+            dataType: "json",
+            success: response => {
+                packageInfo.text(`${response.package_base} ${response.status.status} at ${new Date(1000 * response.status.timestamp).toISOString()}`);
+                packageInfoLogsInput.text(response.logs);
+
+                packageInfoModalHeader.removeClass();
+                packageInfoModalHeader.addClass("modal-header");
+                headerClass(response.status.status).forEach((clz) => packageInfoModalHeader.addClass(clz));
+
+                if (isPackageBaseSet) packageInfoModal.modal("show"); // we don't need to show window again
+            },
+            error: (jqXHR, _, errorThrown) => {
+                // show failed modal in case if first time loading
+                if (isPackageBaseSet) {
+                    const message = error => { return `Could not load package ${packageBase} logs: ${error}`; };
+                    showFailure("Load failure", message, jqXHR, errorThrown);
+                }
+            },
+        });
+    }
+</script>

package/share/ahriman/templates/build-status/package-rebuild-modal.jinja2

@@ -0,0 +1,41 @@
+<div id="package-rebuild-modal" tabindex="-1" role="dialog" class="modal fade">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <form id="package-rebuild-form" onsubmit="return false">
+                <div class="modal-header">
+                    <h4 class="modal-title">Rebuild depending packages</h4>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="close"></button>
+                </div>
+                <div class="modal-body">
+                    <div class="form-group row">
+                        <label for="dependency-input" class="col-sm-4 col-form-label">dependency</label>
+                        <div class="col-sm-8">
+                            <input id="dependency-input" type="text" class="form-control" placeholder="packages dependency" name="package" required>
+                        </div>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="submit" class="btn btn-primary" onclick="packagesRebuild()"><i class="bi bi-play"></i> rebuild</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+
+<script>
+    const packageRebuildModal = $("#package-rebuild-modal");
+    const packageRebuildForm = $("#package-rebuild-form");
+    packageRebuildModal.on("hidden.bs.modal", () => { packageRebuildForm.trigger("reset"); });
+
+    const dependencyInput = $("#dependency-input");
+
+    function packagesRebuild() {
+        const packages = dependencyInput.val();
+        if (packages) {
+            packageRebuildModal.modal("hide");
+            const onSuccess = update => { return `Repository rebuild has been run for packages which depend on ${update}`; };
+            const onFailure = error => { return `Repository rebuild failed: ${error}`; };
+            doPackageAction("/api/v1/service/rebuild", [packages], onSuccess, onFailure);
+        }
+    }
+</script>

package/share/ahriman/templates/build-status/success-modal.jinja2

@@ -1,28 +0,0 @@
-<div id="success-form" tabindex="-1" role="dialog" class="modal fade">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header bg-success">
-                <h4 class="modal-title">success</h4>
-                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="close"></button>
-            </div>
-            <div class="modal-body">
-                <p>Packages update has been run.</p>
-                <ul id="success-details"></ul>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-primary" data-bs-dismiss="modal">close</button>
-            </div>
-        </div>
-    </div>
-</div>
-
-<script>
-    const successForm = $("#success-form");
-    const successDetails = $("#success-details");
-    successForm.on("hidden.bs.modal", () => { reload(); });
-
-    function showSuccess(details) {
-        successDetails.empty().append(details);
-        successForm.modal("show");
-    }
-</script>

package/share/ahriman/templates/build-status/table.jinja2

@@ -1,34 +1,38 @@
 <script>
-    const addButton = $("#add-btn");
-    const removeButton = $("#remove-btn");
-    const updateButton = $("#update-btn");
+    const keyImportButton = $("#key-import-btn");
+    const packageAddButton = $("#package-add-btn");
+    const packageRebuildButton = $("#package-rebuild-btn");
+    const packageRemoveButton = $("#package-remove-btn");
+    const packageUpdateButton = $("#package-update-btn");
 
     const table = $("#packages");
-    table.on("check.bs.table uncheck.bs.table check-all.bs.table uncheck-all.bs.table",
-        () => {
-            removeButton.prop("disabled", !table.bootstrapTable("getSelections").length);
-        });
+    table.on("check.bs.table uncheck.bs.table check-all.bs.table uncheck-all.bs.table", () => {
+        packageRemoveButton.prop("disabled", !table.bootstrapTable("getSelections").length);
+    });
+    table.on("click-row.bs.table", (self, data, row, cell) => {
+        if (0 === cell || "base" === cell) {
+            const method = data[0] === true ? "uncheckBy" : "checkBy"; // fck javascript
+            table.bootstrapTable(method, {field: "id", values: [data.id]});
+        } else showLogs(data.id);
+    });
 
-    const architectureBadge = $("#badge-architecture");
     const repositoryBadge = $("#badge-repository");
     const statusBadge = $("#badge-status");
     const versionBadge = $("#badge-version");
 
-    function doPackageAction(uri, packages) {
+    function doPackageAction(uri, packages, successText, failureText) {
         $.ajax({
             url: uri,
             data: JSON.stringify({packages: packages}),
             type: "POST",
             contentType: "application/json",
             success: _ => {
-                const details = packages.map(pkg => {
-                    const li = document.createElement("li");
-                    li.innerText = pkg;
-                    return li;
-                });
-                showSuccess(details);
+                const message = successText(packages.join(", "));
+                showSuccess("Success", message);
+            },
+            error: (jqXHR, _, errorThrown) => {
+                showFailure("Action failed", failureText, jqXHR, errorThrown);
             },
-            error: (jqXHR, _, errorThrown) => { showFailure(errorThrown); },
         });
     }
 
@@ -36,19 +40,40 @@
         return table.bootstrapTable("getSelections").map(row => { return row.id; });
     }
 
-    function removePackages() { doPackageAction("/api/v1/service/remove", getSelection()); }
+    function removePackages() {
+        const onSuccess = update => { return `Packages ${update} have been removed`; };
+        const onFailure = error => { return `Could not remove packages: ${error}`; };
+        doPackageAction("/api/v1/service/remove", getSelection(), onSuccess, onFailure);
+    }
 
-    function updatePackages() { doPackageAction("/api/v1/service/add", getSelection()); }
+    function updatePackages() {
+        const currentSelection = getSelection();
+        const [url, onSuccess] = currentSelection.length === 0
+            ? ["/api/v1/service/update", _ => { return "Repository update has been run"; }]
+            : ["/api/v1/service/add", update => { return `Run update for packages ${update}`; }];
+        const onFailure = error => { return `Packages update failed: ${error}`; };
+        doPackageAction(url, currentSelection, onSuccess, onFailure);
+    }
 
     function hideControls(hidden) {
-        addButton.attr("hidden", hidden);
-        removeButton.attr("hidden", hidden);
-        updateButton.attr("hidden", hidden);
+        keyImportButton.attr("hidden", hidden);
+        packageAddButton.attr("hidden", hidden);
+        packageRebuildButton.attr("hidden", hidden);
+        packageRemoveButton.attr("hidden", hidden);
+        packageUpdateButton.attr("hidden", hidden);
     }
 
     function reload() {
         table.bootstrapTable("showLoading");
 
+        const badgeClass = status => {
+            if (status === "pending") return "btn-outline-warning";
+            if (status === "building") return "btn-outline-warning";
+            if (status === "failed") return "btn-outline-danger";
+            if (status === "success") return "btn-outline-success";
+            return "btn-outline-secondary";
+        };
+
         $.ajax({
             url: "/api/v1/packages",
             type: "GET",
@@ -95,7 +120,8 @@
                     table.bootstrapTable("hideLoading");
                 } else {
                     // other errors
-                    showFailure(errorThrown);
+                    const messaga = error => { return `Could not load list of packages: ${error}`; };
+                    showFailure("Load failure", messaga, jqXHR, errorThrown);
                 }
                 hideControls(true);
             },
@@ -106,39 +132,20 @@
             type: "GET",
             dataType: "json",
             success: response => {
-                const badgeColor = status => {
-                    if (status === "pending") return "yellow";
-                    if (status === "building") return "yellow";
-                    if (status === "failed") return "critical";
-                    if (status === "success") return "success";
-                    return "inactive";
-                };
+                repositoryBadge.text(`${response.repository} ${response.architecture}`);
+                versionBadge.html(`<i class="bi bi-github"></i> ahriman ${safe(response.version)}`);
 
-                architectureBadge
-                    .attr("src", `https://img.shields.io/badge/architecture-${response.architecture}-informational`)
-                    .attr("alt", response.architecture);
-                repositoryBadge
-                    .attr("src", `https://img.shields.io/badge/repository-${response.repository.replace(/-/g, "--")}-informational`)
-                    .attr("alt", response.repository);
                 statusBadge
-                    .attr("src", `https://img.shields.io/badge/service%20status-${response.status.status}-${badgeColor(response.status.status)}`)
-                    .attr("alt", response.status.status)
-                    .attr("title", `at ${new Date(1000 * response.status.timestamp).toISOString()}`);
-                versionBadge
-                    .attr("src", `https://img.shields.io/badge/version-${response.version}-informational`)
-                    .attr("alt", response.version);
+                    .popover("dispose")
+                    .attr("data-bs-content", `${response.status.status} at ${new Date(1000 * response.status.timestamp).toISOString()}`)
+                    .popover();
+                statusBadge.removeClass();
+                statusBadge.addClass("btn");
+                statusBadge.addClass(badgeClass(response.status.status));
             },
         });
     }
 
-    function safe(string) {
-        return String(string)
-            .replace(/&/g, "&amp;")
-            .replace(/</g, "&lt;")
-            .replace(/>/g, "&gt;")
-            .replace(/"/g, "&quot;");
-    }
-
     function statusFormat(value) {
         const cellClass = status => {
             if (status === "pending") return "table-warning";
@@ -152,6 +159,7 @@
 
     $(() => {
         table.bootstrapTable({});
+        statusBadge.popover();
         reload();
     });
 </script>

package/share/ahriman/templates/error.jinja2

@@ -0,0 +1,31 @@
+<!doctype html>
+<html lang="en">
+    <head>
+        <title>Error</title>
+
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <link rel="shortcut icon" href="/static/favicon.ico">
+
+        {% include "utils/style.jinja2" %}
+    </head>
+
+    <body>
+
+        {% include "utils/bootstrap-scripts.jinja2" %}
+
+        <div class="d-flex flex-row align-items-center">
+            <div class="container">
+                <div class="row justify-content-center">
+                    <div class="col-md-12 text-center">
+                        <span class="display-1 d-block">{{ code }}</span>
+                        <div class="mb-4 lead">{{ reason }}</div>
+                        <a class="btn btn-link" style="text-decoration: none" href="/" title="home"><i class="bi bi-house"></i> home</a>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+    </body>
+
+</html>

package/share/ahriman/templates/repo-index.jinja2

@@ -10,19 +10,22 @@
 
     <body>
 
+        {% include "utils/bootstrap-scripts.jinja2" %}
+
         <div class="container">
             <h1>Arch linux user repository</h1>
         </div>
 
         <div class="container">
             {% if pgp_key is not none %}
-                <p>This repository is signed with <a href="https://pgp.mit.edu/pks/lookup?search=0x{{ pgp_key }}&fingerprint=on&op=index" title="key search">{{ pgp_key }}</a> by default.</p>
+                <p>This repository is signed with <a href="https://keyserver.ubuntu.com/pks/lookup?search=0x{{ pgp_key }}&fingerprint=on&op=index" title="key search">{{ pgp_key }}</a> by default.</p>
             {% endif %}
 
-<pre>$ cat /etc/pacman.conf
-[{{ repository }}]
+            <p>In order to use this repository edit your <code>/etc/pacman.conf</code> as following:</p>
+
+            <pre class="language-ini"><code id="pacman-conf" class="language-ini">[{{ repository }}]
 Server = {{ link_path }}
-SigLevel = Database{% if has_repo_signed %}Required{% else %}Never{% endif %} Package{% if has_package_signed %}Required{% else %}Never{% endif %} TrustedOnly</pre>
+SigLevel = Database{% if has_repo_signed %}Required{% else %}Never{% endif %} Package{% if has_package_signed %}Required{% else %}Never{% endif %} TrustedOnly</code><button id="copy-btn" type="button" class="btn language-ini" onclick="copyPacmanConf()"><i class="bi bi-clipboard"></i> copy</button></pre>
         </div>
 
         <div class="container">
@@ -83,16 +86,24 @@ SigLevel = Database{% if has_repo_signed %}Required{% else %}Never{% endif %} Pa
             <footer class="d-flex flex-wrap justify-content-between align-items-center border-top">
                 <ul class="nav">
                     {% if homepage is not none %}
-                        <li><a class="nav-link" href="{{ homepage }}" title="homepage">homepage</a></li>
+                        <li><a class="nav-link" href="{{ homepage }}" title="homepage"><i class="bi bi-house"></i> homepage</a></li>
                     {% endif %}
                 </ul>
                 <ul class="nav">
-                    <li><a class="nav-link" href="https://github.com/arcan1s/ahriman" title="sources">ahriman</a></li>
+                    <li><a class="nav-link" href="https://github.com/arcan1s/ahriman" title="sources"><i class="bi bi-github"></i> ahriman</a></li>
                 </ul>
             </footer>
         </div>
 
-        {% include "utils/bootstrap-scripts.jinja2" %}
+        <script>
+            const pacmanConf = $("#pacman-conf");
+            const pacmanConfCopyButton = $("#copy-btn");
+
+            async function copyPacmanConf() {
+                const conf = pacmanConf.text();
+                await copyToClipboard(conf, pacmanConfCopyButton);
+            }
+        </script>
 
     </body>
 

package/share/ahriman/templates/utils/bootstrap-scripts.jinja2

@@ -4,9 +4,38 @@
 
 <script src="https://unpkg.com/jquery-resizable-columns@0.2.3/dist/jquery.resizableColumns.min.js"></script>
 
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script>
-<script src="https://unpkg.com/bootstrap-table@1.20.2/dist/bootstrap-table.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.6/dist/umd/popper.min.js" integrity="sha384-oBqDVmMz9ATKxIep9tiCxS/Z9fNfEXiDAYTujMAeBAsjFuCZSmKbSSUnQlmh/jp3" crossorigin="anonymous"></script>
+<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.2/dist/js/bootstrap.min.js" integrity="sha384-IDwe1+LCz02ROU9k972gdyvl+AESN10+x7tBKgc9I5HFtuNz0wWnPclzo6p9vxnk" crossorigin="anonymous"></script>
+<script src="https://unpkg.com/bootstrap-table@1.21.1/dist/bootstrap-table.min.js"></script>
 
-<script src="https://unpkg.com/bootstrap-table@1.20.2/dist/extensions/export/bootstrap-table-export.min.js"></script>
+<script src="https://unpkg.com/bootstrap-table@1.21.1/dist/extensions/export/bootstrap-table-export.min.js"></script>
 
-<script src="https://unpkg.com/bootstrap-table@1.20.2/dist/extensions/resizable/bootstrap-table-resizable.js"></script>
+<script src="https://unpkg.com/bootstrap-table@1.21.1/dist/extensions/resizable/bootstrap-table-resizable.js"></script>
+
+<script>
+    async function copyToClipboard(text, button) {
+        if (navigator.clipboard === undefined) {
+            const input = document.createElement("textarea");
+            input.innerHTML = text;
+            document.body.appendChild(input);
+            input.select();
+            document.execCommand("copy");
+            document.body.removeChild(input);
+        } else {
+            await navigator.clipboard.writeText(text);
+        }
+
+        button.html("<i class=\"bi bi-clipboard-check\"></i> copied");
+        setTimeout(()=> {
+            button.html("<i class=\"bi bi-clipboard\"></i> copy");
+        }, 2000);
+    }
+
+    function safe(string) {
+        return String(string)
+            .replace(/&/g, "&amp;")
+            .replace(/</g, "&lt;")
+            .replace(/>/g, "&gt;")
+            .replace(/"/g, "&quot;");
+    }
+</script>

package/share/ahriman/templates/utils/style.jinja2

@@ -1,9 +1,26 @@
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous" type="text/css">
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.8.3/font/bootstrap-icons.css" type="text/css">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.2/dist/css/bootstrap.min.css" integrity="sha384-Zenh87qX5JnK2Jl0vWa8Ck2rdkQ2Bzep5IDxbcnCeuOxjzrPF/et3URy9Bv1WTRi" crossorigin="anonymous" type="text/css">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.10.2/font/bootstrap-icons.css" type="text/css">
 
-<link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.20.2/dist/bootstrap-table.min.css" type="text/css">
+<link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.21.1/dist/bootstrap-table.min.css" type="text/css">
 
-<link href="https://unpkg.com/jquery-resizable-columns@0.2.3/dist/jquery.resizableColumns.css" rel="stylesheet">
+<link rel="stylesheet" href="https://unpkg.com/jquery-resizable-columns@0.2.3/dist/jquery.resizableColumns.css" type="text/css">
+
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootswatch@5.2.2/dist/cosmo/bootstrap.min.css" integrity="sha256-5t++JZpgVLzo9vF7snO5Qw0y3fA5/NkoJENWB7kpg0E=" crossorigin="anonymous" type="text/css">
 
 <style>
+    .pre-scrollable {
+        display: block;
+        max-height: 680px;
+        overflow-y: scroll;
+    }
+
+    pre[class*="language-"] {
+        position: relative;
+    }
+
+    pre[class*="language-"] button {
+        position: absolute;
+        top: 0;
+        right: 5px;
+    }
 </style>

setup.py

@@ -1,10 +1,10 @@
 from pathlib import Path
 from setuptools import find_packages, setup
-from typing import Any, Dict
+from typing import Any
 
 
 metadata_path = Path(__file__).resolve().parent / "src/ahriman/version.py"
-metadata: Dict[str, Any] = {}
+metadata: dict[str, Any] = {}
 with metadata_path.open() as metadata_file:
     exec(metadata_file.read(), metadata)  # pylint: disable=exec-used
 
@@ -25,14 +25,15 @@ setup(
 
     packages=find_packages("src"),
     package_dir={"": "src"},
+    package_data={"": ["py.typed"]},
 
     dependency_links=[
     ],
     install_requires=[
+        "cerberus",
         "inflection",
         "passlib",
         "requests",
-        "setuptools",
         "srcinfo",
     ],
     setup_requires=[
@@ -52,29 +53,36 @@ setup(
         "package/bin/ahriman",
     ],
     data_files=[
+        # configuration
         ("share/ahriman/settings", [
             "package/share/ahriman/settings/ahriman.ini",
         ]),
         ("share/ahriman/settings/ahriman.ini.d", [
             "package/share/ahriman/settings/ahriman.ini.d/logging.ini",
         ]),
+        # systemd files
         ("lib/systemd/system", [
             "package/lib/systemd/system/ahriman@.service",
             "package/lib/systemd/system/ahriman@.timer",
             "package/lib/systemd/system/ahriman-web@.service",
         ]),
+        # templates
         ("share/ahriman/templates", [
+            "package/share/ahriman/templates/api.jinja2",
             "package/share/ahriman/templates/build-status.jinja2",
             "package/share/ahriman/templates/email-index.jinja2",
+            "package/share/ahriman/templates/error.jinja2",
             "package/share/ahriman/templates/repo-index.jinja2",
             "package/share/ahriman/templates/shell",
             "package/share/ahriman/templates/telegram-index.jinja2",
         ]),
         ("share/ahriman/templates/build-status", [
-            "package/share/ahriman/templates/build-status/failed-modal.jinja2",
+            "package/share/ahriman/templates/build-status/alerts.jinja2",
+            "package/share/ahriman/templates/build-status/key-import-modal.jinja2",
             "package/share/ahriman/templates/build-status/login-modal.jinja2",
             "package/share/ahriman/templates/build-status/package-add-modal.jinja2",
-            "package/share/ahriman/templates/build-status/success-modal.jinja2",
+            "package/share/ahriman/templates/build-status/package-info-modal.jinja2",
+            "package/share/ahriman/templates/build-status/package-rebuild-modal.jinja2",
             "package/share/ahriman/templates/build-status/table.jinja2",
         ]),
         ("share/ahriman/templates/static", [
@@ -84,9 +92,17 @@ setup(
             "package/share/ahriman/templates/utils/bootstrap-scripts.jinja2",
             "package/share/ahriman/templates/utils/style.jinja2",
         ]),
+        # man pages
         ("share/man/man1", [
             "docs/ahriman.1",
-        ])
+        ]),
+        # shell completions
+        ("share/bash-completion/completions", [
+            "docs/completions/bash/_ahriman",
+        ]),
+        ("share/zsh/site-functions", [
+            "docs/completions/zsh/_ahriman",
+        ]),
     ],
 
     extras_require={
@@ -100,7 +116,9 @@ setup(
             "Sphinx",
             "argparse-manpage",
             "pydeps",
+            "shtab",
             "sphinx-argparse",
+            "sphinx-rtd-theme>=1.1.1",  # https://stackoverflow.com/a/74355734
             "sphinxcontrib-napoleon",
         ],
         # FIXME technically this dependency is required, but in some cases we do not have access to
@@ -123,13 +141,16 @@ setup(
         ],
         "web": [
             "Jinja2",
-            "aiohttp",
-            "aiohttp_jinja2",
             "aioauth-client",
+            "aiohttp",
+            "aiohttp-apispec",
+            "aiohttp_cors",
+            "aiohttp_jinja2",
             "aiohttp_debugtoolbar",
             "aiohttp_session",
             "aiohttp_security",
             "cryptography",
+            "requests-unixsocket",  # required by unix socket support
         ],
     },
 )

src/ahriman/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/ahriman.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -23,7 +23,7 @@ import sys
 import tempfile
 
 from pathlib import Path
-from typing import List, TypeVar
+from typing import TypeVar
 
 from ahriman import version
 from ahriman.application import handlers
@@ -35,7 +35,7 @@ from ahriman.models.sign_settings import SignSettings
 from ahriman.models.user_access import UserAccess
 
 
-__all__: List[str] = []
+__all__: list[str] = []
 
 
 # this workaround is for several things
@@ -68,9 +68,10 @@ def _parser() -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser(prog="ahriman", description="ArcH linux ReposItory MANager",
                                      epilog="Argument list can also be read from file by using @ prefix.",
                                      fromfile_prefix_chars="@", formatter_class=_formatter)
-    parser.add_argument("-a", "--architecture", help="target architectures (can be used multiple times)",
-                        action="append")
-    parser.add_argument("-c", "--configuration", help="configuration path", type=Path, default=Path("/etc/ahriman.ini"))
+    parser.add_argument("-a", "--architecture", help="target architectures. For several subcommands it can be used "
+                                                     "multiple times", action="append")
+    parser.add_argument("-c", "--configuration", help="configuration path", type=Path,
+                        default=Path("/etc") / "ahriman.ini")
     parser.add_argument("--force", help="force run, remove file lock", action="store_true")
     parser.add_argument("-l", "--lock", help="lock file", type=Path,
                         default=Path(tempfile.gettempdir()) / "ahriman.lock")
@@ -84,10 +85,10 @@ def _parser() -> argparse.ArgumentParser:
     subparsers = parser.add_subparsers(title="command", help="command to run", dest="command", required=True)
 
     _set_aur_search_parser(subparsers)
-    _set_daemon_parser(subparsers)
     _set_help_parser(subparsers)
     _set_help_commands_unsafe_parser(subparsers)
-    _set_key_import_parser(subparsers)
+    _set_help_updates_parser(subparsers)
+    _set_help_version_parser(subparsers)
     _set_package_add_parser(subparsers)
     _set_package_remove_parser(subparsers)
     _set_package_status_parser(subparsers)
@@ -99,23 +100,26 @@ def _parser() -> argparse.ArgumentParser:
     _set_patch_set_add_parser(subparsers)
     _set_repo_backup_parser(subparsers)
     _set_repo_check_parser(subparsers)
-    _set_repo_clean_parser(subparsers)
-    _set_repo_config_parser(subparsers)
+    _set_repo_daemon_parser(subparsers)
     _set_repo_rebuild_parser(subparsers)
     _set_repo_remove_unknown_parser(subparsers)
     _set_repo_report_parser(subparsers)
     _set_repo_restore_parser(subparsers)
-    _set_repo_setup_parser(subparsers)
     _set_repo_sign_parser(subparsers)
     _set_repo_status_update_parser(subparsers)
     _set_repo_sync_parser(subparsers)
+    _set_repo_tree_parser(subparsers)
     _set_repo_triggers_parser(subparsers)
     _set_repo_update_parser(subparsers)
-    _set_shell_parser(subparsers)
+    _set_service_clean_parser(subparsers)
+    _set_service_config_parser(subparsers)
+    _set_service_config_validate_parser(subparsers)
+    _set_service_key_import_parser(subparsers)
+    _set_service_setup_parser(subparsers)
+    _set_service_shell_parser(subparsers)
     _set_user_add_parser(subparsers)
     _set_user_list_parser(subparsers)
     _set_user_remove_parser(subparsers)
-    _set_version_parser(subparsers)
     _set_web_parser(subparsers)
 
     return parser
@@ -145,35 +149,6 @@ def _set_aur_search_parser(root: SubParserAction) -> argparse.ArgumentParser:
     return parser
 
 
-def _set_daemon_parser(root: SubParserAction) -> argparse.ArgumentParser:
-    """
-    add parser for daemon subcommand
-
-    Args:
-        root(SubParserAction): subparsers for the commands
-
-    Returns:
-        argparse.ArgumentParser: created argument parser
-    """
-    parser = root.add_parser("daemon", help="run application as daemon",
-                             description="start process which periodically will run update process",
-                             formatter_class=_formatter)
-    parser.add_argument("-i", "--interval", help="interval between runs in seconds", type=int, default=60 * 60 * 12)
-    parser.add_argument("--aur", help="enable or disable checking for AUR updates. Implies --no-vcs",
-                        action=argparse.BooleanOptionalAction, default=True)
-    parser.add_argument("--local", help="enable or disable checking of local packages for updates",
-                        action=argparse.BooleanOptionalAction, default=True)
-    parser.add_argument("--manual", help="include or exclude manual updates",
-                        action=argparse.BooleanOptionalAction, default=True)
-    parser.add_argument("--vcs", help="enable or disable checking of VCS packages",
-                        action=argparse.BooleanOptionalAction, default=True)
-    parser.add_argument("-y", "--refresh", help="download fresh package databases from the mirror before actions, "
-                                                "-yy to force refresh even if up to date",
-                        action="count", default=0)
-    parser.set_defaults(handler=handlers.Daemon, dry_run=False, exit_code=False, package=[])
-    return parser
-
-
 def _set_help_parser(root: SubParserAction) -> argparse.ArgumentParser:
     """
     add parser for listing help subcommand
@@ -188,8 +163,8 @@ def _set_help_parser(root: SubParserAction) -> argparse.ArgumentParser:
                              description="show help message for application or command and exit",
                              formatter_class=_formatter)
     parser.add_argument("command", help="show help message for specific command", nargs="?")
-    parser.set_defaults(handler=handlers.Help, architecture=[""], lock=None, report=False, quiet=True,
-                        unsafe=True, parser=_parser)
+    parser.set_defaults(handler=handlers.Help, architecture=[""], lock=None, report=False, quiet=True, unsafe=True,
+                        parser=_parser)
     return parser
 
 
@@ -212,9 +187,9 @@ def _set_help_commands_unsafe_parser(root: SubParserAction) -> argparse.Argument
     return parser
 
 
-def _set_key_import_parser(root: SubParserAction) -> argparse.ArgumentParser:
+def _set_help_updates_parser(root: SubParserAction) -> argparse.ArgumentParser:
     """
-    add parser for key import subcommand
+    add parser for service update check subcommand
 
     Args:
         root(SubParserAction): subparsers for the commands
@@ -222,16 +197,28 @@ def _set_key_import_parser(root: SubParserAction) -> argparse.ArgumentParser:
     Returns:
         argparse.ArgumentParser: created argument parser
     """
-    parser = root.add_parser("key-import", help="import PGP key",
-                             description="import PGP key from public sources to the repository user",
-                             epilog="By default ahriman runs build process with package sources validation "
-                                    "(in case if signature and keys are available in PKGBUILD). This process will "
-                                    "fail in case if key is not known for build user. This subcommand can be used "
-                                    "in order to import the PGP key to user keychain.",
+    parser = root.add_parser("help-updates", help="check for service updates",
+                             description="request AUR for current version and compare with current service version",
                              formatter_class=_formatter)
-    parser.add_argument("--key-server", help="key server for key import", default="pgp.mit.edu")
-    parser.add_argument("key", help="PGP key to import from public server")
-    parser.set_defaults(handler=handlers.KeyImport, architecture=[""], lock=None, report=False)
+    parser.add_argument("-e", "--exit-code", help="return non-zero exit code if updates available", action="store_true")
+    parser.set_defaults(handler=handlers.ServiceUpdates, architecture=[""], lock=None, report=False, quiet=True,
+                        unsafe=True)
+    return parser
+
+
+def _set_help_version_parser(root: SubParserAction) -> argparse.ArgumentParser:
+    """
+    add parser for version subcommand
+
+    Args:
+        root(SubParserAction): subparsers for the commands
+
+    Returns:
+        argparse.ArgumentParser: created argument parser
+    """
+    parser = root.add_parser("help-version", aliases=["version"], help="application version",
+                             description="print application and its dependencies versions", formatter_class=_formatter)
+    parser.set_defaults(handler=handlers.Versions, architecture=[""], lock=None, report=False, quiet=True, unsafe=True)
     return parser
 
 
@@ -259,14 +246,15 @@ def _set_package_add_parser(root: SubParserAction) -> argparse.ArgumentParser:
                                     "5) and finally you can add package from AUR.",
                              formatter_class=_formatter)
     parser.add_argument("package", help="package source (base name, path to local files, remote URL)", nargs="+")
+    parser.add_argument("--dependencies", help="process missing package dependencies",
+                        action=argparse.BooleanOptionalAction, default=True)
     parser.add_argument("-e", "--exit-code", help="return non-zero exit status if result is empty", action="store_true")
     parser.add_argument("-n", "--now", help="run update function after", action="store_true")
     parser.add_argument("-y", "--refresh", help="download fresh package databases from the mirror before actions, "
                                                 "-yy to force refresh even if up to date",
-                        action="count", default=0)
+                        action="count", default=False)
     parser.add_argument("-s", "--source", help="explicitly specify the package source for this command",
                         type=PackageSource, choices=enum_values(PackageSource), default=PackageSource.Auto)
-    parser.add_argument("--without-dependencies", help="do not add dependencies", action="store_true")
     parser.set_defaults(handler=handlers.Add)
     return parser
 
@@ -305,7 +293,8 @@ def _set_package_status_parser(root: SubParserAction) -> argparse.ArgumentParser
     parser.add_argument("package", help="filter status by package base", nargs="*")
     parser.add_argument("--ahriman", help="get service status itself", action="store_true")
     parser.add_argument("-e", "--exit-code", help="return non-zero exit status if result is empty", action="store_true")
-    parser.add_argument("-i", "--info", help="show additional package information", action="store_true")
+    parser.add_argument("--info", help="show additional package information",
+                        action=argparse.BooleanOptionalAction, default=False)
     parser.add_argument("-s", "--status", help="filter packages by status",
                         type=BuildStatusEnum, choices=enum_values(BuildStatusEnum))
     parser.set_defaults(handler=handlers.Status, lock=None, report=False, quiet=True, unsafe=True)
@@ -397,7 +386,8 @@ def _set_patch_list_parser(root: SubParserAction) -> argparse.ArgumentParser:
     parser.add_argument("-e", "--exit-code", help="return non-zero exit status if result is empty", action="store_true")
     parser.add_argument("-v", "--variable", help="if set, show only patches for specified PKGBUILD variables",
                         action="append")
-    parser.set_defaults(handler=handlers.Patch, action=Action.List, architecture=[""], lock=None, report=False)
+    parser.set_defaults(handler=handlers.Patch, action=Action.List, architecture=[""], lock=None, report=False,
+                        unsafe=True)
     return parser
 
 
@@ -479,18 +469,18 @@ def _set_repo_check_parser(root: SubParserAction) -> argparse.ArgumentParser:
                              formatter_class=_formatter)
     parser.add_argument("package", help="filter check by package base", nargs="*")
     parser.add_argument("-e", "--exit-code", help="return non-zero exit status if result is empty", action="store_true")
-    parser.add_argument("--vcs", help="enable or disable checking of VCS packages",
+    parser.add_argument("--vcs", help="fetch actual version of VCS packages",
                         action=argparse.BooleanOptionalAction, default=True)
     parser.add_argument("-y", "--refresh", help="download fresh package databases from the mirror before actions, "
                                                 "-yy to force refresh even if up to date",
-                        action="count", default=0)
-    parser.set_defaults(handler=handlers.Update, dry_run=True, aur=True, local=True, manual=False)
+                        action="count", default=False)
+    parser.set_defaults(handler=handlers.Update, dependencies=False, dry_run=True, aur=True, local=True, manual=False)
     return parser
 
 
-def _set_repo_clean_parser(root: SubParserAction) -> argparse.ArgumentParser:
+def _set_repo_daemon_parser(root: SubParserAction) -> argparse.ArgumentParser:
     """
-    add parser for repository clean subcommand
+    add parser for daemon subcommand
 
     Args:
         root(SubParserAction): subparsers for the commands
@@ -498,39 +488,24 @@ def _set_repo_clean_parser(root: SubParserAction) -> argparse.ArgumentParser:
     Returns:
         argparse.ArgumentParser: created argument parser
     """
-    parser = root.add_parser("repo-clean", aliases=["clean"], help="clean local caches",
-                             description="remove local caches",
-                             epilog="The subcommand clears every temporary directories (builds, caches etc). Normally "
-                                    "you should not run this command manually. Also in case if you are going to clear "
-                                    "the chroot directories you will need root privileges.",
+    parser = root.add_parser("repo-daemon", aliases=["daemon"], help="run application as daemon",
+                             description="start process which periodically will run update process",
                              formatter_class=_formatter)
-    parser.add_argument("--cache", help="clear directory with package caches",
-                        action=argparse.BooleanOptionalAction, default=False)
-    parser.add_argument("--chroot", help="clear build chroot", action=argparse.BooleanOptionalAction, default=False)
-    parser.add_argument("--manual", help="clear manually added packages queue",
-                        action=argparse.BooleanOptionalAction, default=False)
-    parser.add_argument("--packages", help="clear directory with built packages",
-                        action=argparse.BooleanOptionalAction, default=False)
-    parser.add_argument("--pacman", help="clear directory with pacman local database cache",
-                        action=argparse.BooleanOptionalAction, default=False)
-    parser.set_defaults(handler=handlers.Clean, quiet=True, unsafe=True)
-    return parser
-
-
-def _set_repo_config_parser(root: SubParserAction) -> argparse.ArgumentParser:
-    """
-    add parser for config subcommand
-
-    Args:
-        root(SubParserAction): subparsers for the commands
-
-    Returns:
-        argparse.ArgumentParser: created argument parser
-    """
-    parser = root.add_parser("repo-config", aliases=["config"], help="dump configuration",
-                             description="dump configuration for the specified architecture",
-                             formatter_class=_formatter)
-    parser.set_defaults(handler=handlers.Dump, lock=None, report=False, quiet=True, unsafe=True)
+    parser.add_argument("-i", "--interval", help="interval between runs in seconds", type=int, default=60 * 60 * 12)
+    parser.add_argument("--aur", help="enable or disable checking for AUR updates",
+                        action=argparse.BooleanOptionalAction, default=True)
+    parser.add_argument("--dependencies", help="process missing package dependencies",
+                        action=argparse.BooleanOptionalAction, default=True)
+    parser.add_argument("--local", help="enable or disable checking of local packages for updates",
+                        action=argparse.BooleanOptionalAction, default=True)
+    parser.add_argument("--manual", help="include or exclude manual updates",
+                        action=argparse.BooleanOptionalAction, default=True)
+    parser.add_argument("--vcs", help="fetch actual version of VCS packages",
+                        action=argparse.BooleanOptionalAction, default=True)
+    parser.add_argument("-y", "--refresh", help="download fresh package databases from the mirror before actions, "
+                                                "-yy to force refresh even if up to date",
+                        action="count", default=False)
+    parser.set_defaults(handler=handlers.Daemon, dry_run=False, exit_code=False, package=[])
     return parser
 
 
@@ -614,36 +589,6 @@ def _set_repo_restore_parser(root: SubParserAction) -> argparse.ArgumentParser:
     return parser
 
 
-def _set_repo_setup_parser(root: SubParserAction) -> argparse.ArgumentParser:
-    """
-    add parser for setup subcommand
-
-    Args:
-        root(SubParserAction): subparsers for the commands
-
-    Returns:
-        argparse.ArgumentParser: created argument parser
-    """
-    parser = root.add_parser("repo-setup", aliases=["init", "repo-init", "setup"], help="initial service configuration",
-                             description="create initial service configuration, requires root",
-                             epilog="Create _minimal_ configuration for the service according to provided options.",
-                             formatter_class=_formatter)
-    parser.add_argument("--build-as-user", help="force makepkg user to the specific one")
-    parser.add_argument("--build-command", help="build command prefix", default="ahriman")
-    parser.add_argument("--from-configuration", help="path to default devtools pacman configuration",
-                        type=Path, default=Path("/usr/share/devtools/pacman-extra.conf"))
-    parser.add_argument("--multilib", help="add or do not multilib repository",
-                        action=argparse.BooleanOptionalAction, default=True)
-    parser.add_argument("--packager", help="packager name and email", required=True)
-    parser.add_argument("--repository", help="repository name", required=True)
-    parser.add_argument("--sign-key", help="sign key id")
-    parser.add_argument("--sign-target", help="sign options", action="append",
-                        type=SignSettings.from_option, choices=enum_values(SignSettings))
-    parser.add_argument("--web-port", help="port of the web service", type=int)
-    parser.set_defaults(handler=handlers.Setup, lock=None, report=False, quiet=True, unsafe=True)
-    return parser
-
-
 def _set_repo_sign_parser(root: SubParserAction) -> argparse.ArgumentParser:
     """
     add parser for sign subcommand
@@ -700,6 +645,23 @@ def _set_repo_sync_parser(root: SubParserAction) -> argparse.ArgumentParser:
     return parser
 
 
+def _set_repo_tree_parser(root: SubParserAction) -> argparse.ArgumentParser:
+    """
+    add parser for repository tree subcommand
+
+    Args:
+        root(SubParserAction): subparsers for the commands
+
+    Returns:
+        argparse.ArgumentParser: created argument parser
+    """
+    parser = root.add_parser("repo-tree", help="dump repository tree",
+                             description="dump repository tree based on packages dependencies",
+                             formatter_class=_formatter)
+    parser.set_defaults(handler=handlers.Structure, lock=None, report=False, quiet=True, unsafe=True)
+    return parser
+
+
 def _set_repo_triggers_parser(root: SubParserAction) -> argparse.ArgumentParser:
     """
     add parser for repository triggers subcommand
@@ -714,7 +676,7 @@ def _set_repo_triggers_parser(root: SubParserAction) -> argparse.ArgumentParser:
                              description="run triggers on empty build result as configured by settings",
                              formatter_class=_formatter)
     parser.add_argument("trigger", help="instead of running all triggers as set by configuration, just process "
-                                        "specified ones oin order of metion", nargs="*")
+                                        "specified ones in order of mention", nargs="*")
     parser.set_defaults(handler=handlers.Triggers)
     return parser
 
@@ -733,24 +695,152 @@ def _set_repo_update_parser(root: SubParserAction) -> argparse.ArgumentParser:
                              description="check for packages updates and run build process if requested",
                              formatter_class=_formatter)
     parser.add_argument("package", help="filter check by package base", nargs="*")
+    parser.add_argument("--aur", help="enable or disable checking for AUR updates",
+                        action=argparse.BooleanOptionalAction, default=True)
+    parser.add_argument("--dependencies", help="process missing package dependencies",
+                        action=argparse.BooleanOptionalAction, default=True)
     parser.add_argument("--dry-run", help="just perform check for updates, same as check command", action="store_true")
     parser.add_argument("-e", "--exit-code", help="return non-zero exit status if result is empty", action="store_true")
-    parser.add_argument("--aur", help="enable or disable checking for AUR updates. Implies --no-vcs",
-                        action=argparse.BooleanOptionalAction, default=True)
     parser.add_argument("--local", help="enable or disable checking of local packages for updates",
                         action=argparse.BooleanOptionalAction, default=True)
     parser.add_argument("--manual", help="include or exclude manual updates",
                         action=argparse.BooleanOptionalAction, default=True)
-    parser.add_argument("--vcs", help="enable or disable checking of VCS packages",
+    parser.add_argument("--vcs", help="fetch actual version of VCS packages",
                         action=argparse.BooleanOptionalAction, default=True)
     parser.add_argument("-y", "--refresh", help="download fresh package databases from the mirror before actions, "
                                                 "-yy to force refresh even if up to date",
-                        action="count", default=0)
+                        action="count", default=False)
     parser.set_defaults(handler=handlers.Update)
     return parser
 
 
-def _set_shell_parser(root: SubParserAction) -> argparse.ArgumentParser:
+def _set_service_clean_parser(root: SubParserAction) -> argparse.ArgumentParser:
+    """
+    add parser for repository clean subcommand
+
+    Args:
+        root(SubParserAction): subparsers for the commands
+
+    Returns:
+        argparse.ArgumentParser: created argument parser
+    """
+    parser = root.add_parser("service-clean", aliases=["clean", "repo-clean"], help="clean local caches",
+                             description="remove local caches",
+                             epilog="The subcommand clears every temporary directories (builds, caches etc). Normally "
+                                    "you should not run this command manually. Also in case if you are going to clear "
+                                    "the chroot directories you will need root privileges.",
+                             formatter_class=_formatter)
+    parser.add_argument("--cache", help="clear directory with package caches",
+                        action=argparse.BooleanOptionalAction, default=False)
+    parser.add_argument("--chroot", help="clear build chroot", action=argparse.BooleanOptionalAction, default=False)
+    parser.add_argument("--manual", help="clear manually added packages queue",
+                        action=argparse.BooleanOptionalAction, default=False)
+    parser.add_argument("--packages", help="clear directory with built packages",
+                        action=argparse.BooleanOptionalAction, default=False)
+    parser.add_argument("--pacman", help="clear directory with pacman local database cache",
+                        action=argparse.BooleanOptionalAction, default=False)
+    parser.set_defaults(handler=handlers.Clean, quiet=True, unsafe=True)
+    return parser
+
+
+def _set_service_config_parser(root: SubParserAction) -> argparse.ArgumentParser:
+    """
+    add parser for config subcommand
+
+    Args:
+        root(SubParserAction): subparsers for the commands
+
+    Returns:
+        argparse.ArgumentParser: created argument parser
+    """
+    parser = root.add_parser("service-config", aliases=["config", "repo-config"], help="dump configuration",
+                             description="dump configuration for the specified architecture",
+                             formatter_class=_formatter)
+    parser.add_argument("--secure", help="hide passwords and secrets from output",
+                        action=argparse.BooleanOptionalAction, default=True)
+    parser.set_defaults(handler=handlers.Dump, lock=None, report=False, quiet=True, unsafe=True)
+    return parser
+
+
+def _set_service_config_validate_parser(root: SubParserAction) -> argparse.ArgumentParser:
+    """
+    add parser for config validation subcommand
+
+    Args:
+        root(SubParserAction): subparsers for the commands
+
+    Returns:
+        argparse.ArgumentParser: created argument parser
+    """
+    parser = root.add_parser("service-config-validate", aliases=["config-validate", "repo-config-validate"],
+                             help="validate system configuration",
+                             description="validate configuration and print found errors",
+                             formatter_class=_formatter)
+    parser.add_argument("-e", "--exit-code", help="return non-zero exit status if configuration is invalid",
+                        action="store_true")
+    parser.set_defaults(handler=handlers.Validate, lock=None, report=False, quiet=True, unsafe=True)
+    return parser
+
+
+def _set_service_key_import_parser(root: SubParserAction) -> argparse.ArgumentParser:
+    """
+    add parser for key import subcommand
+
+    Args:
+        root(SubParserAction): subparsers for the commands
+
+    Returns:
+        argparse.ArgumentParser: created argument parser
+    """
+    parser = root.add_parser("service-key-import", aliases=["key-import"], help="import PGP key",
+                             description="import PGP key from public sources to the repository user",
+                             epilog="By default ahriman runs build process with package sources validation "
+                                    "(in case if signature and keys are available in PKGBUILD). This process will "
+                                    "fail in case if key is not known for build user. This subcommand can be used "
+                                    "in order to import the PGP key to user keychain.",
+                             formatter_class=_formatter)
+    parser.add_argument("--key-server", help="key server for key import", default="keyserver.ubuntu.com")
+    parser.add_argument("key", help="PGP key to import from public server")
+    parser.set_defaults(handler=handlers.KeyImport, architecture=[""], lock=None, report=False)
+    return parser
+
+
+def _set_service_setup_parser(root: SubParserAction) -> argparse.ArgumentParser:
+    """
+    add parser for setup subcommand
+
+    Args:
+        root(SubParserAction): subparsers for the commands
+
+    Returns:
+        argparse.ArgumentParser: created argument parser
+    """
+    parser = root.add_parser("service-setup", aliases=["init", "repo-init", "repo-setup", "setup"],
+                             help="initial service configuration",
+                             description="create initial service configuration, requires root",
+                             epilog="Create _minimal_ configuration for the service according to provided options.",
+                             formatter_class=_formatter)
+    parser.add_argument("--build-as-user", help="force makepkg user to the specific one")
+    parser.add_argument("--build-command", help="build command prefix", default="ahriman")
+    parser.add_argument("--from-configuration", help="path to default devtools pacman configuration",
+                        type=Path, default=Path("/usr") / "share" / "devtools" / "pacman.conf.d" / "extra.conf")
+    parser.add_argument("--makeflags-jobs", help="append MAKEFLAGS variable with parallelism set to number of cores",
+                        action=argparse.BooleanOptionalAction, default=True)
+    parser.add_argument("--mirror", help="use the specified explicitly mirror instead of including mirrorlist")
+    parser.add_argument("--multilib", help="add or do not multilib repository",
+                        action=argparse.BooleanOptionalAction, default=True)
+    parser.add_argument("--packager", help="packager name and email", required=True)
+    parser.add_argument("--repository", help="repository name", required=True)
+    parser.add_argument("--sign-key", help="sign key id")
+    parser.add_argument("--sign-target", help="sign options", action="append",
+                        type=SignSettings.from_option, choices=enum_values(SignSettings))
+    parser.add_argument("--web-port", help="port of the web service", type=int)
+    parser.add_argument("--web-unix-socket", help="path to unix socket used for interprocess communications", type=Path)
+    parser.set_defaults(handler=handlers.Setup, lock=None, report=False, quiet=True, unsafe=True)
+    return parser
+
+
+def _set_service_shell_parser(root: SubParserAction) -> argparse.ArgumentParser:
     """
     add parser for shell subcommand
 
@@ -760,7 +850,7 @@ def _set_shell_parser(root: SubParserAction) -> argparse.ArgumentParser:
     Returns:
         argparse.ArgumentParser: created argument parser
     """
-    parser = root.add_parser("shell", help="envoke python shell",
+    parser = root.add_parser("service-shell", aliases=["shell"], help="invoke python shell",
                              description="drop into python shell while having created application",
                              formatter_class=_formatter)
     parser.add_argument("code", help="instead of dropping into shell, just execute the specified code", nargs="?")
@@ -782,16 +872,17 @@ def _set_user_add_parser(root: SubParserAction) -> argparse.ArgumentParser:
     parser = root.add_parser("user-add", help="create or update user",
                              description="update user for web services with the given password and role. "
                                          "In case if password was not entered it will be asked interactively",
+                             epilog="In case of first run (i.e. if password salt is not set yet) this action requires "
+                                    "root privileges because it performs write to filesystem configuration.",
                              formatter_class=_formatter)
     parser.add_argument("username", help="username for web service")
-    parser.add_argument("--as-service", help="add user as service user", action="store_true")
     parser.add_argument("-p", "--password", help="user password. Blank password will be treated as empty password, "
                                                  "which is in particular must be used for OAuth2 authorization type.")
     parser.add_argument("-r", "--role", help="user access level",
                         type=UserAccess, choices=enum_values(UserAccess), default=UserAccess.Read)
     parser.add_argument("-s", "--secure", help="set file permissions to user-only", action="store_true")
     parser.set_defaults(handler=handlers.Users, action=Action.Update, architecture=[""], lock=None, report=False,
-                        quiet=True, unsafe=True)
+                        quiet=True)
     return parser
 
 
@@ -830,26 +921,8 @@ def _set_user_remove_parser(root: SubParserAction) -> argparse.ArgumentParser:
                              description="remove user from the user mapping and update the configuration",
                              formatter_class=_formatter)
     parser.add_argument("username", help="username for web service")
-    parser.add_argument("-s", "--secure", help="set file permissions to user-only", action="store_true")
     parser.set_defaults(handler=handlers.Users, action=Action.Remove, architecture=[""], lock=None, report=False,  # nosec
-                        password="", quiet=True, unsafe=True)
-    return parser
-
-
-def _set_version_parser(root: SubParserAction) -> argparse.ArgumentParser:
-    """
-    add parser for version subcommand
-
-    Args:
-        root(SubParserAction): subparsers for the commands
-
-    Returns:
-        argparse.ArgumentParser: created argument parser
-    """
-    parser = root.add_parser("version", help="application version",
-                             description="print application and its dependencies versions", formatter_class=_formatter)
-    parser.set_defaults(handler=handlers.Versions, architecture=[""], lock=None, report=False, quiet=True,
-                        unsafe=True)
+                        password="", quiet=True)
     return parser
 
 
@@ -864,7 +937,8 @@ def _set_web_parser(root: SubParserAction) -> argparse.ArgumentParser:
         argparse.ArgumentParser: created argument parser
     """
     parser = root.add_parser("web", help="web server", description="start web server", formatter_class=_formatter)
-    parser.set_defaults(handler=handlers.Web, lock=None, report=False, parser=_parser)
+    parser.set_defaults(handler=handlers.Web, lock=Path(tempfile.gettempdir()) / "ahriman-web.lock", report=False,
+                        parser=_parser)
     return parser
 
 

src/ahriman/application/application/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/application/application.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -17,10 +17,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-from typing import Set
+from collections.abc import Iterable
 
 from ahriman.application.application.application_packages import ApplicationPackages
 from ahriman.application.application.application_repository import ApplicationRepository
+from ahriman.models.package import Package
 from ahriman.models.result import Result
 
 
@@ -49,14 +50,14 @@ class Application(ApplicationPackages, ApplicationRepository):
         be used instead.
     """
 
-    def _known_packages(self) -> Set[str]:
+    def _known_packages(self) -> set[str]:
         """
         load packages from repository and pacman repositories
 
         Returns:
-            Set[str]: list of known packages
+            set[str]: list of known packages
         """
-        known_packages: Set[str] = set()
+        known_packages: set[str] = set()
         # local set
         for base in self.repository.packages():
             for package, properties in base.packages.items():
@@ -87,3 +88,39 @@ class Application(ApplicationPackages, ApplicationRepository):
         directly as it will be called after on_start action
         """
         self.repository.triggers.on_stop()
+
+    def with_dependencies(self, packages: list[Package], *, process_dependencies: bool) -> list[Package]:
+        """
+        add missing dependencies to list of packages
+
+        Args:
+            packages(list[Package]): list of source packages of which dependencies have to be processed
+            process_dependencies(bool): if no set, dependencies will not be processed
+        """
+        def missing_dependencies(source: Iterable[Package]) -> set[str]:
+            # build initial list of dependencies
+            result = set()
+            for package in source:
+                result.update(package.depends_build)
+
+            # remove ones which are already well-known
+            result = result.difference(known_packages)
+
+            # remove ones which are in this list already
+            for package in source:
+                result = result.difference(package.packages_full)
+
+            return result
+
+        if not process_dependencies or not packages:
+            return packages
+
+        known_packages = self._known_packages()
+        with_dependencies = {package.base: package for package in packages}
+
+        while missing := missing_dependencies(with_dependencies.values()):
+            for package_name in missing:
+                package = Package.from_aur(package_name, self.repository.pacman)
+                with_dependencies[package.base] = package
+
+        return list(with_dependencies.values())

src/ahriman/application/application/application_packages.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -20,9 +20,9 @@
 import requests
 import shutil
 
+from collections.abc import Iterable
 from pathlib import Path
-from tempfile import TemporaryDirectory
-from typing import Any, Iterable, Set
+from typing import Any
 
 from ahriman.application.application.application_properties import ApplicationProperties
 from ahriman.core.build_tools.sources import Sources
@@ -37,30 +37,6 @@ class ApplicationPackages(ApplicationProperties):
     package control class
     """
 
-    def _known_packages(self) -> Set[str]:
-        """
-        load packages from repository and pacman repositories
-
-        Returns:
-            Set[str]: list of known packages
-
-        Raises:
-            NotImplementedError: not implemented method
-        """
-        raise NotImplementedError
-
-    def on_result(self, result: Result) -> None:
-        """
-        generate report and sync to remote server
-
-        Args:
-            result(Result): build result
-
-        Raises:
-            NotImplementedError: not implemented method
-        """
-        raise NotImplementedError
-
     def _add_archive(self, source: str, *_: Any) -> None:
         """
         add package from archive
@@ -72,24 +48,18 @@ class ApplicationPackages(ApplicationProperties):
         dst = self.repository.paths.packages / local_path.name
         shutil.copy(local_path, dst)
 
-    def _add_aur(self, source: str, known_packages: Set[str], without_dependencies: bool) -> None:
+    def _add_aur(self, source: str) -> None:
         """
         add package from AUR
 
         Args:
             source(str): package base name
-            known_packages(Set[str]): list of packages which are known by the service
-            without_dependencies(bool): if set, dependency check will be disabled
         """
         package = Package.from_aur(source, self.repository.pacman)
 
         self.database.build_queue_insert(package)
         self.database.remote_update(package)
 
-        with TemporaryDirectory(ignore_cleanup_errors=True) as dir_name, (local_dir := Path(dir_name)):
-            Sources.load(local_dir, package, self.database.patches_get(package.base), self.repository.paths)
-            self._process_dependencies(local_dir, known_packages, without_dependencies)
-
     def _add_directory(self, source: str, *_: Any) -> None:
         """
         add packages from directory
@@ -101,25 +71,21 @@ class ApplicationPackages(ApplicationProperties):
         for full_path in filter(package_like, local_dir.iterdir()):
             self._add_archive(str(full_path))
 
-    def _add_local(self, source: str, known_packages: Set[str], without_dependencies: bool) -> None:
+    def _add_local(self, source: str) -> None:
         """
         add package from local PKGBUILDs
 
         Args:
             source(str): path to directory with local source files
-            known_packages(Set[str]): list of packages which are known by the service
-            without_dependencies(bool): if set, dependency check will be disabled
         """
         source_dir = Path(source)
-        package = Package.from_build(source_dir)
+        package = Package.from_build(source_dir, self.architecture)
         cache_dir = self.repository.paths.cache_for(package.base)
         shutil.copytree(source_dir, cache_dir)  # copy package to store in caches
         Sources.init(cache_dir)  # we need to run init command in directory where we do have permissions
 
         self.database.build_queue_insert(package)
 
-        self._process_dependencies(cache_dir, known_packages, without_dependencies)
-
     def _add_remote(self, source: str, *_: Any) -> None:
         """
         add package from remote sources (e.g. HTTP)
@@ -128,7 +94,8 @@ class ApplicationPackages(ApplicationProperties):
             source(str): remote URL of the package archive
         """
         dst = self.repository.paths.packages / Path(source).name  # URL is path, is not it?
-        response = requests.get(source, stream=True, timeout=None)  # timeout=None to suppress pylint warns
+        # timeout=None to suppress pylint warns. Also suppress bandit warnings
+        response = requests.get(source, stream=True, timeout=None)  # nosec
         response.raise_for_status()
 
         with dst.open("wb") as local_file:
@@ -145,38 +112,31 @@ class ApplicationPackages(ApplicationProperties):
         package = Package.from_official(source, self.repository.pacman)
         self.database.build_queue_insert(package)
         self.database.remote_update(package)
-        # repository packages must not depend on unknown packages, thus we are not going to process dependencies
 
-    def _process_dependencies(self, local_dir: Path, known_packages: Set[str], without_dependencies: bool) -> None:
-        """
-        process package dependencies
-
-        Args:
-            local_dir(Path): path to local package sources (i.e. cloned AUR repository)
-            known_packages(Set[str]): list of packages which are known by the service
-            without_dependencies(bool): if set, dependency check will be disabled
-        """
-        if without_dependencies:
-            return
-
-        dependencies = Package.dependencies(local_dir)
-        self.add(dependencies.difference(known_packages), PackageSource.AUR, without_dependencies)
-
-    def add(self, names: Iterable[str], source: PackageSource, without_dependencies: bool) -> None:
+    def add(self, names: Iterable[str], source: PackageSource) -> None:
         """
         add packages for the next build
 
         Args:
             names(Iterable[str]): list of package bases to add
             source(PackageSource): package source to add
-            without_dependencies(bool): if set, dependency check will be disabled
         """
-        known_packages = self._known_packages()  # speedup dependencies processing
-
         for name in names:
             resolved_source = source.resolve(name)
             fn = getattr(self, f"_add_{resolved_source.value}")
-            fn(name, known_packages, without_dependencies)
+            fn(name)
+
+    def on_result(self, result: Result) -> None:
+        """
+        generate report and sync to remote server
+
+        Args:
+            result(Result): build result
+
+        Raises:
+            NotImplementedError: not implemented method
+        """
+        raise NotImplementedError
 
     def remove(self, names: Iterable[str]) -> None:
         """

src/ahriman/application/application/application_properties.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -19,8 +19,9 @@
 #
 from ahriman.core.configuration import Configuration
 from ahriman.core.database import SQLite
-from ahriman.core.lazy_logging import LazyLogging
+from ahriman.core.log import LazyLogging
 from ahriman.core.repository import Repository
+from ahriman.models.pacman_synchronization import PacmanSynchronization
 
 
 class ApplicationProperties(LazyLogging):
@@ -34,8 +35,8 @@ class ApplicationProperties(LazyLogging):
         repository(Repository): repository instance
     """
 
-    def __init__(self, architecture: str, configuration: Configuration, *,
-                 report: bool, unsafe: bool, refresh_pacman_database: int = 0) -> None:
+    def __init__(self, architecture: str, configuration: Configuration, *, report: bool, unsafe: bool,
+                 refresh_pacman_database: PacmanSynchronization = PacmanSynchronization.Disabled) -> None:
         """
         default constructor
 
@@ -44,10 +45,11 @@ class ApplicationProperties(LazyLogging):
             configuration(Configuration): configuration instance
             report(bool): force enable or disable reporting
             unsafe(bool): if set no user check will be performed before path creation
-            refresh_pacman_database(int): pacman database syncronization level, ``0`` is disabled
+            refresh_pacman_database(PacmanSynchronization, optional): pacman database synchronization level
+                (Default value = PacmanSynchronization.Disabled)
         """
         self.configuration = configuration
         self.architecture = architecture
         self.database = SQLite.load(configuration)
-        self.repository = Repository(architecture, configuration, self.database,
-                                     report=report, unsafe=unsafe, refresh_pacman_database=refresh_pacman_database)
+        self.repository = Repository.load(architecture, configuration, self.database, report=report, unsafe=unsafe,
+                                          refresh_pacman_database=refresh_pacman_database)

src/ahriman/application/application/application_repository.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -17,10 +17,8 @@
 # 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 shutil
-
+from collections.abc import Callable, Iterable
 from pathlib import Path
-from typing import Callable, Iterable, List
 
 from ahriman.application.application.application_properties import ApplicationProperties
 from ahriman.core.build_tools.sources import Sources
@@ -35,18 +33,6 @@ class ApplicationRepository(ApplicationProperties):
     repository control class
     """
 
-    def on_result(self, result: Result) -> None:
-        """
-        generate report and sync to remote server
-
-        Args:
-            result(Result): build result
-
-        Raises:
-            NotImplementedError: not implemented method
-        """
-        raise NotImplementedError
-
     def clean(self, *, cache: bool, chroot: bool, manual: bool, packages: bool, pacman: bool) -> None:
         """
         run all clean methods. Warning: some functions might not be available under non-root
@@ -54,7 +40,7 @@ class ApplicationRepository(ApplicationProperties):
         Args:
             cache(bool): clear directory with package caches
             chroot(bool): clear build chroot
-            manual(bool): clear directory with manually added packages
+            manual(bool): clear directory with manually added packages' bases
             packages(bool): clear directory with built packages
             pacman(bool): clear directory with pacman databases
         """
@@ -69,6 +55,18 @@ class ApplicationRepository(ApplicationProperties):
         if pacman:
             self.repository.clear_pacman()
 
+    def on_result(self, result: Result) -> None:
+        """
+        generate report and sync to remote server
+
+        Args:
+            result(Result): build result
+
+        Raises:
+            NotImplementedError: not implemented method
+        """
+        raise NotImplementedError
+
     def sign(self, packages: Iterable[str]) -> None:
         """
         sign packages and repository
@@ -85,28 +83,25 @@ class ApplicationRepository(ApplicationProperties):
                 if archive.filepath is None:
                     self.logger.warning("filepath is empty for %s", package.base)
                     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([])
+                self.repository.sign.process_sign_package(archive.filepath, package.base)
         # sign repository database if set
         self.repository.sign.process_sign_repository(self.repository.repo.repo_path)
+        # process triggers
         self.on_result(Result())
 
-    def unknown(self) -> List[str]:
+    def unknown(self) -> list[str]:
         """
         get packages which were not found in AUR
 
         Returns:
-            List[str]: unknown package archive list
+            list[str]: unknown package archive list
         """
         def has_local(probe: Package) -> bool:
             cache_dir = self.repository.paths.cache_for(probe.base)
             return cache_dir.is_dir() and not Sources.has_remotes(cache_dir)
 
-        def unknown_aur(probe: Package) -> List[str]:
-            packages: List[str] = []
+        def unknown_aur(probe: Package) -> list[str]:
+            packages: list[str] = []
             for single in probe.packages:
                 try:
                     _ = Package.from_aur(single, self.repository.pacman)
@@ -114,9 +109,9 @@ class ApplicationRepository(ApplicationProperties):
                     packages.append(single)
             return packages
 
-        def unknown_local(probe: Package) -> List[str]:
+        def unknown_local(probe: Package) -> list[str]:
             cache_dir = self.repository.paths.cache_for(probe.base)
-            local = Package.from_build(cache_dir)
+            local = Package.from_build(cache_dir, self.architecture)
             packages = set(probe.packages.keys()).difference(local.packages.keys())
             return list(packages)
 
@@ -150,8 +145,8 @@ class ApplicationRepository(ApplicationProperties):
         process_update(packages, build_result)
 
         # process manual packages
-        tree = Tree.load(updates, self.repository.paths, self.database)
-        for num, level in enumerate(tree.levels()):
+        tree = Tree.resolve(updates)
+        for num, level in enumerate(tree):
             self.logger.info("processing level #%i %s", num, [package.base for package in level])
             build_result = self.repository.process_build(level)
             packages = self.repository.packages_built()
@@ -160,7 +155,7 @@ class ApplicationRepository(ApplicationProperties):
         return build_result
 
     def updates(self, filter_packages: Iterable[str], *,
-                aur: bool, local: bool, manual: bool, vcs: bool, log_fn: Callable[[str], None]) -> List[Package]:
+                aur: bool, local: bool, manual: bool, vcs: bool, log_fn: Callable[[str], None]) -> list[Package]:
         """
         get list of packages to run update process
 
@@ -173,21 +168,25 @@ class ApplicationRepository(ApplicationProperties):
             log_fn(Callable[[str], None]): logger function to log updates
 
         Returns:
-            List[Package]: list of out-of-dated packages
+            list[Package]: list of out-of-dated packages
         """
         updates = {}
 
         if aur:
             updates.update({package.base: package for package in self.repository.updates_aur(filter_packages, vcs=vcs)})
         if local:
-            updates.update({package.base: package for package in self.repository.updates_local()})
+            updates.update({package.base: package for package in self.repository.updates_local(vcs=vcs)})
         if manual:
             updates.update({package.base: package for package in self.repository.updates_manual()})
 
         local_versions = {package.base: package.version for package in self.repository.packages()}
         updated_packages = [package for _, package in sorted(updates.items())]
-        for package in updated_packages:
-            UpdatePrinter(package, local_versions.get(package.base)).print(
-                verbose=True, log_fn=log_fn, separator=" -> ")
+
+        # reorder updates according to the dependency tree
+        tree = Tree.resolve(updated_packages)
+        for level in tree:
+            for package in level:
+                UpdatePrinter(package, local_versions.get(package.base)).print(
+                    verbose=True, log_fn=log_fn, separator=" -> ")
 
         return updated_packages

src/ahriman/application/handlers/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -32,14 +32,17 @@ from ahriman.application.handlers.remove import Remove
 from ahriman.application.handlers.remove_unknown import RemoveUnknown
 from ahriman.application.handlers.restore import Restore
 from ahriman.application.handlers.search import Search
+from ahriman.application.handlers.service_updates import ServiceUpdates
 from ahriman.application.handlers.setup import Setup
 from ahriman.application.handlers.shell import Shell
 from ahriman.application.handlers.sign import Sign
 from ahriman.application.handlers.status import Status
 from ahriman.application.handlers.status_update import StatusUpdate
+from ahriman.application.handlers.structure import Structure
 from ahriman.application.handlers.triggers import Triggers
 from ahriman.application.handlers.unsafe_commands import UnsafeCommands
 from ahriman.application.handlers.update import Update
 from ahriman.application.handlers.users import Users
+from ahriman.application.handlers.validate import Validate
 from ahriman.application.handlers.versions import Versions
 from ahriman.application.handlers.web import Web

src/ahriman/application/handlers/add.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -19,8 +19,6 @@
 #
 import argparse
 
-from typing import Type
-
 from ahriman.application.application import Application
 from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
@@ -32,7 +30,7 @@ class Add(Handler):
     """
 
     @classmethod
-    def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration, *,
+    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
             report: bool, unsafe: bool) -> None:
         """
         callback for command line
@@ -47,11 +45,12 @@ class Add(Handler):
         application = Application(architecture, configuration,
                                   report=report, unsafe=unsafe, refresh_pacman_database=args.refresh)
         application.on_start()
-        application.add(args.package, args.source, args.without_dependencies)
+        application.add(args.package, args.source)
         if not args.now:
             return
 
         packages = application.updates(args.package, aur=False, local=False, manual=True, vcs=False,
                                        log_fn=application.logger.info)
+        packages = application.with_dependencies(packages, process_dependencies=args.dependencies)
         result = application.update(packages)
         Add.check_if_empty(args.exit_code, result.is_empty)

src/ahriman/application/handlers/backup.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -22,7 +22,6 @@ import pwd
 
 from pathlib import Path
 from tarfile import TarFile
-from typing import Set, Type
 
 from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
@@ -37,7 +36,7 @@ class Backup(Handler):
     ALLOW_AUTO_ARCHITECTURE_RUN = False  # it should be called only as "no-architecture"
 
     @classmethod
-    def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration, *,
+    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
             report: bool, unsafe: bool) -> None:
         """
         callback for command line
@@ -55,15 +54,15 @@ class Backup(Handler):
                 archive.add(backup_path)
 
     @staticmethod
-    def get_paths(configuration: Configuration) -> Set[Path]:
+    def get_paths(configuration: Configuration) -> set[Path]:
         """
-        extract paths to backup
+        extract paths to back up
 
         Args:
             configuration(Configuration): configuration instance
 
         Returns:
-            Set[Path]: map of the filesystem paths
+            set[Path]: map of the filesystem paths
         """
         paths = set(configuration.include.glob("*.ini"))
 

src/ahriman/application/handlers/clean.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -19,8 +19,6 @@
 #
 import argparse
 
-from typing import Type
-
 from ahriman.application.application import Application
 from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
@@ -32,7 +30,7 @@ class Clean(Handler):
     """
 
     @classmethod
-    def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration, *,
+    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
             report: bool, unsafe: bool) -> None:
         """
         callback for command line

src/ahriman/application/handlers/daemon.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -20,8 +20,6 @@
 import argparse
 import threading
 
-from typing import Type
-
 from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
 
@@ -32,7 +30,7 @@ class Daemon(Handler):
     """
 
     @classmethod
-    def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration, *,
+    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
             report: bool, unsafe: bool) -> None:
         """
         callback for command line

src/ahriman/application/handlers/dump.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -19,8 +19,6 @@
 #
 import argparse
 
-from typing import Type
-
 from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.core.formatters import ConfigurationPrinter
@@ -34,7 +32,7 @@ class Dump(Handler):
     ALLOW_AUTO_ARCHITECTURE_RUN = False
 
     @classmethod
-    def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration, *,
+    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
             report: bool, unsafe: bool) -> None:
         """
         callback for command line
@@ -48,4 +46,4 @@ class Dump(Handler):
         """
         dump = configuration.dump()
         for section, values in sorted(dump.items()):
-            ConfigurationPrinter(section, values).print(verbose=False, separator=" = ")
+            ConfigurationPrinter(section, values).print(verbose=not args.secure, separator=" = ")

src/ahriman/application/handlers/handler.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -17,17 +17,15 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-from __future__ import annotations
-
 import argparse
 import logging
 
 from multiprocessing import Pool
-from typing import List, Type
 
 from ahriman.application.lock import Lock
 from ahriman.core.configuration import Configuration
 from ahriman.core.exceptions import ExitCode, MissingArchitectureError, MultipleArchitecturesError
+from ahriman.core.log import Log
 from ahriman.models.repository_paths import RepositoryPaths
 
 
@@ -44,6 +42,7 @@ class Handler:
         be called directly. The recommended way is to call ``execute`` class method, e.g.::
 
             >>> from ahriman.application.handlers import Add
+            >>>
             >>> Add.execute(args)
     """
 
@@ -51,7 +50,7 @@ class Handler:
     ALLOW_MULTI_ARCHITECTURE_RUN = True
 
     @classmethod
-    def architectures_extract(cls: Type[Handler], args: argparse.Namespace) -> List[str]:
+    def architectures_extract(cls, args: argparse.Namespace) -> list[str]:
         """
         get known architectures
 
@@ -59,7 +58,7 @@ class Handler:
             args(argparse.Namespace): command line args
 
         Returns:
-            List[str]: list of architectures for which tree is created
+            list[str]: list of architectures for which tree is created
 
         Raises:
             MissingArchitecture: if no architecture set and automatic detection is not allowed or failed
@@ -82,7 +81,7 @@ class Handler:
         return sorted(architectures)
 
     @classmethod
-    def call(cls: Type[Handler], args: argparse.Namespace, architecture: str) -> bool:
+    def call(cls, args: argparse.Namespace, architecture: str) -> bool:
         """
         additional function to wrap all calls for multiprocessing library
 
@@ -94,7 +93,8 @@ class Handler:
             bool: True on success, False otherwise
         """
         try:
-            configuration = Configuration.from_path(args.configuration, architecture, args.quiet)
+            configuration = Configuration.from_path(args.configuration, architecture)
+            Log.load(configuration, quiet=args.quiet, report=args.report)
             with Lock(args, architecture, configuration):
                 cls.run(args, architecture, configuration, report=args.report, unsafe=args.unsafe)
             return True
@@ -106,7 +106,7 @@ class Handler:
             return False
 
     @classmethod
-    def execute(cls: Type[Handler], args: argparse.Namespace) -> int:
+    def execute(cls, args: argparse.Namespace) -> int:
         """
         execute function for all aru
 
@@ -135,7 +135,7 @@ class Handler:
         return 0 if all(result) else 1
 
     @classmethod
-    def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration, *,
+    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
             report: bool, unsafe: bool) -> None:
         """
         callback for command line

src/ahriman/application/handlers/help.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -19,8 +19,6 @@
 #
 import argparse
 
-from typing import Type
-
 from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
 
@@ -33,7 +31,7 @@ class Help(Handler):
     ALLOW_AUTO_ARCHITECTURE_RUN = False  # it should be called only as "no-architecture"
 
     @classmethod
-    def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration, *,
+    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
             report: bool, unsafe: bool) -> None:
         """
         callback for command line

src/ahriman/application/handlers/key_import.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -19,8 +19,6 @@
 #
 import argparse
 
-from typing import Type
-
 from ahriman.application.application import Application
 from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
@@ -34,7 +32,7 @@ class KeyImport(Handler):
     ALLOW_AUTO_ARCHITECTURE_RUN = False  # it should be called only as "no-architecture"
 
     @classmethod
-    def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration, *,
+    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
             report: bool, unsafe: bool) -> None:
         """
         callback for command line

src/ahriman/application/handlers/patch.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -21,7 +21,6 @@ import argparse
 import sys
 
 from pathlib import Path
-from typing import List, Optional, Tuple, Type
 
 from ahriman.application.application import Application
 from ahriman.application.handlers import Handler
@@ -39,7 +38,7 @@ class Patch(Handler):
     """
 
     @classmethod
-    def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration, *,
+    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
             report: bool, unsafe: bool) -> None:
         """
         callback for command line
@@ -58,7 +57,7 @@ class Patch(Handler):
             patch = Patch.patch_create_from_function(args.variable, args.patch)
             Patch.patch_set_create(application, args.package, patch)
         elif args.action == Action.Update and args.variable is None:
-            package_base, patch = Patch.patch_create_from_diff(args.package, args.track)
+            package_base, patch = Patch.patch_create_from_diff(args.package, architecture, args.track)
             Patch.patch_set_create(application, package_base, patch)
         elif args.action == Action.List:
             Patch.patch_set_list(application, args.package, args.variable, args.exit_code)
@@ -66,30 +65,31 @@ class Patch(Handler):
             Patch.patch_set_remove(application, args.package, args.variable)
 
     @staticmethod
-    def patch_create_from_diff(sources_dir: Path, track: List[str]) -> Tuple[str, PkgbuildPatch]:
+    def patch_create_from_diff(sources_dir: Path, architecture: str, track: list[str]) -> tuple[str, PkgbuildPatch]:
         """
         create PKGBUILD plain diff patches from sources directory
 
         Args:
             sources_dir(Path): path to directory with the package sources
-            track(List[str]): track files which match the glob before creating the patch
+            architecture(str): repository architecture
+            track(list[str]): track files which match the glob before creating the patch
 
         Returns:
-            Tuple[str, PkgbuildPatch]: package base and created PKGBUILD patch based on the diff from master HEAD
+            tuple[str, PkgbuildPatch]: package base and created PKGBUILD patch based on the diff from master HEAD
                 to current files
         """
-        package = Package.from_build(sources_dir)
+        package = Package.from_build(sources_dir, architecture)
         patch = Sources.patch_create(sources_dir, *track)
         return package.base, PkgbuildPatch(None, patch)
 
     @staticmethod
-    def patch_create_from_function(variable: str, patch_path: Optional[Path]) -> PkgbuildPatch:
+    def patch_create_from_function(variable: str, patch_path: Path | None) -> PkgbuildPatch:
         """
         create single-function patch set for the package base
 
         Args:
             variable(str): function or variable name inside PKGBUILD
-            patch_path(Path): optional path to patch content. If not set, it will be read from stdin
+            patch_path(Path | None): optional path to patch content. If not set, it will be read from stdin
 
         Returns:
             PkgbuildPatch: created patch for the PKGBUILD function
@@ -115,17 +115,16 @@ class Patch(Handler):
         application.database.patches_insert(package_base, patch)
 
     @staticmethod
-    def patch_set_list(application: Application, package_base: Optional[str], variables: List[str],
+    def patch_set_list(application: Application, package_base: str | None, variables: list[str],
                        exit_code: bool) -> None:
         """
         list patches available for the package base
 
         Args:
             application(Application): application instance
-            package_base(Optional[str]): package base
-            variables(List[str]): extract patches only for specified PKGBUILD variables
+            package_base(str | None): package base
+            variables(list[str]): extract patches only for specified PKGBUILD variables
             exit_code(bool): exit with error on empty search result
-            :
         """
         patches = application.database.patches_list(package_base, variables)
         Patch.check_if_empty(exit_code, not patches)
@@ -134,13 +133,13 @@ class Patch(Handler):
             PatchPrinter(base, patch).print(verbose=True, separator=" = ")
 
     @staticmethod
-    def patch_set_remove(application: Application, package_base: str, variables: List[str]) -> None:
+    def patch_set_remove(application: Application, package_base: str, variables: list[str]) -> None:
         """
         remove patch set for the package base
 
         Args:
             application(Application): application instance
             package_base(str): package base
-            variables(List[str]): remove patches only for specified PKGBUILD variables
+            variables(list[str]): remove patches only for specified PKGBUILD variables
         """
         application.database.patches_remove(package_base, variables)

src/ahriman/application/handlers/rebuild.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -19,8 +19,6 @@
 #
 import argparse
 
-from typing import List, Type
-
 from ahriman.application.application import Application
 from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
@@ -34,7 +32,7 @@ class Rebuild(Handler):
     """
 
     @classmethod
-    def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration, *,
+    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
             report: bool, unsafe: bool) -> None:
         """
         callback for command line
@@ -46,13 +44,11 @@ class Rebuild(Handler):
             report(bool): force enable or disable reporting
             unsafe(bool): if set no user check will be performed before path creation
         """
-        depends_on = set(args.depends_on) if args.depends_on else None
-
         application = Application(architecture, configuration, report=report, unsafe=unsafe)
         application.on_start()
 
         packages = Rebuild.extract_packages(application, from_database=args.from_database)
-        updates = application.repository.packages_depend_on(packages, depends_on)
+        updates = application.repository.packages_depend_on(packages, args.depends_on or None)
 
         Rebuild.check_if_empty(args.exit_code, not updates)
         if args.dry_run:
@@ -64,7 +60,7 @@ class Rebuild(Handler):
         Rebuild.check_if_empty(args.exit_code, result.is_empty)
 
     @staticmethod
-    def extract_packages(application: Application, *, from_database: bool) -> List[Package]:
+    def extract_packages(application: Application, *, from_database: bool) -> list[Package]:
         """
         extract packages from database file
 
@@ -73,8 +69,8 @@ class Rebuild(Handler):
             from_database(bool): extract packages from database instead of repository filesystem
 
         Returns:
-            List[Package]: list of packages which were stored in database
+            list[Package]: list of packages which were stored in database
         """
         if from_database:
-            return application.repository.packages()
-        return [package for (package, _) in application.database.packages_get()]
+            return [package for (package, _) in application.database.packages_get()]
+        return application.repository.packages()

src/ahriman/application/handlers/remove.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -19,8 +19,6 @@
 #
 import argparse
 
-from typing import Type
-
 from ahriman.application.application import Application
 from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
@@ -32,7 +30,7 @@ class Remove(Handler):
     """
 
     @classmethod
-    def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration, *,
+    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
             report: bool, unsafe: bool) -> None:
         """
         callback for command line

src/ahriman/application/handlers/remove_unknown.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -19,8 +19,6 @@
 #
 import argparse
 
-from typing import Type
-
 from ahriman.application.application import Application
 from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
@@ -33,7 +31,7 @@ class RemoveUnknown(Handler):
     """
 
     @classmethod
-    def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration, *,
+    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
             report: bool, unsafe: bool) -> None:
         """
         callback for command line
@@ -51,7 +49,7 @@ class RemoveUnknown(Handler):
 
         if args.dry_run:
             for package in sorted(unknown_packages):
-                StringPrinter(package).print(False)
+                StringPrinter(package).print(verbose=False)
             return
 
         application.remove(unknown_packages)

src/ahriman/application/handlers/restore.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -19,7 +19,6 @@
 #
 import argparse
 
-from typing import Type
 from tarfile import TarFile
 
 from ahriman.application.handlers import Handler
@@ -34,7 +33,7 @@ class Restore(Handler):
     ALLOW_AUTO_ARCHITECTURE_RUN = False  # it should be called only as "no-architecture"
 
     @classmethod
-    def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration, *,
+    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
             report: bool, unsafe: bool) -> None:
         """
         callback for command line

src/ahriman/application/handlers/search.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -20,7 +20,7 @@
 import argparse
 
 from dataclasses import fields
-from typing import Callable, Iterable, List, Tuple, Type
+from collections.abc import Callable, Iterable
 
 from ahriman.application.application import Application
 from ahriman.application.handlers import Handler
@@ -36,14 +36,18 @@ class Search(Handler):
     packages search handler
 
     Attributes:
-        SORT_FIELDS(Set[str]): (class attribute) allowed fields to sort the package list
+        SORT_FIELDS(set[str]): (class attribute) allowed fields to sort the package list
     """
 
     ALLOW_AUTO_ARCHITECTURE_RUN = False  # it should be called only as "no-architecture"
-    SORT_FIELDS = {field.name for field in fields(AURPackage) if field.default_factory is not list}
+    SORT_FIELDS = {
+        field.name
+        for field in fields(AURPackage)
+        if field.default_factory is not list  # type: ignore[comparison-overlap]
+    }
 
     @classmethod
-    def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration, *,
+    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
             report: bool, unsafe: bool) -> None:
         """
         callback for command line
@@ -64,10 +68,10 @@ class Search(Handler):
         for packages_list in (official_packages_list, aur_packages_list):
             # keep sorting by packages source
             for package in Search.sort(packages_list, args.sort_by):
-                AurPrinter(package).print(args.info)
+                AurPrinter(package).print(verbose=args.info)
 
     @staticmethod
-    def sort(packages: Iterable[AURPackage], sort_by: str) -> List[AURPackage]:
+    def sort(packages: Iterable[AURPackage], sort_by: str) -> list[AURPackage]:
         """
         sort package list by specified field
 
@@ -76,7 +80,7 @@ class Search(Handler):
             sort_by(str): AUR package field name to sort by
 
         Returns:
-            List[AURPackage]: sorted list for packages
+            list[AURPackage]: sorted list for packages
 
         Raises:
             InvalidOption: if search fields is not in list of allowed ones
@@ -85,6 +89,6 @@ class Search(Handler):
             raise OptionError(sort_by)
         # always sort by package name at the last
         # well technically it is not a string, but we can deal with it
-        comparator: Callable[[AURPackage], Tuple[str, str]] =\
+        comparator: Callable[[AURPackage], tuple[str, str]] =\
             lambda package: (getattr(package, sort_by), package.name)
         return sorted(packages, key=comparator)

src/ahriman/application/handlers/service_updates.py

@@ -0,0 +1,63 @@
+#
+# Copyright (c) 2021-2023 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 ahriman import version
+from ahriman.application.application import Application
+from ahriman.application.handlers import Handler
+from ahriman.core.configuration import Configuration
+from ahriman.core.formatters import UpdatePrinter
+from ahriman.models.package import Package
+
+
+class ServiceUpdates(Handler):
+    """
+    service updates handler
+    """
+
+    ALLOW_AUTO_ARCHITECTURE_RUN = False  # it should be called only as "no-architecture"
+
+    @classmethod
+    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
+            report: bool, unsafe: bool) -> None:
+        """
+        callback for command line
+
+        Args:
+            args(argparse.Namespace): command line args
+            architecture(str): repository architecture
+            configuration(Configuration): configuration instance
+            report(bool): force enable or disable reporting
+            unsafe(bool): if set no user check will be performed before path creation
+        """
+        application = Application(architecture, configuration, report=report, unsafe=unsafe)
+
+        remote = Package.from_aur("ahriman", application.repository.pacman)
+        release = remote.version.rsplit("-", 1)[-1]  # we don't store pkgrel locally, so we just append it
+        local_version = f"{version.__version__}-{release}"
+
+        # technically we would like to compare versions, but it is fine to raise an exception in case if locally
+        # installed package is newer than in AUR
+        same_version = remote.version == local_version
+        if same_version:
+            return
+
+        UpdatePrinter(remote, local_version).print(verbose=True, separator=" -> ")
+        ServiceUpdates.check_if_empty(args.exit_code, not same_version)

src/ahriman/application/handlers/setup.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -21,7 +21,6 @@ import argparse
 
 from pathlib import Path
 from pwd import getpwuid
-from typing import Type
 
 from ahriman.application.application import Application
 from ahriman.application.handlers import Handler
@@ -41,12 +40,12 @@ class Setup(Handler):
 
     ALLOW_AUTO_ARCHITECTURE_RUN = False
 
-    ARCHBUILD_COMMAND_PATH = Path("/usr/bin/archbuild")
-    MIRRORLIST_PATH = Path("/etc/pacman.d/mirrorlist")
-    SUDOERS_DIR_PATH = Path("/etc/sudoers.d")
+    ARCHBUILD_COMMAND_PATH = Path("/usr") / "bin" / "archbuild"
+    MIRRORLIST_PATH = Path("/etc") / "pacman.d" / "mirrorlist"
+    SUDOERS_DIR_PATH = Path("/etc") / "sudoers.d"
 
     @classmethod
-    def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration, *,
+    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
             report: bool, unsafe: bool) -> None:
         """
         callback for command line
@@ -58,19 +57,20 @@ class Setup(Handler):
             report(bool): force enable or disable reporting
             unsafe(bool): if set no user check will be performed before path creation
         """
-        Setup.configuration_create_ahriman(args, architecture, args.repository, configuration.include,
-                                           configuration.repository_paths)
+        Setup.configuration_create_ahriman(args, architecture, args.repository, configuration)
         configuration.reload()
 
         application = Application(architecture, configuration, report=report, unsafe=unsafe)
 
-        Setup.configuration_create_makepkg(args.packager, application.repository.paths)
+        Setup.configuration_create_makepkg(args.packager, args.makeflags_jobs, application.repository.paths)
         Setup.executable_create(application.repository.paths, args.build_command, architecture)
-        Setup.configuration_create_devtools(args.build_command, architecture, args.from_configuration,
+        Setup.configuration_create_devtools(args.build_command, architecture, args.from_configuration, args.mirror,
                                             args.multilib, args.repository, application.repository.paths)
         Setup.configuration_create_sudo(application.repository.paths, args.build_command, architecture)
 
         application.repository.repo.init()
+        # lazy database sync
+        application.repository.pacman.handle  # pylint: disable=pointless-statement
 
     @staticmethod
     def build_command(root: Path, prefix: str, architecture: str) -> Path:
@@ -78,7 +78,7 @@ class Setup(Handler):
         generate build command name
 
         Args:
-            root(Path): root directory for the build command (must be root of the reporitory)
+            root(Path): root directory for the build command (must be root of the repository)
             prefix(str): command prefix in {prefix}-{architecture}-build
             architecture(str): repository architecture
 
@@ -89,7 +89,7 @@ class Setup(Handler):
 
     @staticmethod
     def configuration_create_ahriman(args: argparse.Namespace, architecture: str, repository: str,
-                                     include_path: Path, paths: RepositoryPaths) -> None:
+                                     root: Configuration) -> None:
         """
         create service specific configuration
 
@@ -97,33 +97,41 @@ class Setup(Handler):
             args(argparse.Namespace): command line args
             architecture(str): repository architecture
             repository(str): repository name
-            include_path(Path): path to directory with configuration includes
-            paths(RepositoryPaths): repository paths instance
+            root(Configuration): root configuration instance
         """
         configuration = Configuration()
 
         section = Configuration.section_name("build", architecture)
-        build_command = Setup.build_command(paths.root, args.build_command, architecture)
+        build_command = Setup.build_command(root.repository_paths.root, args.build_command, architecture)
         configuration.set_option(section, "build_command", str(build_command))
         configuration.set_option("repository", "name", repository)
         if args.build_as_user is not None:
             configuration.set_option(section, "makechrootpkg_flags", f"-U {args.build_as_user}")
 
+        section = Configuration.section_name("alpm", architecture)
+        if args.mirror is not None:
+            configuration.set_option(section, "mirror", args.mirror)
+        if not args.multilib:
+            repositories = filter(lambda r: r != "multilib", root.getlist("alpm", "repositories"))
+            configuration.set_option(section, "repositories", " ".join(repositories))
+
+        section = Configuration.section_name("sign", architecture)
         if args.sign_key is not None:
-            section = Configuration.section_name("sign", architecture)
             configuration.set_option(section, "target", " ".join([target.name.lower() for target in args.sign_target]))
             configuration.set_option(section, "key", args.sign_key)
 
+        section = Configuration.section_name("web", architecture)
         if args.web_port is not None:
-            section = Configuration.section_name("web", architecture)
             configuration.set_option(section, "port", str(args.web_port))
+        if args.web_unix_socket is not None:
+            configuration.set_option(section, "unix_socket", str(args.web_unix_socket))
 
-        target = include_path / "setup-overrides.ini"
+        target = root.include / "00-setup-overrides.ini"
         with target.open("w") as ahriman_configuration:
             configuration.write(ahriman_configuration)
 
     @staticmethod
-    def configuration_create_devtools(prefix: str, architecture: str, source: Path,
+    def configuration_create_devtools(prefix: str, architecture: str, source: Path, mirror: str | None,
                                       multilib: bool, repository: str, paths: RepositoryPaths) -> None:
         """
         create configuration for devtools based on ``source`` configuration
@@ -135,7 +143,8 @@ class Setup(Handler):
             prefix(str): command prefix in {prefix}-{architecture}-build
             architecture(str): repository architecture
             source(Path): path to source configuration file
-            multilib(bool): add or do not multilib repository
+            mirror(str | None): link to package server mirror
+            multilib(bool): add or do not multilib repository to the configuration
             repository(str): repository name
             paths(RepositoryPaths): repository paths instance
         """
@@ -144,7 +153,7 @@ class Setup(Handler):
         configuration = Configuration(allow_no_value=True)
         # preserve case
         # stupid mypy thinks that it is impossible
-        configuration.optionxform = lambda key: key  # type: ignore
+        configuration.optionxform = lambda key: key  # type: ignore[method-assign]
 
         # load default configuration first
         # we cannot use Include here because it will be copied to new chroot, thus no includes there
@@ -157,26 +166,40 @@ class Setup(Handler):
         if multilib:
             configuration.set_option("multilib", "Include", str(Setup.MIRRORLIST_PATH))
 
+        # override Include option to Server in case if mirror option set
+        if mirror is not None:
+            for section in filter(lambda s: s != "options", configuration.sections()):
+                if configuration.get(section, "Include", fallback=None) != str(Setup.MIRRORLIST_PATH):
+                    continue
+                configuration.remove_option(section, "Include")
+                configuration.set_option(section, "Server", mirror)
+
         # add repository itself
         configuration.set_option(repository, "SigLevel", "Optional TrustAll")  # we don't care
         configuration.set_option(repository, "Server", f"file://{paths.repository}")
 
-        target = source.parent / f"pacman-{prefix}-{architecture}.conf"
+        target = source.parent / f"{prefix}-{architecture}.conf"
         with target.open("w") as devtools_configuration:
             configuration.write(devtools_configuration)
 
     @staticmethod
-    def configuration_create_makepkg(packager: str, paths: RepositoryPaths) -> None:
+    def configuration_create_makepkg(packager: str, makeflags_jobs: bool, paths: RepositoryPaths) -> None:
         """
         create configuration for makepkg
 
         Args:
             packager(str): packager identifier (e.g. name, email)
+            makeflags_jobs(bool): set MAKEFLAGS variable to number of cores
             paths(RepositoryPaths): repository paths instance
         """
+
+        content = f"PACKAGER='{packager}'\n"
+        if makeflags_jobs:
+            content += """MAKEFLAGS="-j$(nproc)"\n"""
+
         uid, _ = paths.root_owner
         home_dir = Path(getpwuid(uid).pw_dir)
-        (home_dir / ".makepkg.conf").write_text(f"PACKAGER='{packager}'\n", encoding="utf8")
+        (home_dir / ".makepkg.conf").write_text(content, encoding="utf8")
 
     @staticmethod
     def configuration_create_sudo(paths: RepositoryPaths, prefix: str, architecture: str) -> None:

src/ahriman/application/handlers/shell.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -22,7 +22,6 @@ import code
 import sys
 
 from pathlib import Path
-from typing import Type
 
 from ahriman.application.application import Application
 from ahriman.application.handlers import Handler
@@ -38,7 +37,7 @@ class Shell(Handler):
     ALLOW_MULTI_ARCHITECTURE_RUN = False
 
     @classmethod
-    def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration, *,
+    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
             report: bool, unsafe: bool) -> None:
         """
         callback for command line
@@ -56,7 +55,8 @@ class Shell(Handler):
             # licensed by https://creativecommons.org/licenses/by-sa/3.0
             path = Path(sys.prefix) / "share" / "ahriman" / "templates" / "shell"
             StringPrinter(path.read_text(encoding="utf8")).print(verbose=False)
+        # we only want to pass application instance inside
         if args.code is None:
-            code.interact(local=locals())
+            code.interact(local={"application": application})
         else:
-            code.InteractiveConsole(locals=locals()).runcode(args.code)
+            code.InteractiveConsole(locals={"application": application}).runcode(args.code)

src/ahriman/application/handlers/sign.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -19,8 +19,6 @@
 #
 import argparse
 
-from typing import Type
-
 from ahriman.application.application import Application
 from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
@@ -32,7 +30,7 @@ class Sign(Handler):
     """
 
     @classmethod
-    def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration, *,
+    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
             report: bool, unsafe: bool) -> None:
         """
         callback for command line

src/ahriman/application/handlers/status.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -19,7 +19,7 @@
 #
 import argparse
 
-from typing import Callable, Iterable, Tuple, Type
+from collections.abc import Callable
 
 from ahriman.application.application import Application
 from ahriman.application.handlers import Handler
@@ -37,7 +37,7 @@ class Status(Handler):
     ALLOW_AUTO_ARCHITECTURE_RUN = False
 
     @classmethod
-    def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration, *,
+    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
             report: bool, unsafe: bool) -> None:
         """
         callback for command line
@@ -53,9 +53,9 @@ class Status(Handler):
         client = Application(architecture, configuration, report=True, unsafe=unsafe).repository.reporter
         if args.ahriman:
             service_status = client.get_internal()
-            StatusPrinter(service_status.status).print(args.info)
+            StatusPrinter(service_status.status).print(verbose=args.info)
         if args.package:
-            packages: Iterable[Tuple[Package, BuildStatus]] = sum(
+            packages: list[tuple[Package, BuildStatus]] = sum(
                 (client.get(base) for base in args.package),
                 start=[])
         else:
@@ -63,8 +63,8 @@ class Status(Handler):
 
         Status.check_if_empty(args.exit_code, not packages)
 
-        comparator: Callable[[Tuple[Package, BuildStatus]], str] = lambda item: item[0].base
-        filter_fn: Callable[[Tuple[Package, BuildStatus]], bool] =\
+        comparator: Callable[[tuple[Package, BuildStatus]], str] = lambda item: item[0].base
+        filter_fn: Callable[[tuple[Package, BuildStatus]], bool] =\
             lambda item: args.status is None or item[1].status == args.status
         for package, package_status in sorted(filter(filter_fn, packages), key=comparator):
-            PackagePrinter(package, package_status).print(args.info)
+            PackagePrinter(package, package_status).print(verbose=args.info)

src/ahriman/application/handlers/status_update.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -19,8 +19,6 @@
 #
 import argparse
 
-from typing import Type
-
 from ahriman.application.application import Application
 from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
@@ -35,7 +33,7 @@ class StatusUpdate(Handler):
     ALLOW_AUTO_ARCHITECTURE_RUN = False
 
     @classmethod
-    def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration, *,
+    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
             report: bool, unsafe: bool) -> None:
         """
         callback for command line

src/ahriman/application/handlers/structure.py

@@ -0,0 +1,54 @@
+#
+# Copyright (c) 2021-2023 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 ahriman.application.application import Application
+from ahriman.application.handlers import Handler
+from ahriman.core.configuration import Configuration
+from ahriman.core.formatters import TreePrinter
+from ahriman.core.tree import Tree
+
+
+class Structure(Handler):
+    """
+    dump repository structure handler
+    """
+
+    ALLOW_AUTO_ARCHITECTURE_RUN = False
+
+    @classmethod
+    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
+            report: bool, unsafe: bool) -> None:
+        """
+        callback for command line
+
+        Args:
+            args(argparse.Namespace): command line args
+            architecture(str): repository architecture
+            configuration(Configuration): configuration instance
+            report(bool): force enable or disable reporting
+            unsafe(bool): if set no user check will be performed before path creation
+        """
+        application = Application(architecture, configuration, report=report, unsafe=unsafe)
+        packages = application.repository.packages()
+
+        tree = Tree.resolve(packages)
+        for num, level in enumerate(tree):
+            TreePrinter(num, level).print(verbose=True, separator=" ")

src/ahriman/application/handlers/triggers.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -19,8 +19,6 @@
 #
 import argparse
 
-from typing import Type
-
 from ahriman.application.application import Application
 from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
@@ -33,7 +31,7 @@ class Triggers(Handler):
     """
 
     @classmethod
-    def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration, *,
+    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
             report: bool, unsafe: bool) -> None:
         """
         callback for command line
@@ -48,6 +46,6 @@ class Triggers(Handler):
         application = Application(architecture, configuration, report=report, unsafe=unsafe)
         if args.trigger:
             loader = application.repository.triggers
-            loader.triggers = [loader.load_trigger(trigger) for trigger in args.trigger]
+            loader.triggers = [loader.load_trigger(trigger, architecture, configuration) for trigger in args.trigger]
         application.on_start()
         application.on_result(Result())

src/ahriman/application/handlers/unsafe_commands.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -20,8 +20,6 @@
 import argparse
 import shlex
 
-from typing import List, Type
-
 from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.core.formatters import StringPrinter
@@ -35,7 +33,7 @@ class UnsafeCommands(Handler):
     ALLOW_AUTO_ARCHITECTURE_RUN = False  # it should be called only as "no-architecture"
 
     @classmethod
-    def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration, *,
+    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
             report: bool, unsafe: bool) -> None:
         """
         callback for command line
@@ -56,20 +54,20 @@ class UnsafeCommands(Handler):
             UnsafeCommands.check_unsafe(args.command, unsafe_commands, parser)
 
     @staticmethod
-    def check_unsafe(command: str, unsafe_commands: List[str], parser: argparse.ArgumentParser) -> None:
+    def check_unsafe(command: str, unsafe_commands: list[str], parser: argparse.ArgumentParser) -> None:
         """
         check if command is unsafe
 
         Args:
             command(str): command to check
-            unsafe_commands(List[str]): list of unsafe commands
+            unsafe_commands(list[str]): list of unsafe commands
             parser(argparse.ArgumentParser): generated argument parser
         """
         args = parser.parse_args(shlex.split(command))
         UnsafeCommands.check_if_empty(True, args.command in unsafe_commands)
 
     @staticmethod
-    def get_unsafe_commands(parser: argparse.ArgumentParser) -> List[str]:
+    def get_unsafe_commands(parser: argparse.ArgumentParser) -> list[str]:
         """
         extract unsafe commands from argument parser
 
@@ -77,9 +75,9 @@ class UnsafeCommands(Handler):
             parser(argparse.ArgumentParser): generated argument parser
 
         Returns:
-            List[str]: list of commands with default unsafe flag
+            list[str]: list of commands with default unsafe flag
         """
         # should never fail
         # pylint: disable=protected-access
         subparser = next(action for action in parser._actions if isinstance(action, argparse._SubParsersAction))
-        return [action_name for action_name, action in subparser.choices.items() if action.get_default("unsafe")]
+        return sorted(action_name for action_name, action in subparser.choices.items() if action.get_default("unsafe"))

src/ahriman/application/handlers/update.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -19,7 +19,7 @@
 #
 import argparse
 
-from typing import Callable, Type
+from collections.abc import Callable
 
 from ahriman.application.application import Application
 from ahriman.application.handlers import Handler
@@ -32,7 +32,7 @@ class Update(Handler):
     """
 
     @classmethod
-    def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration, *,
+    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
             report: bool, unsafe: bool) -> None:
         """
         callback for command line
@@ -53,6 +53,7 @@ class Update(Handler):
         if args.dry_run:
             return
 
+        packages = application.with_dependencies(packages, process_dependencies=args.dependencies)
         result = application.update(packages)
         Update.check_if_empty(args.exit_code, result.is_empty)
 

src/ahriman/application/handlers/users.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -21,11 +21,11 @@ import argparse
 import getpass
 
 from pathlib import Path
-from typing import Type
 
 from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.core.database import SQLite
+from ahriman.core.exceptions import PasswordError
 from ahriman.core.formatters import UserPrinter
 from ahriman.models.action import Action
 from ahriman.models.user import User
@@ -39,7 +39,7 @@ class Users(Handler):
     ALLOW_AUTO_ARCHITECTURE_RUN = False  # it should be called only as "no-architecture"
 
     @classmethod
-    def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration, *,
+    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
             report: bool, unsafe: bool) -> None:
         """
         callback for command line
@@ -54,12 +54,13 @@ class Users(Handler):
         database = SQLite.load(configuration)
 
         if args.action == Action.Update:
-            salt = Users.get_salt(configuration)
+            old_salt, salt = Users.get_salt(configuration)
             user = Users.user_create(args)
 
-            auth_configuration = Users.configuration_get(configuration.include)
+            if old_salt is None:
+                auth_configuration = Users.configuration_get(configuration.include)
+                Users.configuration_create(auth_configuration, salt, args.secure)
 
-            Users.configuration_create(auth_configuration, user, salt, args.as_service, args.secure)
             database.user_update(user.hash_password(salt))
         elif args.action == Action.List:
             users = database.user_list(args.username, args.role)
@@ -70,22 +71,16 @@ class Users(Handler):
             database.user_remove(args.username)
 
     @staticmethod
-    def configuration_create(configuration: Configuration, user: User, salt: str,
-                             as_service_user: bool, secure: bool) -> None:
+    def configuration_create(configuration: Configuration, salt: str, secure: bool) -> None:
         """
         enable configuration if it has been disabled
 
         Args:
             configuration(Configuration): configuration instance
-            user(User): user descriptor
             salt(str): password hash salt
-            as_service_user(bool): add user as service user, also set password and user to configuration
             secure(bool): if true then set file permissions to 0o600
         """
         configuration.set_option("auth", "salt", salt)
-        if as_service_user:
-            configuration.set_option("web", "username", user.username)
-            configuration.set_option("web", "password", user.password)
         Users.configuration_write(configuration, secure)
 
     @staticmethod
@@ -99,7 +94,7 @@ class Users(Handler):
         Returns:
             Configuration: configuration instance. In case if there are local settings they will be loaded
         """
-        target = include_path / "auth.ini"
+        target = include_path / "00-auth.ini"
         configuration = Configuration()
         configuration.load(target)
 
@@ -123,7 +118,7 @@ class Users(Handler):
             path.chmod(0o600)
 
     @staticmethod
-    def get_salt(configuration: Configuration, salt_length: int = 20) -> str:
+    def get_salt(configuration: Configuration, salt_length: int = 20) -> tuple[str | None, str]:
         """
         get salt from configuration or create new string
 
@@ -132,11 +127,12 @@ class Users(Handler):
             salt_length(int, optional): salt length (Default value = 20)
 
         Returns:
-            str: current salt
+            tuple[str | None, str]: tuple containing salt from configuration if any and actual salt which must be
+                used for password hash
         """
         if salt := configuration.get("auth", "salt", fallback=None):
-            return salt
-        return User.generate_password(salt_length)
+            return salt, salt
+        return None, User.generate_password(salt_length)
 
     @staticmethod
     def user_create(args: argparse.Namespace) -> User:
@@ -149,7 +145,15 @@ class Users(Handler):
         Returns:
             User: built user descriptor
         """
+        def read_password() -> str:
+            first_password = getpass.getpass()
+            second_password = getpass.getpass("Repeat password: ")
+            if first_password != second_password:
+                raise PasswordError("passwords don't match")
+            return first_password
+
         password = args.password
         if password is None:
-            password = getpass.getpass()
+            password = read_password()
+
         return User(username=args.username, password=password, access=args.role)

src/ahriman/application/handlers/validate.py

@@ -0,0 +1,135 @@
+#
+# Copyright (c) 2021-2023 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 copy
+
+from typing import Any
+
+from ahriman.application.handlers import Handler
+from ahriman.core.configuration import Configuration
+from ahriman.core.configuration.schema import CONFIGURATION_SCHEMA, ConfigurationSchema
+from ahriman.core.configuration.validator import Validator
+from ahriman.core.exceptions import ExtensionError
+from ahriman.core.formatters import ValidationPrinter
+from ahriman.core.triggers import TriggerLoader
+
+
+class Validate(Handler):
+    """
+    configuration validator handler
+    """
+
+    ALLOW_AUTO_ARCHITECTURE_RUN = False
+
+    @classmethod
+    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
+            report: bool, unsafe: bool) -> None:
+        """
+        callback for command line
+
+        Args:
+            args(argparse.Namespace): command line args
+            architecture(str): repository architecture
+            configuration(Configuration): configuration instance
+            report(bool): force enable or disable reporting
+            unsafe(bool): if set no user check will be performed before path creation
+        """
+        schema = Validate.schema(architecture, configuration)
+        validator = Validator(configuration=configuration, schema=schema)
+
+        if validator.validate(configuration.dump()):
+            return  # no errors found
+        for node, errors in validator.errors.items():
+            ValidationPrinter(node, errors).print(verbose=True)
+
+        # as we reach this part it means that we always have errors
+        Validate.check_if_empty(args.exit_code, True)
+
+    @staticmethod
+    def schema(architecture: str, configuration: Configuration) -> ConfigurationSchema:
+        """
+        get schema with triggers
+
+        Args:
+            architecture(str): repository architecture
+            configuration(Configuration): configuration instance
+
+        Returns:
+            ConfigurationSchema: configuration validation schema
+        """
+        root = copy.deepcopy(CONFIGURATION_SCHEMA)
+
+        # create trigger loader instance
+        loader = TriggerLoader()
+        for trigger in loader.selected_triggers(configuration):
+            try:
+                trigger_class = loader.load_trigger_class(trigger)
+            except ExtensionError:
+                continue
+
+            # default settings if any
+            for schema_name, schema in trigger_class.configuration_schema(architecture, None).items():
+                erased = Validate.schema_erase_required(copy.deepcopy(schema))
+                root[schema_name] = Validate.schema_merge(root.get(schema_name, {}), erased)
+
+            # settings according to enabled triggers
+            for schema_name, schema in trigger_class.configuration_schema(architecture, configuration).items():
+                root[schema_name] = Validate.schema_merge(root.get(schema_name, {}), copy.deepcopy(schema))
+
+        return root
+
+    @staticmethod
+    def schema_erase_required(schema: ConfigurationSchema) -> ConfigurationSchema:
+        """
+        recursively remove required field from supplied cerberus schema
+
+        Args:
+            schema(ConfigurationSchema): source schema from which required field must be removed
+
+        Returns:
+            ConfigurationSchema: schema without required fields. Note, that source schema will be modified in-place
+        """
+        schema.pop("required", None)
+        for value in filter(lambda v: isinstance(v, dict), schema.values()):
+            Validate.schema_erase_required(value)
+        return schema
+
+    @staticmethod
+    def schema_merge(source: dict[str, Any], schema: dict[str, Any]) -> dict[str, Any]:
+        """
+        merge child schema into source. In case if source already contains values, new keys will be added
+            (possibly with overrides - in case if such key already set also)
+
+        Args:
+            source(dict[str, Any]): source (current) schema into which will be merged
+            schema(dict[str, Any]): new schema to be merged
+
+        Returns:
+            dict[str, Any]: schema with added elements from source schema if they were set before and not presented
+                in the new one. Note, that schema will be modified in-place
+        """
+        for key, value in source.items():
+            if key not in schema:
+                schema[key] = value  # new key found, just add it as is
+            elif isinstance(value, dict):
+                # value is dictionary, so we need to go deeper
+                Validate.schema_merge(value, schema[key])
+
+        return schema

src/ahriman/application/handlers/versions.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -18,10 +18,11 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 import argparse
-import pkg_resources
+import re
 import sys
 
-from typing import Dict, List, Tuple, Type
+from collections.abc import Generator
+from importlib import metadata
 
 from ahriman import version
 from ahriman.application.handlers import Handler
@@ -32,12 +33,16 @@ from ahriman.core.formatters import VersionPrinter
 class Versions(Handler):
     """
     version handler
+
+    Attributes:
+        PEP423_PACKAGE_NAME(str): (class attribute) special regex for valid PEP423 package name
     """
 
     ALLOW_AUTO_ARCHITECTURE_RUN = False  # it should be called only as "no-architecture"
+    PEP423_PACKAGE_NAME = re.compile(r"^[A-Za-z0-9._-]+")
 
     @classmethod
-    def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration, *,
+    def run(cls, args: argparse.Namespace, architecture: str, configuration: Configuration, *,
             report: bool, unsafe: bool) -> None:
         """
         callback for command line
@@ -51,37 +56,43 @@ class Versions(Handler):
         """
         VersionPrinter(f"Module version {version.__version__}",
                        {"Python": sys.version}).print(verbose=False, separator=" ")
-        packages = Versions.package_dependencies("ahriman", ("pacman", "s3", "web"))
-        VersionPrinter("Installed packages", packages).print(verbose=False, separator=" ")
+        packages = Versions.package_dependencies("ahriman")
+        VersionPrinter("Installed packages", dict(packages)).print(verbose=False, separator=" ")
 
     @staticmethod
-    def package_dependencies(root: str, root_extras: Tuple[str, ...] = ()) -> Dict[str, str]:
+    def package_dependencies(root: str) -> Generator[tuple[str, str], None, None]:
         """
         extract list of ahriman package dependencies installed into system with their versions
 
         Args:
             root(str): root package name
-            root_extras(Tuple[str, ...]): extras for the root package (Default value = ())
 
         Returns:
-            Dict[str, str]: map of installed dependency to its version
+            Generator[tuple[str, str], None, None]: map of installed dependency to its version
         """
-        resources: Dict[str, pkg_resources.Distribution] = pkg_resources.working_set.by_key  # type: ignore
+        def dependencies_by_key(key: str) -> Generator[str, None, None]:
+            # in importlib it returns requires in the following format
+            # ["pytest (>=3.0.0) ; extra == 'test'", "pytest-cov ; extra == 'test'"]
+            try:
+                requires = metadata.requires(key)
+            except metadata.PackageNotFoundError:
+                return
+            for entry in requires or []:
+                yield from Versions.PEP423_PACKAGE_NAME.findall(entry)
 
-        def dependencies_by_key(key: str, extras: Tuple[str, ...] = ()) -> List[str]:
-            return [entry.key for entry in resources[key].requires(extras)]
-
-        keys: List[str] = []
-        portion = {key for key in dependencies_by_key(root, root_extras) if key in resources}
+        keys: list[str] = []
+        portion = set(dependencies_by_key(root))
         while portion:
             keys.extend(portion)
             portion = {
                 key
-                for key in sum((dependencies_by_key(key) for key in portion), start=[])
-                if key not in keys and key in resources
+                for key in sum((list(dependencies_by_key(key)) for key in portion), start=[])
+                if key not in keys
             }
 
-        return {
-            resource.project_name: resource.version
-            for resource in map(lambda key: resources[key], keys)
-        }
+        for key in keys:
+            try:
+                distribution = metadata.distribution(key)
+                yield distribution.name, distribution.version
+            except metadata.PackageNotFoundError:
+                continue