pyinfra 3.0b0__py2.py3-none-any.whl → 3.0b1__py2.py3-none-any.whl

pyinfra/operations/postgresql.py

@@ -1,347 +1,28 @@
-"""
-The PostgreSQL modules manage PostgreSQL databases, users and privileges.
+from pyinfra.api import operation
 
-Requires the ``psql`` CLI executable on the target host(s).
+from . import postgres
 
-All operations in this module take four optional arguments:
-    + ``psql_user``: the username to connect to postgresql to
-    + ``psql_password``: the password for the connecting user
-    + ``psql_host``: the hostname of the server to connect to
-    + ``psql_port``: the port of the server to connect to
 
-See example/postgresql.py for detailed example
+@operation(is_idempotent=False, is_deprecated=True, deprecated_for="postgres.sql")
+def sql(*args, **kwargs):
+    yield from postgres.sql._inner(*args, **kwargs)
 
-"""
 
-from pyinfra import host
-from pyinfra.api import MaskString, StringCommand, operation
-from pyinfra.facts.postgresql import (
-    PostgresqlDatabases,
-    PostgresqlRoles,
-    make_execute_psql_command,
-    make_psql_command,
-)
+@operation(is_idempotent=False, is_deprecated=True, deprecated_for="postgres.role")
+def role(*args, **kwargs):
+    yield from postgres.role._inner(*args, **kwargs)
 
 
-@operation(is_idempotent=False)
-def sql(
-    sql,
-    database=None,
-    # Details for speaking to PostgreSQL via `psql` CLI
-    psql_user=None,
-    psql_password=None,
-    psql_host=None,
-    psql_port=None,
-):
-    """
-    Execute arbitrary SQL against PostgreSQL.
+@operation(is_idempotent=False, is_deprecated=True)
+def database(*args, **kwargs):
+    yield from postgres.database._inner(*args, **kwargs)
 
-    + sql: SQL command(s) to execute
-    + database: optional database to execute against
-    + psql_*: global module arguments, see above
-    """
 
