fujin-cli 0.7.0__py3-none-any.whl → 0.7.1__py3-none-any.whl

fujin/commands/__init__.py

@@ -1,2 +1 @@
 from ._base import BaseCommand  # noqa
-from ._base import BaseCommand  # noqa

fujin/commands/_base.py

@@ -6,7 +6,8 @@ from functools import cached_property
 import cappa
 
 from fujin.config import Config
-from fujin.connection import host_connection, Connection
+from fujin.connection import Connection
+from fujin.connection import host_connection
 from fujin.errors import ImproperlyConfiguredError
 from fujin.hooks import HookManager
 from fujin.process_managers import ProcessManager

fujin/commands/deploy.py

@@ -7,8 +7,8 @@ import cappa
 
 from fujin.commands import BaseCommand
 from fujin.config import InstallationMode
-from fujin.secrets import resolve_secrets
 from fujin.connection import Connection
+from fujin.secrets import resolve_secrets
 
 
 @cappa.command(
@@ -100,6 +100,7 @@ export PATH=".venv/bin:$PATH"
         conn.run(f"echo '{appenv.strip()}' > {self.app_dir}/.appenv")
         versioned_assets_dir = f"{self.app_dir}/v{version}"
         if not skip_setup:
+            conn.run("rm -rf .venv")
             conn.run("uv venv")
             if self.config.requirements:
                 conn.run(f"uv pip install -r {versioned_assets_dir}/requirements.txt")

fujin/commands/init.py

@@ -8,7 +8,8 @@ import cappa
 import tomli_w
 
 from fujin.commands import BaseCommand
-from fujin.config import tomllib, InstallationMode
+from fujin.config import InstallationMode
+from fujin.config import tomllib
 
 
 @cappa.command(help="Generate a sample configuration file")

fujin/commands/printenv.py

@@ -5,12 +5,14 @@ from fujin.secrets import resolve_secrets
 
 
 @cappa.command(
-    help="Print the content of the envfile with extracted secrets (for debugging)"
+    help="Display the contents of the envfile with resolved secrets (for debugging purposes)"
 )
 class Printenv(BaseCommand):
     def __call__(self):
         if self.config.secret_config:
-            result = resolve_secrets(self.config.host.envfile, self.config.secret_config)
+            result = resolve_secrets(
+                self.config.host.envfile, self.config.secret_config
+            )
         else:
             result = self.config.host.envfile.read_text()
         self.stdout.output(result)

fujin/commands/redeploy.py

@@ -5,8 +5,8 @@ from pathlib import Path
 
 import cappa
 
-from fujin.commands import BaseCommand
 from .deploy import Deploy
+from fujin.commands import BaseCommand
 from fujin.config import InstallationMode
 from fujin.connection import Connection
 

fujin/commands/rollback.py

@@ -1,7 +1,8 @@
 from dataclasses import dataclass
 
 import cappa
-from rich.prompt import Prompt, Confirm
+from rich.prompt import Confirm
+from rich.prompt import Prompt
 
 from fujin.commands import BaseCommand
 from fujin.commands.deploy import Deploy

fujin/commands/up.py

@@ -1,8 +1,8 @@
 import cappa
-from fujin.commands import BaseCommand
 
 from .deploy import Deploy
 from .server import Server
+from fujin.commands import BaseCommand
 
 
 @cappa.command(help="Run everything required to deploy an application to a fresh host.")

fujin/connection.py

@@ -8,11 +8,9 @@ import cappa
 from fabric import Connection
 from invoke import Responder
 from invoke.exceptions import UnexpectedExit
-from paramiko.ssh_exception import (
-    AuthenticationException,
-    NoValidConnectionsError,
-    SSHException,
-)
+from paramiko.ssh_exception import AuthenticationException
+from paramiko.ssh_exception import NoValidConnectionsError
+from paramiko.ssh_exception import SSHException
 
 if TYPE_CHECKING:
     from fujin.config import HostConfig

fujin/hooks.py

@@ -1,8 +1,9 @@
 from dataclasses import dataclass
 
-from fujin.connection import Connection
 from rich import print as rich_print
 
+from fujin.connection import Connection
+
 try:
     from enum import StrEnum
 except ImportError:

fujin/secrets/__init__.py

@@ -1,13 +1,15 @@
 from __future__ import annotations
 
 from pathlib import Path
+from typing import Callable
+
 import gevent
 from dotenv import dotenv_values
-from typing import Callable
 
-from fujin.config import SecretConfig, SecretAdapter
 from .bitwarden import bitwarden
 from .onepassword import one_password
+from fujin.config import SecretAdapter
+from fujin.config import SecretConfig
 
 
 secret_reader = Callable[[str], str]

fujin/secrets/bitwarden.py

@@ -1,12 +1,14 @@
 from __future__ import annotations
-import cappa
+
 import os
+import subprocess
+from contextlib import contextmanager
+from typing import Generator
+from typing import TYPE_CHECKING
 
+import cappa
 
 from fujin.config import SecretConfig
-import subprocess
-from contextlib import contextmanager
-from typing import Generator, TYPE_CHECKING
 
 if TYPE_CHECKING:
     from . import secret_reader
@@ -25,7 +27,16 @@ def bitwarden(secret_config: SecretConfig) -> Generator[secret_reader, None, Non
 
     def read_secret(name: str) -> str:
         result = subprocess.run(
-            ["bw", "get", "password", name, "--raw", "--session", session, "--nointeraction"],
+            [
+                "bw",
+                "get",
+                "password",
+                name,
+                "--raw",
+                "--session",
+                session,
+                "--nointeraction",
+            ],
             capture_output=True,
             text=True,
         )

fujin/secrets/onepassword.py

@@ -1,12 +1,13 @@
 from __future__ import annotations
-import cappa
-
 
-from fujin.config import SecretConfig
 import subprocess
-
 from contextlib import contextmanager
-from typing import Generator, TYPE_CHECKING
+from typing import Generator
+from typing import TYPE_CHECKING
+
+import cappa
+
+from fujin.config import SecretConfig
 
 if TYPE_CHECKING:
     from . import secret_reader

{fujin_cli-0.7.0.dist-info → fujin_cli-0.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fujin-cli
-Version: 0.7.0
+Version: 0.7.1
 Summary: Get your project up and running in a few minutes on your own vps.
 Project-URL: Documentation, https://github.com/falcopackages/fujin#readme
 Project-URL: Issues, https://github.com/falcopackages/fujin/issues

{fujin_cli-0.7.0.dist-info → fujin_cli-0.7.1.dist-info}/RECORD

@@ -1,38 +1,38 @@
 fujin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fujin/__main__.py,sha256=VJMBzuQuxkQaAKNEySktGnms944bkRsrIAjj-XeaWR8,1813
 fujin/config.py,sha256=pdWK4fM3BITpz0MAv_ydCXRcQbgC3eLz--APdOpehiQ,10412
-fujin/connection.py,sha256=ZkYaNykRFj9Yr-K-vOrZtVVGUDurDm6W7OQrgct71CA,2428
+fujin/connection.py,sha256=LL7LhX9p0X9FmiGdlSroD3Ht216QY0Kd51xkSrXmM3s,2479
 fujin/errors.py,sha256=74Rh-Sgql1YspPdR_akQ2G3xZ48zecyafYCptpaFo1A,73
-fujin/hooks.py,sha256=QHIqxLxujG2U70UkN1BpUplE6tTqn7pFJP5oHde1tUQ,1350
-fujin/commands/__init__.py,sha256=uIGGXt8YofL5RZn8KIy153ioWGoCl32ffHtqOhB-6ZM,78
-fujin/commands/_base.py,sha256=o3R4-c3XeFWTIW3stiUdrcCPwdjzfjUVIpZy2L1-gZ4,2525
+fujin/hooks.py,sha256=nTn2PHpFuKbl_iAXUxagkrGcuwT2Exx8zIq4YfleX8A,1351
+fujin/commands/__init__.py,sha256=g0b13vzidPUbxne_Zo_Wv5jpEmwCiSK4AokCinH9uo4,39
+fujin/commands/_base.py,sha256=NfBdRBx_l7tYnVg0L8A3tPFC_XmtuHq-toU66KT5CiE,2553
 fujin/commands/app.py,sha256=mazb4dCTdR5juh79bL3a9b68Nd6O8u_nR9IgYqQlqWE,5279
 fujin/commands/config.py,sha256=xdfd1OZLxw2YZldiAbW5rq5EBXEaXbUC-I7FKLRfzIQ,2387
-fujin/commands/deploy.py,sha256=SUI_aMqTmaWHVtyX03rjrbWMYESoysAykcvILsEtsWk,5897
+fujin/commands/deploy.py,sha256=PfEdLS-rkdF12BfjtLEyqbnn1K4dEYRh7h6CFtWb2zs,5934
 fujin/commands/docs.py,sha256=b5FZ8AgoAfn4q4BueEQvM2w5HCuh8-rwBqv_CRFVU8E,349
 fujin/commands/down.py,sha256=v1lAq70ApktjeHRB_1sCzjmKH8t6EXqyL4RTt7OE-f0,1716
-fujin/commands/init.py,sha256=t8uwwOi4SBqHjV8px_SkTHAeZIiIUJnFN-lf7DK6HhE,3959
-fujin/commands/printenv.py,sha256=1xz80UCKpz64wsR9rYStro0K6pkKndNoNQvusEMYRuQ,486
+fujin/commands/init.py,sha256=zREfkIQyC6etqqQ6hgvDqpNNWQT4bk_8IOPBBT5-YUE,3983
+fujin/commands/printenv.py,sha256=bpGmOfc1t_dKWb8gy7EILYtwEyI9pIwhKg2XPKyJ9cQ,527
 fujin/commands/proxy.py,sha256=ajXwboS0gDDiMWW7b9rtWU6WPF1h7JYYeycDyU-hQfg,3053
 fujin/commands/prune.py,sha256=C2aAN6AUS84jgRg1eiCroyiuZyaZDmf5yvGAQY9xkcg,1517
-fujin/commands/redeploy.py,sha256=qYPM_Klj_2G1Up4ICu-8rklcqIbU-uohddmAzAA5sy0,2378
-fujin/commands/rollback.py,sha256=BN9vOTEBcSSpFIfck9nzWvMVO7asVC20lQbcNrxRchg,2009
+fujin/commands/redeploy.py,sha256=z1giY9SpINdJt8UagPlvUkJu30c8fgqapNqOxG4Jfuo,2378
+fujin/commands/rollback.py,sha256=JsocJzQcdQelSnYD94klhjBh8UKkkdiRD9shfUfo4FI,2032
 fujin/commands/server.py,sha256=0N_P_Luj31t56riZ8GfgRqW3vRHiw0cDrlp3PFoyWn8,3453
-fujin/commands/up.py,sha256=DgDN-1mc_mMHJRCIvcB947Cd5a7phunu9NpXloGK0UU,419
+fujin/commands/up.py,sha256=OEK_n-6-mnnIUffFpR7QtVunr1V1F04pxlAAS1U62BY,419
 fujin/process_managers/__init__.py,sha256=MhhfTBhm64zWRAKgjvsZRIToOUJus60vGScbAjqpQ6Y,994
 fujin/process_managers/systemd.py,sha256=qG_4Ew8SEWtaTFOAW_XZXsMO2WjFWZ4dp5nBwAPBObk,5603
 fujin/proxies/__init__.py,sha256=UuWYU175tkdaz1WWRCDDpQgGfFVYYNR9PBxA3lTCNr0,695
 fujin/proxies/caddy.py,sha256=dzLD8s664_kIK-1hCE3y50JIwBd8kK9yS1LynUDRVSE,7908
 fujin/proxies/dummy.py,sha256=qBKSn8XNEA9SVwB7GzRNX2l9Iw6tUjo2CFqZjWi0FjY,465
 fujin/proxies/nginx.py,sha256=BNJNLxLLRVAmBIGVCk8pb16iiSJsOI9jXOZhdSQGtX8,4151
-fujin/secrets/__init__.py,sha256=WFFe81fB6R3dzdvYsdPT9x-fE2LwpyrfF0nCuWrQNRw,1192
-fujin/secrets/bitwarden.py,sha256=rJ_n7CQT02TwwqN9lHQkh56g5BETKhZBtjWi3bOA8rQ,1846
-fujin/secrets/onepassword.py,sha256=2ySDY7fNW_sOqH-I89rfz3uMiBu0mJRHot4yKlTRbrE,636
+fujin/secrets/__init__.py,sha256=p4rY4J7yRoEEz6OXkomJ_Ov2AaaQ37-Zd_TJGpUDPgQ,1217
+fujin/secrets/bitwarden.py,sha256=01GZL5hYwZzL6yXy5ab3L3kgBFBeOT8i3Yg9GC8YwFU,2008
+fujin/secrets/onepassword.py,sha256=6Xj3XWttKfcjMbcoMZvXVpJW1KHxlD785DysmX_mqvk,654
 fujin/templates/simple.service,sha256=-lyKjmSyfHGucP4O_vRQE1NNaHq0Qjsc0twdwoRLgI0,321
 fujin/templates/web.service,sha256=NZ7ZeaFvV_MZTBn8QqRQeu8PIrWHf3aWYWNzjOQeqCw,685
 fujin/templates/web.socket,sha256=2lJsiOHlMJL0YlN7YBLLnr5zqsytPEt81yP34nk0dmc,173
-fujin_cli-0.7.0.dist-info/METADATA,sha256=0H7E8Re_jONc6BsoAdATLKM3r8QIrA_lT1oRgG3gWIw,4576
-fujin_cli-0.7.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-fujin_cli-0.7.0.dist-info/entry_points.txt,sha256=Y_TBtKt3j11qhwquMexZR5yqnDEqOBDACtresqQFE-s,46
-fujin_cli-0.7.0.dist-info/licenses/LICENSE.txt,sha256=0QF8XfuH0zkIHhSet6teXfiCze6JSdr8inRkmLLTDyo,1099
-fujin_cli-0.7.0.dist-info/RECORD,,
+fujin_cli-0.7.1.dist-info/METADATA,sha256=kqTIyfQ_EtbpdoaSkBmrF5Wy6y838HLaqLJHbLko3L4,4576
+fujin_cli-0.7.1.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+fujin_cli-0.7.1.dist-info/entry_points.txt,sha256=Y_TBtKt3j11qhwquMexZR5yqnDEqOBDACtresqQFE-s,46
+fujin_cli-0.7.1.dist-info/licenses/LICENSE.txt,sha256=0QF8XfuH0zkIHhSet6teXfiCze6JSdr8inRkmLLTDyo,1099
+fujin_cli-0.7.1.dist-info/RECORD,,