pyinfra 2.9.2__py2.py3-none-any.whl → 3.0b1__py2.py3-none-any.whl

pyinfra/operations/gem.py

@@ -9,7 +9,7 @@ from pyinfra.facts.gem import GemPackages
 from .util.packaging import ensure_packages
 
 
-@operation
+@operation()
 def packages(packages=None, present=True, latest=False):
     """
     Add/remove/update gem packages.

pyinfra/operations/git.py

@@ -13,9 +13,7 @@ from . import files, ssh
 from .util.files import chown, unix_path_join
 
 
-@operation(
-    pipeline_facts={"git_config": "repo"},
-)
+@operation()
 def config(key, value, multi_value=False, repo=None):
     """
     Manage git config for a repository or globally.
@@ -54,19 +52,15 @@ def config(key, value, multi_value=False, repo=None):
 
     if not multi_value and existing_config.get(key) != [value]:
         yield '{0} {1} "{2}"'.format(base_command, key, value)
-        existing_config[key] = [value]
 
     elif multi_value and value not in existing_config.get(key, []):
         yield '{0} --add {1} "{2}"'.format(base_command, key, value)
-        existing_config.setdefault(key, []).append(value)
 
     else:
         host.noop("git config {0} is set to {1}".format(key, value))
 
 
-@operation(
-    pipeline_facts={"git_branch": "target"},
-)
+@operation()
 def repo(
     src,
     dest,
@@ -105,7 +99,7 @@ def repo(
     """
 
     # Ensure our target directory exists
-    yield from files.directory(dest)
+    yield from files.directory._inner(dest)
 
     # Do we need to scan for the remote host key?
     if ssh_keyscan:
@@ -113,7 +107,7 @@ def repo(
         domain = re.match(r"^[a-zA-Z0-9]+@([0-9a-zA-Z\.\-]+)", src)
 
         if domain:
-            yield from ssh.keyscan(domain.group(1))
+            yield from ssh.keyscan._inner(domain.group(1))
         else:
             raise OperationError(
                 "Could not parse domain (to SSH keyscan) from: {0}".format(src),
@@ -130,21 +124,11 @@ def repo(
             git_commands.append("clone {0} --branch {1} .".format(src, branch))
         else:
             git_commands.append("clone {0} .".format(src))
-
-        host.create_fact(GitBranch, kwargs={"repo": dest}, data=branch)
-        host.create_fact(
-            Directory,
-            kwargs={"path": git_dir},
-            data={"user": user, "group": group},
-        )
-
     # Ensuring existing repo
     else:
         if branch and host.get_fact(GitBranch, repo=dest) != branch:
             git_commands.append("fetch")  # fetch to ensure we have the branch locally
             git_commands.append("checkout {0}".format(branch))
-            host.create_fact(GitBranch, kwargs={"repo": dest}, data=branch)
-
         if pull:
             if rebase:
                 git_commands.append("pull --rebase")
@@ -293,7 +277,6 @@ def worktree(
 
     # Doesn't exist & we want it
     if not host.get_fact(Directory, path=worktree) and present:
-
         # be sure that `repo` is a GIT repository
         if not assume_repo_exists and not host.get_fact(
             Directory,
@@ -321,12 +304,8 @@ def worktree(
         if user or group:
             yield chown(worktree, user, group, recursive=True)
 
-        host.create_fact(Directory, kwargs={"path": worktree}, data={"user": user, "group": group})
-        host.create_fact(GitTrackingBranch, kwargs={"repo": worktree}, data=new_branch)
-
     # It exists and we don't want it
     elif host.get_fact(Directory, path=worktree) and not present:
-
         command = "cd {0} && git worktree remove .".format(worktree)
 
         if force:
@@ -334,12 +313,8 @@ def worktree(
 
         yield command
 
-        host.delete_fact(Directory, kwargs={"path": worktree})
-        host.create_fact(GitTrackingBranch, kwargs={"repo": worktree})
-
     # It exists and we still want it => pull/rebase it
     elif host.get_fact(Directory, path=worktree) and present:
-
         # pull the worktree only if it's already linked to a tracking branch or
         # if a remote branch is set
         if host.get_fact(GitTrackingBranch, repo=worktree) or from_remote_branch:
@@ -359,7 +334,7 @@ def worktree(
             yield command
 
 
-@operation
+@operation()
 def bare_repo(
     path,
     user=None,
@@ -384,7 +359,7 @@ def bare_repo(
         )
     """
 
-    yield from files.directory(path, present=present)
+    yield from files.directory._inner(path, present=present)
 
     if present:
         head_filename = unix_path_join(path, "HEAD")
@@ -397,9 +372,3 @@ def bare_repo(
         else:
             if (user and head_file["user"] != user) or (group and head_file["group"] != group):
                 yield chown(path, user, group, recursive=True)
-
-        host.create_fact(
-            File,
-            kwargs={"path": head_filename},
-            data={"user": user, "group": group, "mode": None},
-        )

pyinfra/operations/iptables.py

@@ -8,7 +8,7 @@ from pyinfra.api.exceptions import OperationError
 from pyinfra.facts.iptables import Ip6tablesChains, Ip6tablesRules, IptablesChains, IptablesRules
 
 
-@operation
+@operation()
 def chain(
     chain,
     present=True,
@@ -41,7 +41,6 @@ def chain(
     if not present:
         if chain in chains:
             yield "{0} -X {1}".format(command, chain)
-            chains.pop(chain)
         else:
             host.noop("iptables chain {0} does not exist".format(chain))
         return
@@ -49,17 +48,15 @@ def chain(
     if present:
         if chain not in chains:
             yield "{0} -N {1}".format(command, chain)
-            chains[chain] = None  # policy will be set below
         else:
             host.noop("iptables chain {0} exists".format(chain))
 
         if policy:
             if chain not in chains or chains[chain] != policy:
                 yield "{0} -P {1} {2}".format(command, chain, policy)
-                chains[chain] = policy
 
 
-@operation
+@operation()
 def rule(
     chain,
     jump,
@@ -310,8 +307,3 @@ def rule(
 
         # Build the final iptables command
         yield " ".join(args)
-
-        if action == "-D":
-            rules.remove(definition)
-        else:
-            rules.append(definition)

pyinfra/operations/launchd.py

@@ -9,7 +9,7 @@ from pyinfra.facts.launchd import LaunchdStatus
 from .util.service import handle_service_control
 
 
-@operation
+@operation()
 def service(
     service,
     running=True,

pyinfra/operations/lxd.py

@@ -15,7 +15,7 @@ def get_container_named(name, containers):
         return None
 
 
-@operation
+@operation()
 def container(
     id,
     present=True,
@@ -53,8 +53,6 @@ def container(
 
             # Command to remove the container:
             yield "lxc delete {0}".format(id)
-
-            current_containers.remove(container)
         else:
             host.noop("container {0} does not exist".format(id))
 
@@ -63,11 +61,5 @@ def container(
         if not container:
             # Command to create the container:
             yield "lxc launch {image} {id} < /dev/null".format(id=id, image=image)
-            current_containers.append(
-                {
-                    "name": id,
-                    "image": image,
-                },
-            )
         else:
             host.noop("container {0} exists".format(id))

pyinfra/operations/mysql.py

@@ -52,7 +52,7 @@ def sql(
     )
 
 
-@operation
+@operation()
 def user(
     user,
     present=True,
@@ -162,22 +162,10 @@ def user(
                 host=mysql_host,
                 port=mysql_port,
             )
-            current_users.pop(user_host)
         else:
             host.noop("mysql user {0}@{1} does not exist".format(user, user_hostname))
         return
 
-    new_or_updated_user_fact = {
-        "ssl_type": "ANY" if require == "SSL" else require,
-        "ssl_cipher": require_cipher,
-        "x509_issuer": require_issuer,
-        "x509_subject": require_subject,
-        "max_user_connections": max_connections,
-        "max_questions": max_queries_per_hour,
-        "max_updates": max_updates_per_hour,
-        "max_connections": max_connections_per_hour,
-    }
-
     if present and not is_present:
         sql_bits = ['CREATE USER "{0}"@"{1}"'.format(user, user_hostname)]
         if password:
@@ -224,8 +212,6 @@ def user(
             port=mysql_port,
         )
 
-        current_users[user_host] = new_or_updated_user_fact
-
     if present and is_present:
         current_user = current_users.get(user_host)
 
@@ -277,14 +263,13 @@ def user(
                 host=mysql_host,
                 port=mysql_port,
             )
-            current_user.update(new_or_updated_user_fact)
         else:
             host.noop("mysql user {0}@{1} exists".format(user, user_hostname))
 
     # If we're here either the user exists or we just created them; either way
     # now we can check any privileges are set.
     if privileges:
-        yield from _privileges(
+        yield from _privileges._inner(
             user,
             privileges,
             user_hostname=user_hostname,
@@ -295,7 +280,7 @@ def user(
         )
 
 
-@operation
+@operation()
 def database(
     database,
     # Desired database settings
@@ -359,7 +344,6 @@ def database(
                 host=mysql_host,
                 port=mysql_port,
             )
-            current_databases.pop(database)
         else:
             host.noop("mysql database {0} does not exist".format(database))
         return
@@ -381,16 +365,12 @@ def database(
             host=mysql_host,
             port=mysql_port,
         )
-        current_databases[database] = {
-            "collate": collate,
-            "charset": charset,
-        }
     else:
         host.noop("mysql database {0} exists".format(database))
 
     # Ensure any user privileges for this database
     if user and user_privileges:
-        yield from privileges(
+        yield from privileges._inner(
             user,
             user_hostname=user_hostname,
             privileges=user_privileges,
@@ -402,7 +382,7 @@ def database(
         )
 
 
-@operation
+@operation()
 def privileges(
     user,
     privileges,
@@ -504,9 +484,6 @@ def privileges(
     # Find / grant any privileges that we want but do not exist
     privileges_to_grant = privileges - existing_privileges
 
-    user_grants[database_table] -= privileges_to_revoke
-    user_grants[database_table].update(privileges_to_grant)
-
     if privileges_to_grant:
         # We will grant something on this table, no need to revoke "USAGE" as it will be overridden
         privileges_to_revoke.discard("USAGE")

pyinfra/operations/npm.py

@@ -9,7 +9,7 @@ from pyinfra.facts.npm import NpmPackages
 from .util.packaging import ensure_packages
 
 
-@operation
+@operation()
 def packages(packages=None, present=True, latest=False, directory=None):
     """
     Install/remove/update npm packages.

pyinfra/operations/openrc.py

@@ -9,7 +9,7 @@ from pyinfra.facts.openrc import OpenrcEnabled, OpenrcStatus
 from .util.service import handle_service_control
 
 
-@operation
+@operation()
 def service(
     service,
     running=True,

pyinfra/operations/pacman.py

@@ -18,7 +18,7 @@ def upgrade():
     yield "pacman --noconfirm -Su"
 
 
-_upgrade = upgrade  # noqa: E305
+_upgrade = upgrade._inner  # noqa: E305
 
 
 @operation(is_idempotent=False)
@@ -30,10 +30,10 @@ def update():
     yield "pacman -Sy"
 
 
-_update = update  # noqa: E305
+_update = update._inner  # noqa: E305
 
 
-@operation
+@operation()
 def packages(
     packages=None,
     present=True,

pyinfra/operations/pip.py

@@ -12,7 +12,7 @@ from . import files
 from .util.packaging import ensure_packages
 
 
-@operation
+@operation()
 def virtualenv(
     path,
     python=None,
@@ -46,7 +46,7 @@ def virtualenv(
 
     if present is False:
         if host.get_fact(File, path=activate_script_path):
-            yield from files.directory(path, present=False)
+            yield from files.directory._inner(path, present=False)
         else:
             host.noop("virtualenv {0} does not exist".format(path))
 
@@ -72,20 +72,14 @@ def virtualenv(
             command.append(path)
 
             yield " ".join(command)
-
-            host.create_fact(
-                File,
-                kwargs={"path": activate_script_path},
-                data={"user": None, "group": None},
-            )
         else:
             host.noop("virtualenv {0} exists".format(path))
 
 
-_virtualenv = virtualenv  # noqa
+_virtualenv = virtualenv._inner  # noqa
 
 
-@operation
+@operation()
 def venv(
     path,
     python=None,
@@ -111,7 +105,7 @@ def venv(
         )
     """
 
-    yield from virtualenv(
+    yield from _virtualenv(
         venv=True,
         path=path,
         python=python,
@@ -121,7 +115,7 @@ def venv(
     )
 
 
-@operation
+@operation()
 def packages(
     packages=None,
     present=True,
@@ -173,10 +167,10 @@ def packages(
         virtualenv = virtualenv.rstrip("/")
         pip = "{0}/bin/{1}".format(virtualenv, pip)
 
-    install_command = [pip, "install"]
+    install_command_args = [pip, "install"]
     if extra_install_args:
-        install_command.append(extra_install_args)
-    install_command = " ".join(install_command)
+        install_command_args.append(extra_install_args)
+    install_command = " ".join(install_command_args)
 
     uninstall_command = " ".join([pip, "uninstall", "--yes"])
 
@@ -191,6 +185,11 @@ def packages(
     if packages:
         current_packages = host.get_fact(PipPackages, pip=pip)
 
+        # PEP-0426 states that Python packages should be compared using lowercase, so lowercase both
+        # the input packages and the fact packages before comparison.
+        packages = [pkg.lower() for pkg in packages]
+        current_packages = {pkg.lower(): versions for pkg, versions in current_packages.items()}
+
         yield from ensure_packages(
             host,
             packages,

pyinfra/operations/pkg.py

@@ -11,7 +11,7 @@ from pyinfra.facts.server import Arch, Os, OsVersion, Which
 from .util.packaging import ensure_packages
 
 
-@operation
+@operation()
 def packages(packages=None, present=True, pkg_path=None):
     """
     Install/remove/update pkg packages. This will use ``pkg ...`` where available

pyinfra/operations/pkgin.py

@@ -18,7 +18,7 @@ def upgrade():
     yield "pkgin -y upgrade"
 
 
-_upgrade = upgrade  # noqa: E305
+_upgrade = upgrade._inner  # noqa: E305
 
 
 @operation(is_idempotent=False)
@@ -30,10 +30,10 @@ def update():
     yield "pkgin -y update"
 
 
-_update = update  # noqa: E305
+_update = update._inner  # noqa: E305
 
 
-@operation
+@operation()
 def packages(
     packages=None,
     present=True,