-    yield make_execute_psql_command(
-        sql,
-        database=database,
-        user=psql_user,
-        password=psql_password,
-        host=psql_host,
-        port=psql_port,
-    )
+@operation(is_idempotent=False, is_deprecated=True)
+def dump(*args, **kwargs):
+    yield from postgres.dump._inner(*args, **kwargs)
 
 
-@operation()
-def role(
-    role,
-    present=True,
-    password=None,
-    login=True,
-    superuser=False,
-    inherit=False,
-    createdb=False,
-    createrole=False,
-    replication=False,
-    connection_limit=None,
-    # Details for speaking to PostgreSQL via `psql` CLI
-    psql_user=None,
-    psql_password=None,
-    psql_host=None,
-    psql_port=None,
-):
-    """
-    Add/remove PostgreSQL roles.
-
-    + role: name of the role
-    + present: whether the role should be present or absent
-    + password: the password for the role
-    + login: whether the role can login
-    + superuser: whether role will be a superuser
-    + inherit: whether the role inherits from other roles
-    + createdb: whether the role is allowed to create databases
-    + createrole: whether the role is allowed to create new roles
-    + replication: whether this role is allowed to replicate
-    + connection_limit: the connection limit for the role
-    + psql_*: global module arguments, see above
-
-    Updates:
-        pyinfra will not attempt to change existing roles - it will either
-        create or drop roles, but not alter them (if the role exists this
-        operation will make no changes).
-
-    **Example:**
-
-    .. code:: python
-
-        postgresql.role(
-            name="Create the pyinfra PostgreSQL role",
-            role="pyinfra",
-            password="somepassword",
-            superuser=True,
-            login=True,
-            sudo_user="postgres",
-        )
-
-    """
-
-    roles = host.get_fact(
-        PostgresqlRoles,
-        psql_user=psql_user,
-        psql_password=psql_password,
-        psql_host=psql_host,
-        psql_port=psql_port,
-    )
-
-    is_present = role in roles
-
-    # User not wanted?
-    if not present:
-        if is_present:
-            yield make_execute_psql_command(
-                'DROP ROLE "{0}"'.format(role),
-                user=psql_user,
-                password=psql_password,
-                host=psql_host,
-                port=psql_port,
-            )
-        else:
-            host.noop("postgresql role {0} does not exist".format(role))
-        return
-
-    # If we want the user and they don't exist
-    if not is_present:
-        sql_bits = ['CREATE ROLE "{0}"'.format(role)]
-
-        for key, value in (
-            ("LOGIN", login),
-            ("SUPERUSER", superuser),
-            ("INHERIT", inherit),
-            ("CREATEDB", createdb),
-            ("CREATEROLE", createrole),
-            ("REPLICATION", replication),
-        ):
-            if value:
-                sql_bits.append(key)
-
-        if connection_limit:
-            sql_bits.append("CONNECTION LIMIT {0}".format(connection_limit))
-
-        if password:
-            sql_bits.append(MaskString("PASSWORD '{0}'".format(password)))
-
-        yield make_execute_psql_command(
-            StringCommand(*sql_bits),
-            user=psql_user,
-            password=psql_password,
-            host=psql_host,
-            port=psql_port,
-        )
-    else:
-        host.noop("postgresql role {0} exists".format(role))
-
-
-@operation()
-def database(
-    database,
-    present=True,
-    owner=None,
-    template=None,
-    encoding=None,
-    lc_collate=None,
-    lc_ctype=None,
-    tablespace=None,
-    connection_limit=None,
-    # Details for speaking to PostgreSQL via `psql` CLI
-    psql_user=None,
-    psql_password=None,
-    psql_host=None,
-    psql_port=None,
-):
-    """
-    Add/remove PostgreSQL databases.
-
-    + name: name of the database
-    + present: whether the database should exist or not
-    + owner: the PostgreSQL role that owns the database
-    + template: name of the PostgreSQL template to use
-    + encoding: encoding of the database
-    + lc_collate: lc_collate of the database
-    + lc_ctype: lc_ctype of the database
-    + tablespace: the tablespace to use for the template
-    + connection_limit: the connection limit to apply to the database
-    + psql_*: global module arguments, see above
-
-    Updates:
-        pyinfra will not attempt to change existing databases - it will either
-        create or drop databases, but not alter them (if the db exists this
-        operation will make no changes).
-
-    **Example:**
-
-    .. code:: python
-
-        postgresql.database(
-            name="Create the pyinfra_stuff database",
-            database="pyinfra_stuff",
-            owner="pyinfra",
-            encoding="UTF8",
-            sudo_user="postgres",
-        )
-
-    """
-
-    current_databases = host.get_fact(
-        PostgresqlDatabases,
-        psql_user=psql_user,
-        psql_password=psql_password,
-        psql_host=psql_host,
-        psql_port=psql_port,
-    )
-
-    is_present = database in current_databases
-
-    if not present:
-        if is_present:
-            yield make_execute_psql_command(
-                'DROP DATABASE "{0}"'.format(database),
-                user=psql_user,
-                password=psql_password,
-                host=psql_host,
-                port=psql_port,
-            )
-        else:
-            host.noop("postgresql database {0} does not exist".format(database))
-        return
-
-    # We want the database but it doesn't exist
-    if present and not is_present:
-        sql_bits = ['CREATE DATABASE "{0}"'.format(database)]
-
-        for key, value in (
-            ("OWNER", '"{0}"'.format(owner) if owner else owner),
-            ("TEMPLATE", template),
-            ("ENCODING", encoding),
-            ("LC_COLLATE", lc_collate),
-            ("LC_CTYPE", lc_ctype),
-            ("TABLESPACE", tablespace),
-            ("CONNECTION LIMIT", connection_limit),
-        ):
-            if value:
-                sql_bits.append("{0} {1}".format(key, value))
-
-        yield make_execute_psql_command(
-            StringCommand(*sql_bits),
-            user=psql_user,
-            password=psql_password,
-            host=psql_host,
-            port=psql_port,
-        )
-    else:
-        host.noop("postgresql database {0} exists".format(database))
-
-
-@operation(is_idempotent=False)
-def dump(
-    dest,
-    database=None,
-    # Details for speaking to PostgreSQL via `psql` CLI
-    psql_user=None,
-    psql_password=None,
-    psql_host=None,
-    psql_port=None,
-):
-    """
-    Dump a PostgreSQL database into a ``.sql`` file. Requires ``pg_dump``.
-
-    + dest: name of the file to dump the SQL to
-    + database: name of the database to dump
-    + psql_*: global module arguments, see above
-
-    **Example:**
-
-    .. code:: python
-
-        postgresql.dump(
-            name="Dump the pyinfra_stuff database",
-            dest="/tmp/pyinfra_stuff.dump",
-            database="pyinfra_stuff",
-            sudo_user="postgres",
-        )
-
-    """
-
-    yield StringCommand(
-        make_psql_command(
-            executable="pg_dump",
-            database=database,
-            user=psql_user,
-            password=psql_password,
-            host=psql_host,
-            port=psql_port,
-        ),
-        ">",
-        dest,
-    )
-
-
-@operation(is_idempotent=False)
-def load(
-    src,
-    database=None,
-    # Details for speaking to PostgreSQL via `psql` CLI
-    psql_user=None,
-    psql_password=None,
-    psql_host=None,
-    psql_port=None,
-):
-    """
-    Load ``.sql`` file into a database.
-
-    + src: the filename to read from
-    + database: name of the database to import into
-    + psql_*: global module arguments, see above
-
-    **Example:**
-
-    .. code:: python
-
-        postgresql.load(
-            name="Import the pyinfra_stuff dump into pyinfra_stuff_copy",
-            src="/tmp/pyinfra_stuff.dump",
-            database="pyinfra_stuff_copy",
-            sudo_user="postgres",
-        )
-
-    """
-
-    yield StringCommand(
-        make_psql_command(
-            database=database,
-            user=psql_user,
-            password=psql_password,
-            host=psql_host,
-            port=psql_port,
-        ),
-        "<",
-        src,
-    )
+@operation(is_idempotent=False, is_deprecated=True)
+def load(*args, **kwargs):
+    yield from postgres.load._inner(*args, **kwargs)

pyinfra/operations/systemd.py

