fujin-cli 0.11.5__py3-none-any.whl → 0.12.1__py3-none-any.whl

fujin/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.12.1"

fujin/__main__.py

@@ -7,6 +7,7 @@ import sys
 from pathlib import Path
 
 import cappa
+import fujin
 
 from fujin.commands.app import App
 from fujin.commands.config import ConfigCMD
@@ -50,9 +51,9 @@ class Fujin:
 def main():
     alias_cmd = _parse_aliases()
     if alias_cmd:
-        cappa.invoke(Fujin, argv=alias_cmd, version="0.11.5")
+        cappa.invoke(Fujin, argv=alias_cmd, version=fujin.__version__)
     else:
-        cappa.invoke(Fujin, version="0.11.5")
+        cappa.invoke(Fujin, version=fujin.__version__)
 
 
 def _parse_aliases() -> list[str] | None:

fujin/commands/_base.py

@@ -2,6 +2,7 @@ import importlib
 from contextlib import contextmanager
 from dataclasses import dataclass
 from functools import cached_property
+from typing import Generator
 
 import cappa
 
@@ -47,7 +48,7 @@ class BaseCommand:
             yield conn
 
     @contextmanager
-    def app_environment(self) -> Connection:
+    def app_environment(self) -> Generator[Connection, None, None]:
         with self.connection() as conn:
             with conn.cd(self.app_dir):
                 with conn.prefix("source .appenv"):

fujin/commands/deploy.py

@@ -100,7 +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("sudo rm -rf .venv")
             conn.run("uv venv")
             if self.config.requirements:
                 conn.run(f"uv pip install -r {versioned_assets_dir}/requirements.txt")

fujin/config.py

@@ -149,7 +149,9 @@ Path to the production environment file that will be copied to the host.
 
 env
 ~~~
-A string containing the production environment variables, ideal for scenarios where most variables are retrieved from secrets and you prefer not to use a separate file.
+A string containing the production environment variables. In combination with the secrets manager, this is most useful when
+you want to automate deployment through a CI/CD platform like GitLab CI or GitHub Actions. For an example of how to do this,
+check out the `integrations guide </integrations.html>`_
 
 .. important::
 

fujin/connection.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from contextlib import contextmanager
 from functools import partial
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Generator
 
 import cappa
 from fabric import Connection
@@ -32,7 +32,7 @@ def _get_watchers(host: HostConfig) -> list[Responder]:
 
 
 @contextmanager
-def host_connection(host: HostConfig) -> Connection:
+def host_connection(host: HostConfig) -> Generator[Connection, None, None]:
     connect_kwargs = None
     if host.key_filename:
         connect_kwargs = {"key_filename": str(host.key_filename)}

fujin/hooks.py

@@ -10,6 +10,7 @@ try:
 except ImportError:
     from enum import Enum
 
+
     class StrEnum(str, Enum):
         pass
 
@@ -36,9 +37,9 @@ class HookManager:
         if not hooks_folder.exists():
             return
         self.hooks = {
-            h.value: f"./{hooks_folder / h.value}"  # noqa
+            h: f"./{hooks_folder / h.value}"
             for h in Hook
-            if (hooks_folder / h.value).exists()  # noqa
+            if (hooks_folder / h.value).exists()
         }
 
     def _run_hook(self, type_: Hook) -> None:

fujin/systemd.py

@@ -102,7 +102,7 @@ class ProcessManager:
             body = (
                 local_config.read_text()
                 if local_config.exists() and not ignore_local
-                else template.format(**context, command=command)
+                else template.format(**context, command=command, process_name=name)
             )
             files.append((name, body))
         # if using unix then we are sure a web process was defined and the proxy is not dummy

fujin/templates/simple.service

@@ -1,7 +1,6 @@
 # All options are documented here https://www.freedesktop.org/software/systemd/man/latest/systemd.exec.html
 [Unit]
 Description={app_name} {process_name}
-After=network.target
 
 [Service]
 User={user}

fujin/templates/web.service

@@ -1,10 +1,13 @@
 # All options are documented here https://www.freedesktop.org/software/systemd/man/latest/systemd.exec.html
 # Inspiration was taken from here https://docs.gunicorn.org/en/stable/deploy.html#systemd
 [Unit]
-Description={app_name} daemon
+Description={app_name} {process_name}
+Requires={app_name}.socket
 After=network.target
 
 [Service]
+#Type=notify
+#NotifyAccess=main
 User={user}
 Group={user}
 RuntimeDirectory={app_name}
@@ -19,4 +22,4 @@ PrivateTmp=true
 ProtectSystem=strict
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target

fujin/templates/web.socket

