fujin-cli 0.9.0__py3-none-any.whl → 0.10.0__py3-none-any.whl

fujin/commands/_base.py

@@ -10,8 +10,8 @@ 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
 from fujin.proxies import WebProxy
+from fujin.systemd import ProcessManager
 
 
 @dataclass
@@ -66,15 +66,5 @@ class BaseCommand:
     def create_web_proxy(self, conn: Connection) -> WebProxy:
         return self.web_proxy_class.create(conn=conn, config=self.config)
 
-    @cached_property
-    def process_manager_class(self) -> type[ProcessManager]:
-        module = importlib.import_module(self.config.process_manager)
-        try:
-            return getattr(module, "ProcessManager")
-        except KeyError as e:
-            raise ImproperlyConfiguredError(
-                f"Missing ProcessManager class in {self.config.process_manager}"
-            ) from e
-
     def create_process_manager(self, conn: Connection) -> ProcessManager:
-        return self.process_manager_class.create(conn=conn, config=self.config)
+        return ProcessManager.create(conn=conn, config=self.config)

fujin/commands/prune.py

@@ -8,7 +8,7 @@ from fujin.commands import BaseCommand
 
 
 @cappa.command(
-    help="Prune old version artifacts, keeping only the specified number of recent versions"
+    help="Prune old artifacts, keeping only the specified number of recent versions"
 )
 @dataclass
 class Prune(BaseCommand):

fujin/config.py

@@ -55,6 +55,7 @@ The secret management service to use. Available options:
 
 - ``bitwarden``
 - ``1password``
+- ``doppler``
 
 password_env
 ~~~~~~~~~~~~
@@ -116,6 +117,11 @@ Example:
 .. note::
 
     Commands are relative to your ``app_dir``. When generating systemd service files, the full path is automatically constructed.
+    Here are the templates for the service files:
+
+    - `web.service <https://github.com/falcopackages/fujin/blob/main/src/fujin/templates/web.service>`_
+    - `web.socket <https://github.com/falcopackages/fujin/blob/main/src/fujin/templates/web.socket>`_
+    - `simple.service <https://github.com/falcopackages/fujin/blob/main/src/fujin/templates/simple.service>`_ (for all additional processes)
 
 Host Configuration
 -------------------
@@ -216,6 +222,7 @@ class InstallationMode(StrEnum):
 class SecretAdapter(StrEnum):
     BITWARDEN = "bitwarden"
     ONE_PASSWORD = "1password"
+    DOPPLER = "doppler"
 
 
 class SecretConfig(msgspec.Struct):
@@ -235,7 +242,6 @@ class Config(msgspec.Struct, kw_only=True):
     aliases: dict[str, str] = msgspec.field(default_factory=dict)
     host: HostConfig
     processes: dict[str, str] = msgspec.field(default_factory=dict)
-    process_manager: str = "fujin.process_managers.systemd"
     webserver: Webserver
     requirements: str | None = None
     hooks: HooksDict = msgspec.field(default_factory=dict)

fujin/proxies/caddy.py

@@ -166,7 +166,8 @@ class WebProxy(msgspec.Struct):
         new_routes = [r for r in existing_routes if r.get("group") != self.app_name]
         current_config["routes"] = new_routes
         self.conn.run(
-            f"curl localhost:2019/config/apps/http/servers/srv0 -H 'Content-Type: application/json' -d '{json.dumps(current_config)}'"
+            f"curl localhost:2019/config/apps/http/servers/srv0 -H 'Content-Type: application/json' -d '{json.dumps(current_config)}'",
+            hide="out",
         )
 
     def start(self) -> None:

fujin/secrets/__init__.py

@@ -10,6 +10,7 @@ from dotenv import dotenv_values
 from fujin.config import SecretAdapter
 from fujin.config import SecretConfig
 from .bitwarden import bitwarden
+from .dopppler import doppler
 from .onepassword import one_password
 
 secret_reader = Callable[[str], str]
@@ -18,6 +19,7 @@ secret_adapter_context = Callable[[SecretConfig], ContextManager[secret_reader]]
 adapter_to_context: dict[SecretAdapter, secret_adapter_context] = {
     SecretAdapter.BITWARDEN: bitwarden,
     SecretAdapter.ONE_PASSWORD: one_password,
+    SecretAdapter.DOPPLER: doppler,
 }
 
 