@@ -3,7 +3,7 @@ Manage systemd services.
 """
 
 from pyinfra import host
-from pyinfra.api import operation
+from pyinfra.api import StringCommand, operation
 from pyinfra.facts.systemd import SystemdEnabled, SystemdStatus, _make_systemctl_cmd
 
 from .util.service import handle_service_control
@@ -25,7 +25,7 @@ def daemon_reload(user_mode=False, machine=None, user_name=None):
         user_name=user_name,
     )
 
-    yield "{0} daemon-reload".format(systemctl_cmd)
+    yield StringCommand(systemctl_cmd, "daemon-reload")
 
 
 _daemon_reload = daemon_reload._inner  # noqa: E305
@@ -117,8 +117,9 @@ def service(
             user_mode=user_mode,
             machine=machine,
             user_name=user_name,
+            services=[service],
         ),
-        " ".join([systemctl_cmd, "{1}", "{0}"]),
+        " ".join([systemctl_cmd.get_raw_value(), "{1}", "{0}"]),
         running,
         restarted,
         reloaded,
@@ -131,6 +132,7 @@ def service(
             user_mode=user_mode,
             machine=machine,
             user_name=user_name,
+            services=[service],
         )
         is_enabled = systemd_enabled.get(service, False)
 

{pyinfra-3.0b0.dist-info → pyinfra-3.0b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyinfra
-Version: 3.0b0
+Version: 3.0b1
 Summary: pyinfra automates/provisions/manages/deploys infrastructure.
 Home-page: https://pyinfra.com
 Author: Nick / Fizzadar
@@ -88,17 +88,17 @@ Requires-Dist: types-setuptools ; extra == 'test'
     </a>
 </p>
 
-<p align="center">
+<p>
     <strong>Note: this is the v3 branch, which is currently in beta. <a href="https://docs.pyinfra.com/en/next">See the docs for v3</a>. If needed the <a href="https://github.com/pyinfra-dev/pyinfra/tree/2.x/">2.x branch is here</a>, but is in bugfix only mode.</strong>
 </p>
 
-<p align="center">
-    <em>pyinfra automates infrastructure using Python. It’s fast and scales from one server to thousands. Great for ad-hoc command execution, service deployment, configuration management and more.</em>
+<p>
+    pyinfra turns Python code into shell commands and runs them on your servers. Execute ad-hoc commands and write declarative operations. Target SSH servers, local machine and Docker containers. Fast and scales from one server to thousands. Think <code>ansible</code> but Python instead of YAML, and a lot faster.
 </p>
 
 ---
 
-<p align="center">
+<p>
     <a href="https://docs.pyinfra.com"><strong>Documentation</strong></a> &rArr;
     <a href="https://docs.pyinfra.com/page/getting-started.html"><strong>Getting Started</strong></a> &bull;
     <a href="https://docs.pyinfra.com/page/examples.html"><strong>Examples</strong></a> &bull;
@@ -106,7 +106,7 @@ Requires-Dist: types-setuptools ; extra == 'test'
     <a href="https://docs.pyinfra.com/page/contributing.html"><strong>Contributing</strong></a>
 </p>
 
-<p align="center">
+<p>
     Chat &rArr;
     <a href="https://matrix.to/#/#pyinfra:matrix.org"><strong><code>#pyinfra</code> on Matrix</strong></a>
 </p>

{pyinfra-3.0b0.dist-info → pyinfra-3.0b1.dist-info}/RECORD

@@ -5,33 +5,33 @@ pyinfra/local.py,sha256=0bpIRCyDKM6i_jA1i8Ej2qr_iWIF9cUYWutXNdLj8po,2751
 pyinfra/progress.py,sha256=X3hXZ4Flh_L9FE4ZEWxWoG0R4dA5UPd1FCO-Exd5Xtc,4193
 pyinfra/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyinfra/version.py,sha256=hAgEPHVJVjA2I-rI0gy038UAPVKcmulk-3dZLOmkYrI,153
-pyinfra/api/__init__.py,sha256=_gId0L-DYg7A1aofFN5ra--GBE2sq7hpobjL470OhTc,888
-pyinfra/api/arguments.py,sha256=iOtGiQvRhh8gk0spesH5i0ccDSwEQr2ri6xKL0ADduM,9688
-pyinfra/api/arguments_typed.py,sha256=OYB4uEGYogKZV2Amz9fosQEqi9hrkU1eDpWThMX3_Vk,2201
+pyinfra/api/__init__.py,sha256=suGbKKM-qCduuXFYBEcyswlTqozewtYpdLRhK63PVn0,942
+pyinfra/api/arguments.py,sha256=1kTpgvCeKpMnmf7IhIfARjEjz0-94L7ud1qP90JSeAU,9748
+pyinfra/api/arguments_typed.py,sha256=fy_Sg3UgzYmm7rG8Vvheu_Ah-YjpfpIkBIRDFUbYhaY,2254
 pyinfra/api/command.py,sha256=KGhAnaxZGZv5NJa0-aOgu2g9nOYTsdjlCaFHR6QO53E,7176
 pyinfra/api/config.py,sha256=G1ZNHw26G1QyqEBU6AuFsK3jVKdgW-VPqE9WZgtlzkg,4221
 pyinfra/api/connect.py,sha256=Z9wusMLR_jBkKKk5D4AUOj8LHl3H5MsNO5FxAeR4jac,1416
 pyinfra/api/connectors.py,sha256=SLmKtoN4cXvcQz9IgWSPI-d3ZMzJ09pcvka42Fiuo7s,544
 pyinfra/api/deploy.py,sha256=xo4F7URUf3xzIChRHZn4zwqs_WTjLjZNC9i9eQjAFk8,2756
-pyinfra/api/exceptions.py,sha256=uzMTtTWXwUGNj5F3z9EOyMSdVkmqurZUdZGd9P_F-xQ,1445
-pyinfra/api/facts.py,sha256=ub2LGAcO2K6ofZXQwQSvd6z04_Fc0iez1A6ZQ0Dxec4,10283
-pyinfra/api/host.py,sha256=8Ed1pSKmzApX6BfOPXVNmIuN8nHog77qry_5I7mYO3I,12394
+pyinfra/api/exceptions.py,sha256=cCbUp1qN1QO0d9aAvOAbRgYpLi0vUI5j7ZqSjcD1_P8,1861
+pyinfra/api/facts.py,sha256=FOIn6qO2tw5I1hkS0fAaBmhGfnMwKWZjn1ZqCnU6_pA,10282
+pyinfra/api/host.py,sha256=CzTDyYROIZqDSCVTrlIOoX1ODqLMNlW08W1nN9oH-Rs,13475
 pyinfra/api/inventory.py,sha256=83ttxbGbIwN2tvmVTW68fumIDXNMk48qvL0NxwGPkNs,7663
-pyinfra/api/operation.py,sha256=HKcTBmWqdHvGpjAXce9Cbx0WLYOdwFvwBc2UiFzhWHA,13225
-pyinfra/api/operations.py,sha256=v2WY6lVUoyGRP3bwIM0cgrJEO5HpM1l2eFwRvOQmSpI,10921
-pyinfra/api/state.py,sha256=nMPGmNGsEuUDcUU0rp3ky3PA-c2jhrocK-A5NJcPTIc,12526
+pyinfra/api/operation.py,sha256=2r3RylueNAjDL0SwCIln84Jpwl2KA3Xep2rtwGQXX3I,14789
+pyinfra/api/operations.py,sha256=jvz9ISfwmQnAQVUKLnbrRdD9QHIAAfypo9l5b3fYG1w,10894
+pyinfra/api/state.py,sha256=3dXRjeZJXnzLcbP9E4aogkRPwIg3_kK1h4Tf4FVZock,12622
 pyinfra/api/util.py,sha256=TkUlcMPIrLGxRQY19CvCXL1H_20DjFTmFL0QbFqQ0gw,11977
 pyinfra/connectors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyinfra/connectors/base.py,sha256=HYlAcup7kNsrzNjw3PyPvt1PESDQadGt_M2hQM8vKQQ,3754
-pyinfra/connectors/chroot.py,sha256=mtrQO3wsJj3jlp7bZR0if_LghWjAacEAgBYZw9ysiNo,5963
-pyinfra/connectors/docker.py,sha256=nXvtj1J-8wFtG1UkoV_6_NxPeSgvn1uA0pJXGJMfysw,8954
-pyinfra/connectors/dockerssh.py,sha256=V4G2g9dRPwDj0UxvGBRM93IHSpGpO5PiBdWJ4KsKjbg,8943
-pyinfra/connectors/local.py,sha256=-ofyZA9trondAyzhYnGqk15HtuZdo0gl-N1GHOu_rG0,6937
-pyinfra/connectors/ssh.py,sha256=YNbpNAy67pSzlhlVcz9YQPlcBhVVJ5nTrBCF6UL_UnY,20263
+pyinfra/connectors/base.py,sha256=41RSf0t6LlYZe3nW9B1CfbOwbOulaDnZT3fnGn23DWw,3756
+pyinfra/connectors/chroot.py,sha256=Xd72I8T58KIwKOoc0LXCw91AoEIaiHfRLDcDVTHGJ0o,5931
+pyinfra/connectors/docker.py,sha256=NRqE8543j0eqUnjv2wbokW-hWkam2kZNiokPTGYDBXI,8964
+pyinfra/connectors/dockerssh.py,sha256=VWHY--jqs3yf-RuPUZXav4vLeON9SzoVC9CUyOJo1rg,8919
+pyinfra/connectors/local.py,sha256=szFO9VP5xNWpqK9ThkjroyFvnxckiG5kjM08vgqbVhc,6929
+pyinfra/connectors/ssh.py,sha256=w3UTuZOeO9fFwcvQWZ7xS8KyCvsWWd4uKJc_6ONSMrU,21018
 pyinfra/connectors/ssh_util.py,sha256=CN_5AdTA3RpiWCnXTrRBjez1NsN59hITDzQmXIkZvoE,3683
-pyinfra/connectors/terraform.py,sha256=e7-azZfJpe51UwCWwMRHExup1ePq6AiAyIwB9cu9Fbw,3541
-pyinfra/connectors/util.py,sha256=_R5QEyP0A1LBupJ7LPAJeqmWPcPwp_69k9eqFRZkp6A,11321
-pyinfra/connectors/vagrant.py,sha256=lUCC3cH8CAmGphDqIfzHSueWYp9jgKldH2MatG0zCv0,4697
+pyinfra/connectors/terraform.py,sha256=G7lK168Fz0jNFetc_7_bPT-RnoaRDksJat0R26fqkUk,3617
+pyinfra/connectors/util.py,sha256=JBGTgBkXQTu7l5uVYPzVfQdPXwehmRWkMf8IEVj2gGs,11326
+pyinfra/connectors/vagrant.py,sha256=6edwwc5rMfEFridUN9BXytoIeXeBQvyoucLcSUTGivs,4722
 pyinfra/connectors/sshuserclient/__init__.py,sha256=Qc4RO2wknSWIiNTwOeQ0y2TeiuKHmyWDW2Dz4MOo9CE,44
 pyinfra/connectors/sshuserclient/client.py,sha256=7YSd3QckZuPDRnKzy2FfG3J8zp7CY-jny8tbWwxvKro,9720
 pyinfra/connectors/sshuserclient/config.py,sha256=UMwkvTgAIS7__re6Wz_pwH6EU4kO1-uMQ5zuFakH0v4,2721
@@ -41,8 +41,8 @@ pyinfra/facts/apt.py,sha256=zqFSPIAaIgHWWg3eGgL-BDX1aqvgiQ7rNc8QrE1LXLg,1999
 pyinfra/facts/brew.py,sha256=POnOx3PWzK1B8pbtkI9wBmYSUsG0IblpwrMHZsMC7Og,2266
 pyinfra/facts/bsdinit.py,sha256=sx54RAmS7rjTDzLbUWv86UFtfE8H56qokektf5smN30,490
 pyinfra/facts/cargo.py,sha256=C_2NIWcDzT5Y6xxnT5TvuhWpLJCQTqVVXK8biiUvhjI,531
-pyinfra/facts/choco.py,sha256=CatATw35ToFTgFNO_aXwl7ZSi2Mply47VixOJzK7Dp8,716
-pyinfra/facts/deb.py,sha256=aTlXoBsuORIe5cbFV_UbXZZLOskcfrWoyuDg_cSAEFY,1662
+pyinfra/facts/choco.py,sha256=gYdgqglICBn6SStyJvHwQGD8ayo0Zwp5EMiNuYRs5VY,703
+pyinfra/facts/deb.py,sha256=v2wSbOIFefY7QrQbXZ584mH_bDW9kzUqozCvZ_5dEgE,1666
 pyinfra/facts/dnf.py,sha256=zV_Fx4cq81lyKctDYki65e088kXDAyZiwkEcBDOoLtU,862
 pyinfra/facts/docker.py,sha256=0EUskxna88haXeHYJBFUDnUHJcX2QIwwKME_dRcfoiY,1678
 pyinfra/facts/files.py,sha256=VJujyRa9FiowXnNJUuDmYk6hJi8DYJYetvOAnatkpcg,11475
@@ -60,12 +60,13 @@ pyinfra/facts/pacman.py,sha256=SJTdi49nBHk7Gb6ajf2I5PZTHWkqZ_k4npAf695luRs,1001
 pyinfra/facts/pip.py,sha256=v6pJCQHOB8DaDgpyrLTz3kKKCSqvLG_zs0uy6_gGOf8,702
 pyinfra/facts/pkg.py,sha256=GgRU5x9OWfAfqF-KgJiJz0ndtLKhiRGhtTG4agfunuM,452
 pyinfra/facts/pkgin.py,sha256=_rekZJtKLx2TOHd_REJLMDp02typZMpQkZ7sC4FLJSQ,481
-pyinfra/facts/postgresql.py,sha256=1xob1BqC6jt4PlUW1jXJkCzTfYvKHiw6cKem0ycerq8,4104
+pyinfra/facts/postgres.py,sha256=ncx16P6UDZBuOw_7TG_t4AMLSKiI2Xu2nEBPLZ4HZ6Y,4094
+pyinfra/facts/postgresql.py,sha256=nWXwIFFYnF7vGj-yGmhtI2OAQEvlnpIAs-WupUja9vI,187
 pyinfra/facts/rpm.py,sha256=CdC-r2_cfbt81z3sjAE4I-ne46jI-Of6uyDSvELVJfk,1973
 pyinfra/facts/selinux.py,sha256=N0zbJrAtBeRBtxZFUHbYTLQ2L4mRV7_Oj3Cj3OA1Npw,4272
 pyinfra/facts/server.py,sha256=gxEW1By_mi9BVZcAQZC5o1Sz0pxQdPVzoQRXV7WxM5w,19794
 pyinfra/facts/snap.py,sha256=9PYA73ASi-FgBk_y42lGJyETqEgfcJGm-6EFeKzayhE,1910
-pyinfra/facts/systemd.py,sha256=gAw8rLXwXOevs0OLxW0-zACIBC2fcyEtA3Gman4FaOs,3367
+pyinfra/facts/systemd.py,sha256=jhTIMcN96lJbV03xrEjB_0YLg1BxKTFfq5KcpNXtH9Y,3927
 pyinfra/facts/sysvinit.py,sha256=PS7yMOrVxclywKjF3BIXmxTBgn2_vpSTQrDeOly_j8Q,1490
 pyinfra/facts/upstart.py,sha256=9mqTYsUpDs7gC5Rest2sQS3EohGXAPjEQUINJWELkW0,543
 pyinfra/facts/vzctl.py,sha256=AnRl6SZ7HxMGOVl021v0P37pN4tujbwLFuvxUMOCW_M,591
@@ -84,27 +85,28 @@ pyinfra/operations/bsdinit.py,sha256=HtBJERhSiBPaTG0H-m4CG6SY_7iCkl0LtHLGYuNYhVM
 pyinfra/operations/cargo.py,sha256=wcEhQEz02e6_WGL6ve_bW1IOrnHQqOGzhyMiMjmm0co,1042
 pyinfra/operations/choco.py,sha256=Qr2lg471XiIhMJ4QvUbmRMNCP-3BNE4VbxNaJE-JjzU,1453
 pyinfra/operations/dnf.py,sha256=qN9xwLzSFOOJwuUSDhRLTE2TdaNB58HYgtKZMHVn494,5550
-pyinfra/operations/files.py,sha256=pQgj40zYB8GM9_JS8v4gh_jO8d3ISVa6DoM072lQrlA,52409
+pyinfra/operations/files.py,sha256=9I5c823Y4hoAsXVHcAK5TixV8fMIbHGOJEzOBPxi1Fc,52485
 pyinfra/operations/gem.py,sha256=vEGYFniRGrxll8ARNauZQdSPjSHP8-me4UEH1srK-q0,1070
 pyinfra/operations/git.py,sha256=mxK2q8Hl3xmo27qz9cRCzVvNxK9UPeG3YFh4cV5fSSM,11543
-pyinfra/operations/iptables.py,sha256=KMMWct43Ovx-L2tRY4E1GAyTalk96WOJ4iEJMAjxySU,8856
+pyinfra/operations/iptables.py,sha256=moaeEfjrPLHZSiq6vgVRCTXE9191aKF5WlGccHywO9k,9009
 pyinfra/operations/launchd.py,sha256=i5oeCEekOEQTVlNlayQO057DRXT103H3tWRwp8IRVko,1164
 pyinfra/operations/lxd.py,sha256=pcdvmxfG6Bm8m_cuF1wRpmpaUzTq2nTd6iOf4jDRicA,1639
 pyinfra/operations/mysql.py,sha256=wtuUi9IhPaehe3qSFf_woEUpPD8mASAIisdIYbnNy3c,19141
 pyinfra/operations/npm.py,sha256=PyQJ2DQ_u0jclHNLL21ltUV64VPhC9rriGv5HOc75zY,1404
 pyinfra/operations/openrc.py,sha256=eta2j16uC24ZHFBB1CVgV1BdzuvY7S5JjcyGA_iVyYw,1510
 pyinfra/operations/pacman.py,sha256=qPtgIzH0151qhmxzoT4rz5xunffNOICcscknCkzLr8o,1672
-pyinfra/operations/pip.py,sha256=l3iI1OqGDbOYqO69l-FRgom1NDfVB5HA5hOjnLCTVPI,5377
+pyinfra/operations/pip.py,sha256=jvUBAalQnFtZFDL5dqSOnBjAWEgzIGQNxHLMPUMvT3Y,5699
 pyinfra/operations/pkg.py,sha256=sLa3-_YoRMkGNdCovduaZwtAcuADDdaeiKWnIHDiq_k,2222
 pyinfra/operations/pkgin.py,sha256=hL_l9kN7Dn68CwPd2efrcJoa2KOToTHLhMpi1P8k3oQ,1930
-pyinfra/operations/postgresql.py,sha256=0F7oyf0GXIa4Ex2B187sGdAh2gODZ6mnqCFn-oSDgJU,9162
+pyinfra/operations/postgres.py,sha256=ASCPx_WZLk31sZUXHbP_CT5Xr2xz6KwnV-EG6xzPSIo,9152
+pyinfra/operations/postgresql.py,sha256=79i5q3mtFVl3-B8V2FGLmy1n_O5A5i5BCf-ncp90UAI,797
 pyinfra/operations/puppet.py,sha256=EOT4RnYro9K6N_HrPvYHd3bZX8rcAQxPNfLcuzm-LqE,797
 pyinfra/operations/python.py,sha256=lQ8lAwy-d_Gg9PVuZVn9-Dl3r5K_XfyUeRKZwekHiuI,1909
 pyinfra/operations/selinux.py,sha256=v9Wt1-uLButowbNP8iSEYXSXMd7xAsGp6U9EBXUq5sw,5347
 pyinfra/operations/server.py,sha256=evcQgux6fAU5v9z1XUr7ELob2t8HI9n70U5mi0iYm5k,35710
 pyinfra/operations/snap.py,sha256=_K-0UdketVIJMe3VlvfvnKGd6NM_3PC-ZzZeeMiGHME,2987
 pyinfra/operations/ssh.py,sha256=qrU13gmR-XUcT7l7PvRDfU6WhmfOXd50DZKSZASIyiE,5493
-pyinfra/operations/systemd.py,sha256=06xeD7HiNyIcWZ18-GV-3cVdVA-vOx7ij0S9JQv3OEs,3719
+pyinfra/operations/systemd.py,sha256=EpQqLNo9P6tnBdre7E7X2UuL-CeK8YJ1wwgr8cKKe5s,3818
 pyinfra/operations/sysvinit.py,sha256=cAtfKmGZ0T1HxF0KNTLEU-CrS97n1Vpby58jB3S1Eho,4003
 pyinfra/operations/upstart.py,sha256=1lM09OBzH0vWylCHEA_zZPOv_x5W8DVKpnlAd-km7Rc,1908
 pyinfra/operations/vzctl.py,sha256=konF-T1KyqZaltRK9BMoUGse8TQb89J2Xbn3kcXh1uM,3010
@@ -117,13 +119,12 @@ pyinfra/operations/util/packaging.py,sha256=fNQaLRtGVrEWFqz2pRAB2nvc1rE7Xd29sXJC
 pyinfra/operations/util/service.py,sha256=eT_-3r1Lc0aNsNI0p-ocPGjoMfsdcDADqHU82T7GKFE,1031
 pyinfra_cli/__init__.py,sha256=G0X7tNdqT45uWuK3aHIKxMdDeCgJ7zHo6vbxoG6zy_8,284
 pyinfra_cli/__main__.py,sha256=8tjq8HUll8P8naFw7pGlygwSz7u9je_MQ-0pqcDlENY,881
-pyinfra_cli/commands.py,sha256=eQr3HCuashedJDSxRGdY463FCYHpOmect6I0P_3Z0_U,1761
-pyinfra_cli/exceptions.py,sha256=iptx9Zj1od7VgSbOyXs7P8tD4zAZ_fwrQFKPlpPrfS0,4806
+pyinfra_cli/commands.py,sha256=J-mCJYvDebJ8M7o3HreB2zToa871-xO6_KjVhPLeHho,1832
+pyinfra_cli/exceptions.py,sha256=b14C3xZ6PMqe1q-XosozPNhbABVIAdeivWoTdBn77ZE,4953
 pyinfra_cli/inventory.py,sha256=mgj_T_T-lCy6Diyb466doRKIcz4zXLhRJi3ui_VBlXM,9513
-pyinfra_cli/inventory_dsl.py,sha256=MY5Qahs6t3yUvc3ughW8gk-iaKbO54doWhZTsI4-mOQ,461
 pyinfra_cli/log.py,sha256=7WEGtmf3ncF1BtXL2icUjyxeRKy-7XrCcQ2Hg4GWX5Y,2201
-pyinfra_cli/main.py,sha256=zI6sh3aqFIzsnSU9GocmwKo1B8cjH-pYHHV5FA9kKUY,19667
-pyinfra_cli/prints.py,sha256=lqNVnGt6Pwr3ooDtbNDeiG0UcKJEUqEXM0rJQlNpIHI,11769
+pyinfra_cli/main.py,sha256=MsBn0RCD5ce4GY-dDBe6vLXT0LanDrrQZpJOTIYZPBs,19715
+pyinfra_cli/prints.py,sha256=MGU8DvHGiE4ZRVPee1Mixia6VWB3zn0OWn7FwTASWpc,9006
 pyinfra_cli/util.py,sha256=7z6xg1GtbD_lB40yLL_m2EwGVTly0Z7V8oeAdQXnKi0,6322
 pyinfra_cli/virtualenv.py,sha256=6j9W54JkQLN02SrZZIVwszp0GxlaaDEUWFZjBDHIWNA,2466
 tests/test_api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -131,11 +132,11 @@ tests/test_api/test_api.py,sha256=Ig2ebkNACYbHcC4_zRkxS9vj5ZEogoPqGx30ErIKChg,24
 tests/test_api/test_api_arguments.py,sha256=5k7w0_x5cnABEFOk0LQBCt5gU9iTN9lo2XS6MlJTnhQ,1961
 tests/test_api/test_api_command.py,sha256=OW0ESMyS5vo38u17DHeCrSIaIkW9gMU5PSkXL7mRrq0,3204
 tests/test_api/test_api_config.py,sha256=bf0mDrUie3On6zGC_hJBpv-wvSf3LHBIBzUDvkopEt0,708
-tests/test_api/test_api_deploys.py,sha256=diROd47tpFlZAtNfu_E6ijJ4MTzGeRpgRgBSM5kAmjk,4200
+tests/test_api/test_api_deploys.py,sha256=h_zbI6CK4K8SdzEr3LEAMPxOf9hnQBdi_suqiNPqHHQ,4200
 tests/test_api/test_api_facts.py,sha256=fUPadZbZ5xaKSF-kmLj7XGwsNiBmfj7Av0gl8fE01Qc,10687
 tests/test_api/test_api_host.py,sha256=U_VW2vTl35vR8EdyIGMKr4y0ydsDLbvHSjZDa99CyNE,1119
 tests/test_api/test_api_inventory.py,sha256=VLbV0MXdRLOPvTXJF156ne6rAx1cBlFfgq_1S79s4tw,2013
-tests/test_api/test_api_operations.py,sha256=z5ChclOsFshU2WEo62uYr9TxCixuUKCU0OJnwBNt4n8,20162
+tests/test_api/test_api_operations.py,sha256=OqLA-d5i-3FWu4rx6Hj_IyjKEp5wrqQ4za1tNQFPJRs,20144
 tests/test_api/test_api_util.py,sha256=uHv4oLpoy1_tzOoqFA1zpdvC74SvjitZbxQwp0dmjTs,1716
 tests/test_cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_cli/test_cli.py,sha256=nZQH0zK1SOgIr5VxBuuHH68hyzG4lhwyw_Z7EhjPtf4,6045
@@ -149,14 +150,14 @@ tests/test_connectors/test_chroot.py,sha256=QK7YgFPXzHh8y363-tmHvzZ0Ok5PVJWFTDAv
 tests/test_connectors/test_docker.py,sha256=0EjkfhCHpLCfL4X-AIdMNw5ASaseY0tbRAn7T_TAkMQ,6566
 tests/test_connectors/test_dockerssh.py,sha256=MaC9IK1OZDiqoIsuLOZBJnPDglsMoPDoL19LQtXsyCE,9303
 tests/test_connectors/test_local.py,sha256=N_FkejDZKu7XLnKeApqfBARYMyxf-hRXCQJrXLHvwRg,7442
-tests/test_connectors/test_ssh.py,sha256=5PUG-_6VwHbozgulrjkAtwQekc9UA4EQIpOINcz0R_o,36438
+tests/test_connectors/test_ssh.py,sha256=6YPdNv_h12hn6C7Gksuyflf3V0cdvlc8o4e8oWBv-iM,38399
 tests/test_connectors/test_sshuserclient.py,sha256=2PQNLPhNL6lBACc6tQuXmPoog-9L6AdDQNrA-rEw1_8,5734
-tests/test_connectors/test_terraform.py,sha256=9KPHgBxfy0eni1lGFL6x4ZehG0vJAKjS1E1MO0-6vCw,3807
+tests/test_connectors/test_terraform.py,sha256=Z5MhgDeRDFumu-GlbjMD0ZRkecwBIPP8C8ZVg-mq7C8,3743
 tests/test_connectors/test_util.py,sha256=hQir0WyjH0LEF6xvIyHNyqdI5pkJX6qUR9287MgO2bY,4647
-tests/test_connectors/test_vagrant.py,sha256=A7eHwi2JKjwoKuFQPJZJiCUJ7bdJn9JY2P81Ln3NoIo,3630
-pyinfra-3.0b0.dist-info/LICENSE.md,sha256=gwC95tUll0gwB32tHNkTAasN7Sb6vjWzXa305NwClbI,1076
-pyinfra-3.0b0.dist-info/METADATA,sha256=Q_w81LJ7bde4NhE8UP2OgkieqFvL_I4FX96e1V2cdTw,8117
-pyinfra-3.0b0.dist-info/WHEEL,sha256=P2T-6epvtXQ2cBOE_U1K4_noqlJFN3tj15djMgEu4NM,110
-pyinfra-3.0b0.dist-info/entry_points.txt,sha256=BraEFyquy05M8ch33HZXOHoH_m2BTqejL3xX3NrpzOM,471
-pyinfra-3.0b0.dist-info/top_level.txt,sha256=2K6D1mK35JTSEBgOfEPV-N-uA2SDErxGiE0J-HUMMVI,26
-pyinfra-3.0b0.dist-info/RECORD,,
+tests/test_connectors/test_vagrant.py,sha256=_MBX2b7I-FlEX4rcKeaEcJBSmpCtxxcwJN-7yY_Ivbk,3646
+pyinfra-3.0b1.dist-info/LICENSE.md,sha256=gwC95tUll0gwB32tHNkTAasN7Sb6vjWzXa305NwClbI,1076
+pyinfra-3.0b1.dist-info/METADATA,sha256=w4CVwxaxwspgoqLhaa04KKS3Ge8FcQj8lixIoQ9mUPc,8168
+pyinfra-3.0b1.dist-info/WHEEL,sha256=P2T-6epvtXQ2cBOE_U1K4_noqlJFN3tj15djMgEu4NM,110
+pyinfra-3.0b1.dist-info/entry_points.txt,sha256=BraEFyquy05M8ch33HZXOHoH_m2BTqejL3xX3NrpzOM,471
+pyinfra-3.0b1.dist-info/top_level.txt,sha256=2K6D1mK35JTSEBgOfEPV-N-uA2SDErxGiE0J-HUMMVI,26
+pyinfra-3.0b1.dist-info/RECORD,,

pyinfra_cli/commands.py

@@ -36,7 +36,7 @@ def get_func_and_args(commands):
 
 
 def get_facts_and_args(commands):
-    facts: list[FactBase] = []
+    facts: list[tuple[FactBase, tuple, dict]] = []
 
     current_fact = None
 
@@ -46,7 +46,7 @@ def get_facts_and_args(commands):
                 raise CliError("Invalid fact commands: `{0}`".format(commands))
 
             key, value = command.split("=", 1)
-            current_fact[2][key] = value
+            current_fact[2][key] = parse_cli_arg(value)
             continue
 
         if current_fact:
@@ -57,6 +57,7 @@ def get_facts_and_args(commands):
             raise CliError(f"Invalid fact: `{command}`, should be in the format `module.cls`")
 
         fact_cls = try_import_module_attribute(command, prefix="pyinfra.facts")
+        assert fact_cls is not None
         current_fact = (fact_cls, (), {})
 
     if current_fact:

pyinfra_cli/exceptions.py

@@ -1,6 +1,7 @@
 import abc
 import sys
 from inspect import getframeinfo
+from os import path
 from traceback import format_exception, format_tb, walk_tb
 from types import TracebackType
 
@@ -23,6 +24,10 @@ def get_frame_line_from_tb(tb: TracebackType):
         info = getframeinfo(frame)
         if info.filename.startswith(PYINFRA_INSTALL_DIR):
             continue
+        if info.filename.startswith("/"):
+            continue
+        if not path.exists(info.filename):
+            continue
         return info
 
 

pyinfra_cli/main.py

@@ -70,6 +70,8 @@ def _print_support(ctx, param, value):
     is_flag=True,
     default=False,
     help="Execute operations immediately on hosts without prompt or checking for changes.",
+    envvar="PYINFRA_YES",
+    show_envvar=True,
 )
 @click.option(
     "--limit",