pyinfra 3.1.1__tar.gz → 3.2__tar.gz

{pyinfra-3.1.1 → pyinfra-3.2}/CHANGELOG.md

@@ -1,3 +1,41 @@
+# v3.2
+
+Hello 2025! Here's pyinfra 3.2 - with another incredible round of contributions from the community, THANK YOU ALL. New stuff:
+
+- Add total counts to results summary (@NichtJens)
+- Enable passing extra data via `local.include` (@TimothyWillard)
+- Validate inventory files and display warnings for unexpected variables (@simonhammes)
+
+New operations/facts:
+
+- Add `pipx` operations (`packages`, `upgrade_all`, `ensure_path`) facts (`PipxPackages`, `PipxEnvironment`) and operations (@maisim)
+- Add `server.OsRelease` fact (@wowi42)
+- Add `podman.PodmanSystemInfo` and `podman.PodmanPs` facts (@bauen1)
+- Add many extra arguments (including generic args) to `files.FindFiles*` facts (@JakkuSakura)
+- Add `system` argument to `git.config` operation (@Pirols)
+- Add `psql_database` argument to postgres operations & facts (@hamishfagg)
+- Add `files.Sha384File` fact and `sha384sum` argument to `files.download` operation (@simonhammes)
+- Add `apt.SimulateOperationWillChange` fact (@bauen1)
+- Detect changes in `apt.upgrade` and `apt.dist_upgrade` operations (@bauen1)
+- Add `fibootmgr.EFIBootMgr` fact (@bauen1)
+- Add opkg facts and operations (@morrison12)
+
+Fixes:
+
+- Multiple fixes for `server.crontab` operation and facts (@JakkuSakura)
+- Correctly handle `latest` argument with requirements file in `pip.packages` operation (@amiraliakbari)
+- Fix regex used to parse installed apk packages (@simonhammes)
+- Fix SSH connector overwriting known hosts files (@vo452)
+
+Docs/internal tweaks:
+
+- Add type annotations for many more operations (@simonhammes)
+- Add typos CI checking to replace flake8-spellcheck (@simonhammes)
+- Bump CI actions and dependencies (@simonhammes)
+- Require JSON tests to include all arguments
+- Remove unused `configparser` dependency (@bkmgit)
+- Many small documentation fixes/tweaks
+
 # v3.1.1
 
 - Improve errors with 2.x style `@decorator` (vs `@decorator()`) functions