@@ -8,4 +8,4 @@ SocketGroup=www-data
 SocketMode=0660
 
 [Install]
-WantedBy=sockets.target
+WantedBy=sockets.target

{fujin_cli-0.11.5.dist-info → fujin_cli-0.12.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fujin-cli
-Version: 0.11.5
+Version: 0.12.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.11.5.dist-info → fujin_cli-0.12.1.dist-info}/RECORD

@@ -1,15 +1,15 @@
-fujin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fujin/__main__.py,sha256=e9T-E4qC1sIw315_sKpSVCYKScZFYCfig8ShNRyNagM,1849
-fujin/config.py,sha256=t7UnhQMl-wYDyFCIcOC5lLdfpSmYWDIRPHvozoSoVME,11707
-fujin/connection.py,sha256=LL7LhX9p0X9FmiGdlSroD3Ht216QY0Kd51xkSrXmM3s,2479
+fujin/__init__.py,sha256=PAuBI8I6F9Yu_86XjI2yaWn8QmCd9ZvK7tkZLWvEg-Q,23
+fujin/__main__.py,sha256=KesDQurQ6HNMWBlxBLiSesgLHr6roUko3lgVh1pQNu8,1880
+fujin/config.py,sha256=veZyJ-s8mgk6yMsyBtoRUEbetjCS4d06Xi-_TTQHwOY,11844
+fujin/connection.py,sha256=lL_YBpoQarqhwFb5AIFK6_RQBloXFl9Phyua1mLXSD0,2513
 fujin/errors.py,sha256=74Rh-Sgql1YspPdR_akQ2G3xZ48zecyafYCptpaFo1A,73
-fujin/hooks.py,sha256=EDVYNozlDJ5kc1xHtZrXgtuKplUMEMPTp65TLMP02Ek,1449
-fujin/systemd.py,sha256=aWfN3CDl_NACjsfzyiVmO2h0-VTgc7y3g8RMG2jVsb4,6640
+fujin/hooks.py,sha256=-iTnWToDq6vg-qQPhay4IzZaSLKDxCHrpPvNX615BEU,1428
+fujin/systemd.py,sha256=pHhnIkQppR9d_usP942DcSinADl-jpghPg-0jjvB3S4,6659
 fujin/commands/__init__.py,sha256=g0b13vzidPUbxne_Zo_Wv5jpEmwCiSK4AokCinH9uo4,39
-fujin/commands/_base.py,sha256=2k9HGcxskFZQ7qYw8hcJh_73EZ_qVngLot7lOo2hQuw,2193
+fujin/commands/_base.py,sha256=lVIqlZsfM9cMbo4U3bK91n6YyWkLOBkkeIKoUk1cJt0,2245
 fujin/commands/app.py,sha256=mazb4dCTdR5juh79bL3a9b68Nd6O8u_nR9IgYqQlqWE,5279
 fujin/commands/config.py,sha256=WymGla-H2yduhLcYE1Nb6IJaFIj0S0KIhV9fBDCKsAw,2779
-fujin/commands/deploy.py,sha256=AylcVNX47ekf-AFfQrYcSh86I3qltADEgjPtV9lQAfE,5831
+fujin/commands/deploy.py,sha256=aCMBLN3SnZENQm8DrtZzhP4OlaIbpGJJQWHvsAae2wg,5836
 fujin/commands/docs.py,sha256=b5FZ8AgoAfn4q4BueEQvM2w5HCuh8-rwBqv_CRFVU8E,349
 fujin/commands/down.py,sha256=aw_mxl_TMC66plKTXwlYP1W2XQBmHeROltQqOpQssyE,1577
 fujin/commands/init.py,sha256=9yrja4YYFlJqEarN0ekg6yPd5niifPwvQ4i4wnC55a0,4007
@@ -29,14 +29,11 @@ fujin/secrets/bitwarden.py,sha256=01GZL5hYwZzL6yXy5ab3L3kgBFBeOT8i3Yg9GC8YwFU,20
 fujin/secrets/dopppler.py,sha256=t5SGfyuA0RxsD9uvrAu4cG2TBDIUgB5gb6XYXPrd61Y,724
 fujin/secrets/onepassword.py,sha256=6Xj3XWttKfcjMbcoMZvXVpJW1KHxlD785DysmX_mqvk,654
 fujin/secrets/system.py,sha256=Z5uNc2V3rcR75ffBnOsJywndoWuDcih88O9nPXIJ3U0,382