fujin/secrets/dopppler.py

@@ -0,0 +1,31 @@
+from __future__ import annotations
+
+import subprocess
+from contextlib import contextmanager
+from typing import Generator
+from typing import TYPE_CHECKING
+
+import cappa
+
+from fujin.config import SecretConfig
+
+if TYPE_CHECKING:
+    from . import secret_reader
+
+
+@contextmanager
+def doppler(_: SecretConfig) -> Generator[secret_reader, None, None]:
+    def read_secret(name: str) -> str:
+        result = subprocess.run(
+            ["doppler", "run", "--command", f"echo ${name}"],
+            capture_output=True,
+            text=True,
+        )
+        if result.returncode != 0:
+            raise cappa.Exit(result.stderr)
+        return result.stdout.strip()
+
+    try:
+        yield read_secret
+    finally:
+        pass

fujin/{process_managers/systemd.py → systemd.py}

@@ -4,6 +4,8 @@ import importlib.util
 from dataclasses import dataclass
 from pathlib import Path
 
+import gevent
+
 from fujin.config import Config
 from fujin.connection import Connection
 
@@ -54,11 +56,23 @@ class ProcessManager:
                 hide="out",
             )
 
+        threads = []
         for name in self.processes:
             if name == "web" and self.is_using_unix_socket:
-                self.run_pty(f"sudo systemctl enable --now {self.app_name}.socket")
+                threads.append(
+                    gevent.spawn(
+                        self.run_pty,
+                        f"sudo systemctl enable --now {self.app_name}.socket",
+                    )
+                )
             else:
-                self.run_pty(f"sudo systemctl enable {self.get_service_name(name)}")
+                threads.append(
+                    gevent.spawn(
+                        self.run_pty,
+                        f"sudo systemctl enable {self.get_service_name(name)}",
+                    )
+                )
+        gevent.joinall(threads)
 
     def get_configuration_files(
         self, ignore_local: bool = False
@@ -105,47 +119,68 @@ class ProcessManager:
 
     def uninstall_services(self) -> None:
         self.stop_services()
-        for name in self.service_names:
-            self.run_pty(f"sudo systemctl disable {name}", warn=True)
-            self.run_pty(f"sudo rm /etc/systemd/system/{name}", warn=True)
+        threads = [
+            gevent.spawn(self.run_pty, f"sudo systemctl disable {name}", warn=True)
+            for name in self.service_names
+        ]
+        gevent.joinall(threads)
+        files_to_delete = [f"/etc/systemd/system/{name}" for name in self.service_names]
+        self.run_pty(f"sudo rm {' '.join(files_to_delete)}", warn=True)
 
     def start_services(self, *names) -> None:
         names = names or self.service_names
-        for name in names:
-            if name in self.service_names:
-                self.run_pty(f"sudo systemctl start {name}")
+        threads = [
+            gevent.spawn(self.run_pty, f"sudo systemctl start {name}")
+            for name in names
+            if name in self.service_names
+        ]
+        gevent.joinall(threads)
 
     def restart_services(self, *names) -> None:
         names = names or self.service_names
-        for name in names:
-            if name in self.service_names:
-                self.run_pty(f"sudo systemctl restart {name}")
+        threads = [
+            gevent.spawn(self.run_pty, f"sudo systemctl restart {name}")
+            for name in names
+            if name in self.service_names
+        ]
+        gevent.joinall(threads)
 
     def stop_services(self, *names) -> None:
         names = names or self.service_names
-        for name in names:
-            if name in self.service_names:
-                self.run_pty(f"sudo systemctl stop {name}")
+        threads = [
+            gevent.spawn(self.run_pty, f"sudo systemctl stop {name}")
+            for name in names
+            if name in self.service_names
+        ]
+        gevent.joinall(threads)
 
     def is_enabled(self, *names) -> dict[str, bool]:
         names = names or self.service_names
-        return {
-            name: self.run_pty(
-                f"sudo systemctl is-enabled {name}", warn=True, hide=True
-            ).stdout.strip()
-            == "enabled"
+        threads = {
+            name: gevent.spawn(
+                self.run_pty, f"sudo systemctl is-enabled {name}", warn=True, hide=True
+            )
             for name in names
         }
+        gevent.joinall(threads.values())
+        return {
+            name: thread.value.stdout.strip() == "enabled"
+            for name, thread in threads.items()
+        }
 
     def is_active(self, *names) -> dict[str, bool]:
         names = names or self.service_names
-        return {
-            name: self.run_pty(
-                f"sudo systemctl is-active {name}", warn=True, hide=True
-            ).stdout.strip()
-            == "active"
+        threads = {
+            name: gevent.spawn(
+                self.run_pty, f"sudo systemctl is-active {name}", warn=True, hide=True
+            )
             for name in names
         }
+        gevent.joinall(threads.values())
+        return {
+            name: thread.value.stdout.strip() == "active"
+            for name, thread in threads.items()
+        }
 
     def service_logs(self, name: str, follow: bool = False):
         # TODO: add more options here

{fujin_cli-0.9.0.dist-info → fujin_cli-0.10.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fujin-cli
-Version: 0.9.0
+Version: 0.10.0
 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.9.0.dist-info → fujin_cli-0.10.0.dist-info}/RECORD

@@ -1,11 +1,12 @@
 fujin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fujin/__main__.py,sha256=VJMBzuQuxkQaAKNEySktGnms944bkRsrIAjj-XeaWR8,1813
-fujin/config.py,sha256=LjgOTBumgOQTHkgXLJ0Rb2ERz_WBO-8rDj1hTYo-z0s,11027
+fujin/config.py,sha256=xh7yAStKcCx2bcIgzK0-ocLMtiqsgUtar9xqpqKQKww,11403
 fujin/connection.py,sha256=LL7LhX9p0X9FmiGdlSroD3Ht216QY0Kd51xkSrXmM3s,2479
 fujin/errors.py,sha256=74Rh-Sgql1YspPdR_akQ2G3xZ48zecyafYCptpaFo1A,73
 fujin/hooks.py,sha256=EDVYNozlDJ5kc1xHtZrXgtuKplUMEMPTp65TLMP02Ek,1449
+fujin/systemd.py,sha256=aWfN3CDl_NACjsfzyiVmO2h0-VTgc7y3g8RMG2jVsb4,6640
 fujin/commands/__init__.py,sha256=g0b13vzidPUbxne_Zo_Wv5jpEmwCiSK4AokCinH9uo4,39
-fujin/commands/_base.py,sha256=Rtf7kcO_Pg2JxPNKsXEx0UdhqfzYU6g7IiezC8cqEPQ,2610
+fujin/commands/_base.py,sha256=2k9HGcxskFZQ7qYw8hcJh_73EZ_qVngLot7lOo2hQuw,2193
 fujin/commands/app.py,sha256=mazb4dCTdR5juh79bL3a9b68Nd6O8u_nR9IgYqQlqWE,5279
 fujin/commands/config.py,sha256=WymGla-H2yduhLcYE1Nb6IJaFIj0S0KIhV9fBDCKsAw,2779
 fujin/commands/deploy.py,sha256=AylcVNX47ekf-AFfQrYcSh86I3qltADEgjPtV9lQAfE,5831
@@ -14,25 +15,24 @@ fujin/commands/down.py,sha256=aw_mxl_TMC66plKTXwlYP1W2XQBmHeROltQqOpQssyE,1577
 fujin/commands/init.py,sha256=AHAZeYkSk-zShF288Zs4rCfVwalCUqeMXWR6GTks2v0,4046
 fujin/commands/printenv.py,sha256=bS2mIgk7zd_w3yDhZLTa1PkHIzuSbBWjnYyM8CUjX0k,523
 fujin/commands/proxy.py,sha256=ajXwboS0gDDiMWW7b9rtWU6WPF1h7JYYeycDyU-hQfg,3053
-fujin/commands/prune.py,sha256=C2aAN6AUS84jgRg1eiCroyiuZyaZDmf5yvGAQY9xkcg,1517
+fujin/commands/prune.py,sha256=3Y0ZpgoI8eb_FVD6XMmZK9lEp2delKUeJdK09kv9_08,1509
 fujin/commands/redeploy.py,sha256=491Mzz0qiaHqcI7BFUtZq-M34WQkiBd2ZgQbLRLp8T8,2355
 fujin/commands/rollback.py,sha256=JsocJzQcdQelSnYD94klhjBh8UKkkdiRD9shfUfo4FI,2032
 fujin/commands/server.py,sha256=-3-PyBNR0fGm-RYE3fz50kP-LSDYGU9BzUxrbGZEghc,3312
 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/caddy.py,sha256=H52D7cGEEGcxDaXxvClnny9lAat_h1G9dYlIlf6gwKo,7933
 fujin/proxies/dummy.py,sha256=qBKSn8XNEA9SVwB7GzRNX2l9Iw6tUjo2CFqZjWi0FjY,465
 fujin/proxies/nginx.py,sha256=BNJNLxLLRVAmBIGVCk8pb16iiSJsOI9jXOZhdSQGtX8,4151
-fujin/secrets/__init__.py,sha256=hiNZIBtOwM0WQbvAF3GhuMMCsQCjXjiSr5gTLAGN-VI,1375
+fujin/secrets/__init__.py,sha256=WkdCtnBXjB7y_HHUWySf53LEe15Z7CZbE3cfDGxZiA8,1441
 fujin/secrets/bitwarden.py,sha256=01GZL5hYwZzL6yXy5ab3L3kgBFBeOT8i3Yg9GC8YwFU,2008
+fujin/secrets/dopppler.py,sha256=t5SGfyuA0RxsD9uvrAu4cG2TBDIUgB5gb6XYXPrd61Y,724
 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.9.0.dist-info/METADATA,sha256=0OCkg_YffO4PLhTp1AKrk7OmncaCbZOO3IyTYkjGXxI,4576
-fujin_cli-0.9.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-fujin_cli-0.9.0.dist-info/entry_points.txt,sha256=Y_TBtKt3j11qhwquMexZR5yqnDEqOBDACtresqQFE-s,46
-fujin_cli-0.9.0.dist-info/licenses/LICENSE.txt,sha256=0QF8XfuH0zkIHhSet6teXfiCze6JSdr8inRkmLLTDyo,1099
-fujin_cli-0.9.0.dist-info/RECORD,,
+fujin_cli-0.10.0.dist-info/METADATA,sha256=MBl9vT2C2Iq8pxVkuC9vgfmV7lhWBoZxjKxRf854QkQ,4577
+fujin_cli-0.10.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+fujin_cli-0.10.0.dist-info/entry_points.txt,sha256=Y_TBtKt3j11qhwquMexZR5yqnDEqOBDACtresqQFE-s,46
+fujin_cli-0.10.0.dist-info/licenses/LICENSE.txt,sha256=0QF8XfuH0zkIHhSet6teXfiCze6JSdr8inRkmLLTDyo,1099
+fujin_cli-0.10.0.dist-info/RECORD,,

fujin/process_managers/__init__.py

@@ -1,40 +0,0 @@
-from __future__ import annotations
-
-from typing import Protocol
-from typing import TYPE_CHECKING
-
-from fujin.connection import Connection
-
-if TYPE_CHECKING:
-    from fujin.config import Config
-
-
-class ProcessManager(Protocol):
-    service_names: list[str]
-
-    @classmethod
-    def create(cls, config: Config, conn: Connection) -> ProcessManager: ...
-
-    def get_service_name(self, process_name: str): ...
-
-    def install_services(self) -> None: ...
-
-    def uninstall_services(self) -> None: ...
-
-    def start_services(self, *names) -> None: ...
-
-    def restart_services(self, *names) -> None: ...
-
-    def stop_services(self, *names) -> None: ...
-
-    def is_enabled(self, *names) -> dict[str, bool]: ...
-
-    def is_active(self, *names) -> dict[str, bool]: ...
-
-    def service_logs(self, name: str, follow: bool = False): ...
-
-    def reload_configuration(self) -> None: ...
-
-    def get_configuration_files(
-        self, ignore_local: bool = False
-    ) -> list[tuple[str, str]]: ...