{pyinfra-3.1.1/pyinfra.egg-info → pyinfra-3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyinfra
-Version: 3.1.1
+Version: 3.2
 Summary: pyinfra automates/provisions/manages/deploys infrastructure.
 Home-page: https://pyinfra.com
 Author: Nick / Fizzadar
@@ -33,7 +33,6 @@ Requires-Dist: click>2
 Requires-Dist: jinja2<4,>2
 Requires-Dist: python-dateutil<3,>2
 Requires-Dist: setuptools
-Requires-Dist: configparser
 Requires-Dist: pywinrm
 Requires-Dist: typeguard
 Requires-Dist: distro<2,>=1.6
@@ -42,12 +41,12 @@ Requires-Dist: graphlib_backport; python_version < "3.9"
 Requires-Dist: typing-extensions; python_version < "3.11"
 Requires-Dist: importlib_metadata>=3.6; python_version < "3.10"
 Provides-Extra: test
-Requires-Dist: pytest==8.2.1; extra == "test"
-Requires-Dist: coverage==7.5.1; extra == "test"
+Requires-Dist: pytest==8.3.3; extra == "test"
+Requires-Dist: coverage==7.6.1; extra == "test"
 Requires-Dist: pytest-cov==5.0.0; extra == "test"
-Requires-Dist: black==24.4.2; extra == "test"
+Requires-Dist: black==24.8.0; extra == "test"
 Requires-Dist: isort==5.13.2; extra == "test"
-Requires-Dist: flake8==7.0.0; extra == "test"
+Requires-Dist: flake8==7.1.1; extra == "test"
 Requires-Dist: flake8-black==0.3.6; extra == "test"
 Requires-Dist: flake8-isort==6.1.1; extra == "test"
 Requires-Dist: mypy; extra == "test"
@@ -58,15 +57,15 @@ Requires-Dist: types-PyYAML; extra == "test"
 Requires-Dist: types-setuptools; extra == "test"
 Provides-Extra: docs
 Requires-Dist: pyinfra-guzzle_sphinx_theme==0.16; extra == "docs"
-Requires-Dist: myst-parser==2.0.0; extra == "docs"
+Requires-Dist: myst-parser==3.0.1; extra == "docs"
 Requires-Dist: sphinx==6.2.1; extra == "docs"
 Provides-Extra: dev
-Requires-Dist: pytest==8.2.1; extra == "dev"
-Requires-Dist: coverage==7.5.1; extra == "dev"
+Requires-Dist: pytest==8.3.3; extra == "dev"
+Requires-Dist: coverage==7.6.1; extra == "dev"
 Requires-Dist: pytest-cov==5.0.0; extra == "dev"
-Requires-Dist: black==24.4.2; extra == "dev"
+Requires-Dist: black==24.8.0; extra == "dev"
 Requires-Dist: isort==5.13.2; extra == "dev"
-Requires-Dist: flake8==7.0.0; extra == "dev"
+Requires-Dist: flake8==7.1.1; extra == "dev"
 Requires-Dist: flake8-black==0.3.6; extra == "dev"
 Requires-Dist: flake8-isort==6.1.1; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
@@ -76,7 +75,7 @@ Requires-Dist: types-python-dateutil; extra == "dev"
 Requires-Dist: types-PyYAML; extra == "dev"
 Requires-Dist: types-setuptools; extra == "dev"
 Requires-Dist: pyinfra-guzzle_sphinx_theme==0.16; extra == "dev"
-Requires-Dist: myst-parser==2.0.0; extra == "dev"
+Requires-Dist: myst-parser==3.0.1; extra == "dev"
 Requires-Dist: sphinx==6.2.1; extra == "dev"
 Requires-Dist: wheel; extra == "dev"
 Requires-Dist: twine; extra == "dev"

{pyinfra-3.1.1 → pyinfra-3.2}/pyinfra/api/arguments.py

@@ -248,6 +248,12 @@ __argument_docs__ = {
     "Privilege & user escalation": (
         auth_argument_meta,
         """
+        .. caution::
+            When combining privilege escalation arguments it is important to know the order they
+            are applied: ``doas`` -> ``sudo`` -> ``su``. For example
+            ``_sudo=True,_su_user="pyinfra"`` yields a command like ``sudo su pyinfra..``.
+        """,
+        """
         .. code:: python
 
             # Execute a command with sudo
@@ -268,6 +274,7 @@ __argument_docs__ = {
     ),
     "Shell control & features": (
         shell_argument_meta,
+        "",
         """
         .. code:: python
 
@@ -279,8 +286,8 @@ __argument_docs__ = {
             )
         """,
     ),
-    "Operation meta & callbacks": (meta_argument_meta, ""),
-    "Execution strategy": (execution_argument_meta, ""),
+    "Operation meta & callbacks": (meta_argument_meta, "", ""),
+    "Execution strategy": (execution_argument_meta, "", ""),
 }
 
 

{pyinfra-3.1.1 → pyinfra-3.2}/pyinfra/api/deploy.py

@@ -23,7 +23,7 @@ if TYPE_CHECKING:
     from pyinfra.api.state import State
 
 
-def add_deploy(state: "State", deploy_func: Callable[..., Any], *args, **kwargs):
+def add_deploy(state: "State", deploy_func: Callable[..., Any], *args, **kwargs) -> None:
     """
     Prepare & add an deploy to pyinfra.state by executing it on all hosts.
 
@@ -54,7 +54,9 @@ def add_deploy(state: "State", deploy_func: Callable[..., Any], *args, **kwargs)
 P = ParamSpec("P")
 
 
-def deploy(name: Optional[str] = None, data_defaults=None):
+def deploy(
+    name: Optional[str] = None, data_defaults: Optional[dict] = None
+) -> Callable[[Callable[P, Any]], PyinfraOperation[P]]:
     """
     Decorator that takes a deploy function (normally from a pyinfra_* package)
     and wraps any operations called inside with any deploy-wide kwargs/data.

{pyinfra-3.1.1 → pyinfra-3.2}/pyinfra/api/host.py

@@ -218,17 +218,19 @@ class Host:
             self.print_prefix_padding,
         )
 
-    def log(self, message, log_func=logger.info):
+    def log(self, message: str, log_func: Callable[[str], Any] = logger.info) -> None:
         log_func(f"{self.print_prefix}{message}")
 
-    def log_styled(self, message, log_func=logger.info, **kwargs):
+    def log_styled(
+        self, message: str, log_func: Callable[[str], Any] = logger.info, **kwargs
+    ) -> None:
         message_styled = click.style(message, **kwargs)
         self.log(message_styled, log_func=log_func)
 
     def get_deploy_data(self):
         return self.current_op_deploy_data or self.current_deploy_data or {}
 
-    def noop(self, description):
+    def noop(self, description: str) -> None:
         """
         Log a description for a noop operation.
         """

{pyinfra-3.1.1 → pyinfra-3.2}/pyinfra/connectors/docker.py

@@ -58,13 +58,20 @@ def _start_docker_image(image_name):
 
 class DockerConnector(BaseConnector):
     """
-    The docker connector allows you to build Docker images or modify running
-    Docker containers. You can pass either an image name or existing container ID:
+    The Docker connector allows you to use pyinfra to create new Docker images or modify running
+    Docker containers.
 
-    + Image - will create a new container from the image, execute operations \
-        against it, save into a new Docker image and remove the container
-    + Existing container ID - will execute operations against the running \
-        container, leaving it running
+    .. note::
+
+        The Docker connector allows pyinfra to target Docker containers as inventory and is
+        unrelated to the :doc:`../operations/docker` & :doc:`../facts/docker`.
+
+    You can pass either an image name or existing container ID:
+
+    + Image - will create a new container from the image, execute operations against it, save into \
+        a new Docker image and remove the container
+    + Existing container ID - will execute operations against the running container, leaving it \
+        running
 
     .. code:: shell
 
@@ -76,6 +83,10 @@ class DockerConnector(BaseConnector):
 
         # Execute against a running container
         pyinfra @docker/2beb8c15a1b1 ...
+
+    The Docker connector is great for testing pyinfra operations locally, rather than connecting to
+    a remote host over SSH each time. This gives you a fast, local-first devloop to iterate on when
+    writing deploys, operations or facts.
     """
 
     handles_execution = True

{pyinfra-3.1.1 → pyinfra-3.2}/pyinfra/connectors/sshuserclient/client.py

@@ -14,6 +14,7 @@ from paramiko import (
     SSHException,
 )
 from paramiko.agent import AgentRequestHandler
+from paramiko.hostkeys import HostKeyEntry
 
 from pyinfra import logger
 from pyinfra.api.util import memoize
@@ -31,6 +32,28 @@ class StrictPolicy(MissingHostKeyPolicy):
         )
 
 
+def append_hostkey(client, hostname, key):
+    """Append hostname to the clients host_keys_file"""
+
+    with HOST_KEYS_LOCK:
+        # The paramiko client saves host keys incorrectly whereas the host keys object does
+        # this correctly, so use that with the client filename variable.
+        # See: https://github.com/paramiko/paramiko/pull/1989
+        host_key_entry = HostKeyEntry([hostname], key)
+        if host_key_entry is None:
+            raise SSHException(
+                "Append Hostkey: Failed to parse host {0}, could not append to hostfile".format(
+                    hostname
+                ),
+            )
+        with open(client._host_keys_filename, "a") as host_keys_file:
+            hk_entry = host_key_entry.to_line()
+            if hk_entry is None:
+                raise SSHException(f"Append Hostkey: Failed to append hostkey ({host_key_entry})")
+
+            host_keys_file.write(hk_entry)
+
+
 class AcceptNewPolicy(MissingHostKeyPolicy):
     def missing_host_key(self, client, hostname, key):
         logger.warning(
@@ -40,13 +63,8 @@ class AcceptNewPolicy(MissingHostKeyPolicy):
             ),
         )
 
-        with HOST_KEYS_LOCK:
-            host_keys = client.get_host_keys()
-            host_keys.add(hostname, key.get_name(), key)
-            # The paramiko client saves host keys incorrectly whereas the host keys object does
-            # this correctly, so use that with the client filename variable.
-            # See: https://github.com/paramiko/paramiko/pull/1989
-            host_keys.save(client._host_keys_filename)
+        append_hostkey(client, hostname, key)
+        logger.warning("Added host key for {0} to known_hosts".format(hostname))
 
 
 class AskPolicy(MissingHostKeyPolicy):
@@ -60,13 +78,7 @@ class AskPolicy(MissingHostKeyPolicy):
             raise SSHException(
                 "AskPolicy: No host key for {0} found in known_hosts".format(hostname),
             )
-        with HOST_KEYS_LOCK:
-            host_keys = client.get_host_keys()
-            host_keys.add(hostname, key.get_name(), key)
-            # The paramiko client saves host keys incorrectly whereas the host keys object does
-            # this correctly, so use that with the client filename variable.
-            # See: https://github.com/paramiko/paramiko/pull/1989
-            host_keys.save(client._host_keys_filename)
+        append_hostkey(client, hostname, key)
         logger.warning("Added host key for {0} to known_hosts".format(hostname))
         return
 

{pyinfra-3.1.1 → pyinfra-3.2}/pyinfra/facts/apk.py

@@ -4,7 +4,9 @@ from pyinfra.api import FactBase
 
 from .util.packaging import parse_packages
 
-APK_REGEX = r"^([a-zA-Z0-9\-_]+)-([0-9\.]+\-?[a-z0-9]*)\s"
+# Source: https://superuser.com/a/1472405
+# Modified to return version and release inside a single group and removed extra capturing groups
+APK_REGEX = r"(.+)-([^-]+-r[^-]+) \S+ \{\S+\} \(.+?\)"
 
 
 class ApkPackages(FactBase):

{pyinfra-3.1.1 → pyinfra-3.2}/pyinfra/facts/apt.py

@@ -2,12 +2,36 @@ from __future__ import annotations
 
 import re
 
+from typing_extensions import TypedDict
+
 from pyinfra.api import FactBase
 
 from .gpg import GpgFactBase
 from .util import make_cat_files_command
 
 
+def noninteractive_apt(command: str, force=False):
+    args = ["DEBIAN_FRONTEND=noninteractive apt-get -y"]
+
+    if force:
+        args.append("--force-yes")
+
+    args.extend(
+        (
+            '-o Dpkg::Options::="--force-confdef"',
+            '-o Dpkg::Options::="--force-confold"',
+            command,
+        ),
+    )
+
+    return " ".join(args)
+
+
+APT_CHANGES_RE = re.compile(
+    r"^(\d+) upgraded, (\d+) newly installed, (\d+) to remove and (\d+) not upgraded.$"
+)
+
+
 def parse_apt_repo(name):
     regex = r"^(deb(?:-src)?)(?:\s+\[([^\]]+)\])?\s+([^\s]+)\s+([^\s]+)\s+([a-z-\s\d]*)$"
 
@@ -94,3 +118,39 @@ class AptKeys(GpgFactBase):
 
     def requires_command(self) -> str:
         return "apt-key"
+
+
+class AptSimulationDict(TypedDict):
+    upgraded: int
+    newly_installed: int
+    removed: int
+    not_upgraded: int
+
+
+class SimulateOperationWillChange(FactBase[AptSimulationDict]):
+    """
+    Simulate an 'apt-get' operation and try to detect if any changes would be performed.
+    """
+
+    def command(self, command: str) -> str:
+        # LC_ALL=C: Ensure the output is in english, as we want to parse it
+        return "LC_ALL=C " + noninteractive_apt(f"{command} --dry-run")
+
+    def requires_command(self, command: str) -> str:
+        return "apt-get"
+
+    def process(self, output) -> AptSimulationDict:
+        # We are looking for a line similar to
+        # "3 upgraded, 0 newly installed, 0 to remove and 0 not upgraded."
+        for line in output:
+            result = APT_CHANGES_RE.match(line)
+            if result is not None:
+                return {
+                    "upgraded": int(result[1]),
+                    "newly_installed": int(result[2]),
+                    "removed": int(result[3]),
+                    "not_upgraded": int(result[4]),
+                }
+
+        # We did not find the line we expected:
+        raise Exception("Did not find proposed changes in output")

pyinfra-3.2/pyinfra/facts/crontab.py

@@ -0,0 +1,190 @@
+import re
+from typing import Dict, List, Optional, TypedDict, Union
+
+from typing_extensions import NotRequired
+
+from pyinfra.api import FactBase
+from pyinfra.api.util import try_int
+
+
+class CrontabDict(TypedDict):
+    command: NotRequired[str]
+    # handles cases like CRON_TZ=UTC
+    env: NotRequired[str]
+    minute: NotRequired[Union[int, str]]
+    hour: NotRequired[Union[int, str]]
+    month: NotRequired[Union[int, str]]
+    day_of_month: NotRequired[Union[int, str]]
+    day_of_week: NotRequired[Union[int, str]]
+    comments: NotRequired[List[str]]
+    special_time: NotRequired[str]
+
+
+# for compatibility, also keeps a dict of command -> crontab dict
+class CrontabFile:
+    commands: List[CrontabDict]
+
+    def __init__(self, input_dict: Optional[Dict[str, CrontabDict]] = None):
+        super().__init__()
+        self.commands = []
+        if input_dict:
+            for command, others in input_dict.items():
+                val = others.copy()
+                val["command"] = command
+                self.add_item(val)
+
+    def add_item(self, item: CrontabDict):
+        self.commands.append(item)
+
+    def __len__(self):
+        return len(self.commands)
+
+    def __bool__(self):
+        return len(self) > 0
+
+    def items(self):
+        return {item.get("command") or item.get("env"): item for item in self.commands}
+
+    def get_command(
+        self, command: Optional[str] = None, name: Optional[str] = None
+    ) -> Optional[CrontabDict]:
+        assert command or name, "Either command or name must be provided"
+
+        name_comment = "# pyinfra-name={0}".format(name)
+        for cmd in self.commands:
+            if cmd.get("command") == command:
+                return cmd
+            if cmd.get("comments") and name_comment in cmd["comments"]:
+                return cmd
+        return None
+
+    def get_env(self, env: str) -> Optional[CrontabDict]:
+        for cmd in self.commands:
+            if cmd.get("env") == env:
+                return cmd
+        return None
+
+    def get(self, item: str) -> Optional[CrontabDict]:
+        return self.get_command(command=item, name=item) or self.get_env(item)
+
+    def __getitem__(self, item) -> Optional[CrontabDict]:
+        return self.get(item)
+
+    def __repr__(self):
+        return f"CrontabResult({self.commands})"
+
+    # noinspection PyMethodMayBeStatic
+    def format_item(self, item: CrontabDict):
+        lines = []
+        for comment in item.get("comments", []):
+            lines.append(comment)
+
+        if "env" in item:
+            lines.append(item["env"])
+        elif "special_time" in item:
+            lines.append(f"{item['special_time']} {item['command']}")
+        else:
+            lines.append(
+                f"{item['minute']} {item['hour']} "
+                f"{item['day_of_month']} {item['month']} {item['day_of_week']} "
+                f"{item['command']}"
+            )
+        return "\n".join(lines)
+
+    def __str__(self):
+        return "\n".join(self.format_item(item) for item in self.commands)
+
+    def to_json(self):
+        return self.commands
+
+
+_crontab_env_re = re.compile(r"^\s*([A-Z_]+)=(.*)$")
+
+
+class Crontab(FactBase[CrontabFile]):
+    """
+    Returns a dictionary of CrontabFile.
+
+    .. code:: python
+
+        # CrontabFile.items()
+        {
+            "/path/to/command": {
+                "minute": "*",
+                "hour": "*",
+                "month": "*",
+                "day_of_month": "*",
+                "day_of_week": "*",
+            },
+            "echo another command": {
+                "special_time": "@daily",
+            },
+        }
+        # or CrontabFile.to_json()
+        [
+            {
+               command: "/path/to/command",
+               minute: "*",
+               hour: "*",
+               month: "*",
+               day_of_month: "*",
+               day_of_week: "*",
+            },
+            {
+                "command": "echo another command
+                "special_time": "@daily",
+            }
+        ]
+    """
+
+    default = CrontabFile
+
+    def requires_command(self, user=None) -> str:
+        return "crontab"
+
+    def command(self, user=None):
+        if user:
+            return "crontab -l -u {0} || true".format(user)
+        return "crontab -l || true"
+
+    def process(self, output):
+        crons = CrontabFile()
+        current_comments = []
+
+        for line in output:
+            line = line.strip()
+            if not line or line.startswith("#"):
+                current_comments.append(line)
+                continue
+
+            if line.startswith("@"):
+                special_time, command = line.split(None, 1)
+                item = CrontabDict(
+                    command=command,
+                    special_time=special_time,
+                    comments=current_comments,
+                )
+                crons.add_item(item)
+
+            elif _crontab_env_re.match(line):
+                # handle environment variables
+                item = CrontabDict(
+                    env=line,
+                    comments=current_comments,
+                )
+                crons.add_item(item)
+            else:
+                minute, hour, day_of_month, month, day_of_week, command = line.split(None, 5)
+                item = CrontabDict(
+                    command=command,
+                    minute=try_int(minute),
+                    hour=try_int(hour),
+                    month=try_int(month),
+                    day_of_month=try_int(day_of_month),
+                    day_of_week=try_int(day_of_week),
+                    comments=current_comments,
+                )
+                crons.add_item(item)
+
+            current_comments = []
+        return crons

{pyinfra-3.1.1 → pyinfra-3.2}/pyinfra/facts/docker.py

@@ -1,3 +1,9 @@
+"""
+Facts about Docker containers, volumes and networks. These facts give you information from the view
+of the current inventory host. See the :doc:`../connectors/docker` to use Docker containers as
+inventory directly.
+"""
+
 from __future__ import annotations
 
 import json

pyinfra-3.2/pyinfra/facts/efibootmgr.py

@@ -0,0 +1,108 @@
+from __future__ import annotations
+
+from typing import Any, Dict, Iterable, List, Optional, Tuple, TypedDict
+
+from pyinfra.api import FactBase
+
+BootEntry = Tuple[bool, str]
+EFIBootMgrInfoDict = TypedDict(
+    "EFIBootMgrInfoDict",
+    {
+        "BootNext": Optional[int],
+        "BootCurrent": Optional[int],
+        "Timeout": Optional[int],
+        "BootOrder": Optional[List[int]],
+        "Entries": Dict[int, BootEntry],
+    },
+)
+
+
+class EFIBootMgr(FactBase[Optional[EFIBootMgrInfoDict]]):
+    """
+    Returns information about the UEFI boot variables:
+
+    .. code:: python
+
+        {
+            "BootNext": 6,
+            "BootCurrent": 6,
+            "Timeout": 0,
+            "BootOrder": [1,4,3],
+            "Entries": {
+                1: (True, "myefi1"),
+                2: (False, "myefi2.efi"),
+                3: (True, "myefi3.efi"),
+                4: (True, "grub2.efi"),
+            },
+        }
+    """
+
+    def requires_command(self, *args: Any, **kwargs: Any) -> str:
+        return "efibootmgr"
+
+    def command(self) -> str:
+        # FIXME: Use '|| true' to properly handle the case where
+        #        'efibootmgr' is run on a non-UEFI system
+        return "efibootmgr || true"
+
+    def process(self, output: Iterable[str]) -> Optional[EFIBootMgrInfoDict]:
+        # This parsing code closely follows the printing code of efibootmgr
+        # at <https://github.com/rhboot/efibootmgr/blob/main/src/efibootmgr.c#L2020-L2048>
+
+        info: EFIBootMgrInfoDict = {
+            "BootNext": None,
+            "BootCurrent": None,
+            "Timeout": None,
+            "BootOrder": [],
+            "Entries": {},
+        }
+
+        output = iter(output)
+
+        line: Optional[str] = next(output, None)
+
+        if line is None:
+            # efibootmgr run on a non-UEFI system, likely printed
+            # "EFI variables are not supported on this system."
+            # to stderr
+            return None
+
+        # 1. Maybe have BootNext
+        if line and line.startswith("BootNext: "):
+            info["BootNext"] = int(line[len("BootNext: ") :], 16)
+            line = next(output, None)
+
+        # 2. Maybe have BootCurrent
+        if line and line.startswith("BootCurrent: "):
+            info["BootCurrent"] = int(line[len("BootCurrent: ") :], 16)
+            line = next(output, None)
+
+        # 3. Maybe have Timeout
+        if line and line.startswith("Timeout: "):
+            info["Timeout"] = int(line[len("Timeout: ") : -len(" seconds")])
+            line = next(output, None)
+
+        # 4. `show_order`
+        if line and line.startswith("BootOrder: "):
+            entries = line[len("BootOrder: ") :]
+            info["BootOrder"] = list(map(lambda x: int(x, 16), entries.split(",")))
+            line = next(output, None)
+
+        # 5. `show_vars`: The actual boot entries
+        while line is not None and line.startswith("Boot"):
+            number = int(line[4:8], 16)
+
+            # Entries marked with a * are active
+            active = line[8:9] == "*"
+
+            # TODO: Maybe split and parse (name vs. arguments ?), might require --verbose ?
+            entry = line[10:]
+            info["Entries"][number] = (active, entry)
+            line = next(output, None)
+
+        # 6. `show_mirror`
+        # Currently not implemented, since I haven't actually encountered this in the wild.
+        if line is not None:
+            raise ValueError(f"Unexpected line '{line}' while parsing")
+
+        return info