-fujin/templates/simple.service,sha256=ySlLqF354UCvlQaJcEVj4jf4hK7aKAq9qseE6pmtXJI,350
-fujin/templates/web.service,sha256=D3vHOHdP3wrZueKuhlhkB4syOCVvGSciDsNsmU_Bp68,626
-fujin/templates/web.socket,sha256=2lJsiOHlMJL0YlN7YBLLnr5zqsytPEt81yP34nk0dmc,173
-fujin/templates/granian/web.service,sha256=D3vHOHdP3wrZueKuhlhkB4syOCVvGSciDsNsmU_Bp68,626
-fujin/templates/gunicorn/web.service,sha256=EfTJQP4VvwlOTDyVCch5Y7iVhpPvZVaRWE6MHI4_z4k,683
-fujin/templates/gunicorn/web.socket,sha256=2lJsiOHlMJL0YlN7YBLLnr5zqsytPEt81yP34nk0dmc,173
-fujin_cli-0.11.5.dist-info/METADATA,sha256=SMsJ4wtSPlaJJtLU1erFIYzE8gZWp5Bw5fB-ZpCeYI8,4603
-fujin_cli-0.11.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-fujin_cli-0.11.5.dist-info/entry_points.txt,sha256=Y_TBtKt3j11qhwquMexZR5yqnDEqOBDACtresqQFE-s,46
-fujin_cli-0.11.5.dist-info/licenses/LICENSE.txt,sha256=0QF8XfuH0zkIHhSet6teXfiCze6JSdr8inRkmLLTDyo,1099
-fujin_cli-0.11.5.dist-info/RECORD,,
+fujin/templates/simple.service,sha256=1Hp8GfpBevULTaBMHAimdBPPee4W1tStQyKP2xQ0hHE,329
+fujin/templates/web.service,sha256=oOWLWonMl258xxNCYwGXHta427D86p2rH15cxkpHcLc,692
+fujin/templates/web.socket,sha256=f-gq8g1loYkWEDq_30sNtgDdPX0lwddK0jQDQzHLuus,172
+fujin_cli-0.12.1.dist-info/METADATA,sha256=91_DkybCmIOX6s2r0jxkV39IisQQwsV7hSQCnhatR1M,4603
+fujin_cli-0.12.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+fujin_cli-0.12.1.dist-info/entry_points.txt,sha256=Y_TBtKt3j11qhwquMexZR5yqnDEqOBDACtresqQFE-s,46
+fujin_cli-0.12.1.dist-info/licenses/LICENSE.txt,sha256=0QF8XfuH0zkIHhSet6teXfiCze6JSdr8inRkmLLTDyo,1099
+fujin_cli-0.12.1.dist-info/RECORD,,

fujin/templates/granian/web.service

@@ -1,22 +0,0 @@
-# All options are documented here https://www.freedesktop.org/software/systemd/man/latest/systemd.exec.html
-# Inspiration was taken from here https://docs.gunicorn.org/en/stable/deploy.html#systemd
-[Unit]
-Description={app_name} daemon
-After=network.target
-
-[Service]
-User={user}
-Group={user}
-RuntimeDirectory={app_name}
-WorkingDirectory={app_dir}
-ExecStart={app_dir}/{command}
-EnvironmentFile={app_dir}/.env
-ExecReload=/bin/kill -s HUP $MAINPID
-KillMode=mixed
-TimeoutStopSec=5
-PrivateTmp=true
-# if your app does not need administrative capabilities, let systemd know
-ProtectSystem=strict
-
-[Install]
-WantedBy=multi-user.target

fujin/templates/gunicorn/web.service

@@ -1,25 +0,0 @@
-# All options are documented here https://www.freedesktop.org/software/systemd/man/latest/systemd.exec.html
-# Inspiration was taken from here https://docs.gunicorn.org/en/stable/deploy.html#systemd
-[Unit]
-Description={app_name} daemon
-Requires={app_name}.socket
-After=network.target
-
-[Service]
-Type=notify
-NotifyAccess=main
-User={user}
-Group={user}
-RuntimeDirectory={app_name}
-WorkingDirectory={app_dir}
-ExecStart={app_dir}/{command}
-EnvironmentFile={app_dir}/.env
-ExecReload=/bin/kill -s HUP $MAINPID
-KillMode=mixed
-TimeoutStopSec=5
-PrivateTmp=true
-# if your app does not need administrative capabilities, let systemd know
-ProtectSystem=strict
-
-[Install]
-WantedBy=multi-user.target

fujin/templates/gunicorn/web.socket

@@ -1,11 +0,0 @@
-[Unit]
-Description={app_name} socket
-
-[Socket]
-ListenStream=/run/{app_name}.sock
-SocketUser=www-data
-SocketGroup=www-data
-SocketMode=0660
-
-[Install]
-WantedBy=sockets.target