fujin-cli 0.26.1__tar.gz → 0.27.1__tar.gz

{fujin_cli-0.26.1 → fujin_cli-0.27.1}/CHANGELOG.md

@@ -4,6 +4,24 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.27.1] - 2026-06-25
+
+### 🐛 Bug Fixes
+
+- Remove falco profile from test parametrization
+
+### ⚡ Performance
+
+- Simplify installer
+- Improve ssh connection handling
+
+## [0.27.0] - 2026-06-13
+
+### ⚙️ Miscellaneous Tasks
+
+- Release v0.27.0
+- Remove falco preset from init command
+
 ## [0.26.1] - 2026-06-09
 
 ### 🐛 Bug Fixes

{fujin_cli-0.26.1 → fujin_cli-0.27.1}/PKG-INFO

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

{fujin_cli-0.26.1 → fujin_cli-0.27.1}/plugins/fujin-secrets-1password/pyproject.toml

@@ -4,7 +4,7 @@ requires = [ "uv-build>=0.9.18,<0.10" ]
 
 [project]
 name = "fujin-secrets-1password"
-version = "0.26.1"
+version = "0.27.1"
 description = "1Password secret adapter for Fujin"
 readme = "README.md"
 authors = [
@@ -20,7 +20,7 @@ classifiers = [
   "Programming Language :: Python :: 3.14",
 ]
 dependencies = [
-  "fujin-cli>=0.26.1",
+  "fujin-cli>=0.27.1",
   "python-dotenv>=1.0.1",
 ]
 

{fujin_cli-0.26.1 → fujin_cli-0.27.1}/plugins/fujin-secrets-bitwarden/pyproject.toml

@@ -4,7 +4,7 @@ requires = [ "uv-build>=0.9.18,<0.10" ]
 
 [project]
 name = "fujin-secrets-bitwarden"
-version = "0.26.1"
+version = "0.27.1"
 description = "Bitwarden secret adapter for Fujin"
 readme = "README.md"
 authors = [
@@ -20,7 +20,7 @@ classifiers = [
   "Programming Language :: Python :: 3.14",
 ]
 dependencies = [
-  "fujin-cli>=0.26.1",
+  "fujin-cli>=0.27.1",
   "python-dotenv>=1.0.1",
 ]
 

{fujin_cli-0.26.1 → fujin_cli-0.27.1}/plugins/fujin-secrets-doppler/pyproject.toml

@@ -4,7 +4,7 @@ requires = [ "uv-build>=0.9.18,<0.10" ]
 
 [project]
 name = "fujin-secrets-doppler"
-version = "0.26.1"
+version = "0.27.1"
 description = "Doppler secret adapter for Fujin"
 readme = "README.md"
 authors = [
@@ -20,7 +20,7 @@ classifiers = [
   "Programming Language :: Python :: 3.14",
 ]
 dependencies = [
-  "fujin-cli>=0.26.1",
+  "fujin-cli>=0.27.1",
   "python-dotenv>=1.0.1",
 ]
 

{fujin_cli-0.26.1 → fujin_cli-0.27.1}/plugins/fujin-secrets-env/pyproject.toml

@@ -4,7 +4,7 @@ requires = [ "uv-build>=0.9.18,<0.10" ]
 
 [project]
 name = "fujin-secrets-env"
-version = "0.26.1"
+version = "0.27.1"
 description = "Environment variable secret adapter for Fujin"
 readme = "README.md"
 authors = [
@@ -20,7 +20,7 @@ classifiers = [
   "Programming Language :: Python :: 3.14",
 ]
 dependencies = [
-  "fujin-cli>=0.26.1",
+  "fujin-cli>=0.27.1",
   "python-dotenv>=1.0.1",
 ]
 

{fujin_cli-0.26.1 → fujin_cli-0.27.1}/pyproject.toml

@@ -5,7 +5,7 @@ requires = [ "hatchling" ]
 
 [project]
 name = "fujin-cli"
-version = "0.26.1"
+version = "0.27.1"
 description = "Get your project up and running in a few minutes on your own vps."
 readme = "README.md"
 keywords = [
@@ -151,7 +151,7 @@ markers = [
 ]
 
 [tool.bumpversion]
-current_version = "0.26.1"
+current_version = "0.27.1"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = [ "{major}.{minor}.{patch}" ]
 search = "{current_version}"

fujin_cli-0.27.1/src/fujin/__init__.py

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

{fujin_cli-0.26.1 → fujin_cli-0.27.1}/src/fujin/_installer.py

@@ -203,15 +203,15 @@ export -f {config.app_name}
             logger.debug("Virtual environment already exists")
 
         logger.debug("Installing package: %s", config.distfile_name)
-        dist_install = f"UV_COMPILE_BYTECODE=1 {uv_python_install_dir} {config.uv_path} pip install {distfile_path}"
+        # Combine distfile + requirements into a single uv invocation.
+        # --no-deps applies to the distfile; -r installs deps from requirements.
+        install_cmd = (
+            f"UV_COMPILE_BYTECODE=1 {uv_python_install_dir} "
+            f"{config.uv_path} pip install {distfile_path} --no-deps"
+        )
         if config.requirements:
-            requirements_path = bundle_dir / "requirements.txt"
-            logger.debug("Installing with requirements file")
-            run(
-                f"{dist_install} --no-deps && {config.uv_path} pip install -r {requirements_path} ",
-            )
-        else:
-            run(dist_install)
+            install_cmd += f" -r {bundle_dir / 'requirements.txt'}"
+        run(install_cmd)
 
     else:
         logger.debug("Installation mode: binary")
@@ -387,35 +387,29 @@ export -f {config.app_name}
         if unit["template_timer_name"]:
             active_units.append(unit["template_timer_name"])
 
-    # Validate all unit files before enabling/starting (catch errors early)
-    logger.info("Validating systemd unit files...")
-    validation_issues = 0
-    for unit in config.deployed_units:
-        unit_path = SYSTEMD_SYSTEM_DIR / unit["template_service_name"]
-        if not unit_path.exists():
-            continue
+    # Validate all unit files before enabling/starting (catch errors early).
+    # systemd-analyze accepts multiple paths and reports which files have issues.
+    unit_paths = [
+        SYSTEMD_SYSTEM_DIR / unit["template_service_name"]
+        for unit in config.deployed_units
+        if (SYSTEMD_SYSTEM_DIR / unit["template_service_name"]).exists()
+    ]
+    if unit_paths:
+        logger.info("Validating systemd unit files...")
+        paths_arg = " ".join(shlex.quote(str(p)) for p in unit_paths)
         result = subprocess.run(
-            f"systemd-analyze verify {shlex.quote(str(unit_path))}",
+            f"systemd-analyze verify {paths_arg}",
             shell=True,
             capture_output=True,
             text=True,
         )
         if result.returncode != 0 or result.stderr.strip():
-            validation_issues += 1
             logger.warning(
-                "Validation issues in %s (exit code %d):",
-                unit_path.name,
-                result.returncode,
+                "Validation issues detected (exit code %d):", result.returncode
             )
             for line in result.stderr.splitlines():
                 logger.warning("  %s", line)
 
-    if validation_issues:
-        logger.warning(
-            "%d unit(s) have validation warnings - review above before continuing",
-            validation_issues,
-        )
-
     if not active_units:
         run("systemctl daemon-reload")
         restart_result = run("true")

{fujin_cli-0.26.1 → fujin_cli-0.27.1}/src/fujin/commands/_base.py

@@ -1,16 +1,13 @@
 from __future__ import annotations
 
 import logging
-from contextlib import contextmanager
 from dataclasses import dataclass
 from functools import cached_property
-from typing import Annotated, Generator
+from typing import Annotated
 
 import cappa
 
 from fujin.config import Config, HostConfig
-from fujin.connection import SSH2Connection
-from fujin.connection import connection as host_connection
 
 _logging_configured = False
 
@@ -74,11 +71,6 @@ class BaseCommand:
     def output(self) -> MessageFormatter:
         return MessageFormatter(cappa.Output())
 
-    @contextmanager
-    def connection(self) -> Generator[SSH2Connection, None, None]:
-        with host_connection(host=self.selected_host) as conn:
-            yield conn
-
 
 class MessageFormatter:
     """Enhanced output with built-in color formatting for consistent CLI messaging."""

{fujin_cli-0.26.1 → fujin_cli-0.27.1}/src/fujin/commands/app.py

@@ -12,6 +12,7 @@ from rich.table import Table
 
 from fujin.commands import BaseCommand
 from fujin.config import tomllib
+from fujin import connection
 from fujin.discovery import DeployedUnit
 
 
@@ -54,7 +55,7 @@ class App(BaseCommand):
             if timer_name:
                 names.append(timer_name)
 
-        with self.connection() as conn:
+        with connection.connection(host=self.selected_host) as conn:
             shlex.quote(self.config.app_dir)
             fujin_dir = shlex.quote(self.config.install_dir)
             remote_version, _ = conn.run(
@@ -177,7 +178,7 @@ class App(BaseCommand):
             self.output.output(f"[bold]Replicas:[/bold] {deployed_unit.replicas}")
 
         # Get status from server
-        with self.connection() as conn:
+        with connection.connection(host=self.selected_host) as conn:
             # Get detailed status for each instance
             self.output.output("\n[bold]Status:[/bold]")
             for unit_name in deployed_unit.service_instances():
@@ -257,7 +258,7 @@ class App(BaseCommand):
         self,
         command: Annotated[str, cappa.Arg(help="Command to execute")],
     ):
-        with self.connection() as conn:
+        with connection.connection(host=self.selected_host) as conn:
             cmd = f"cd {self.config.app_dir} && source .install/.appenv && {self.config.app_bin} {command}"
             conn.run(
                 f"sudo -u {self.config.app_user} bash -c {shlex.quote(cmd)}",
@@ -307,7 +308,7 @@ class App(BaseCommand):
         self._run_service_command("stop", names)
 
     def _run_service_command(self, command: str, names: list[str] | None):
-        with self.connection() as conn:
+        with connection.connection(host=self.selected_host) as conn:
             # Use instances for start/stop/restart (operates on running services)
             units = self._get_runtime_units(names)
             if not units:
@@ -385,7 +386,7 @@ class App(BaseCommand):
         """
         Show last 50 lines for web process (default)
         """
-        with self.connection() as conn:
+        with connection.connection(host=self.selected_host) as conn:
             # Use instances for logs (shows logs from running services)
             units = self._get_runtime_units(names)
 
@@ -425,7 +426,7 @@ class App(BaseCommand):
             self.output.output(self._get_available_options())
             return
 
-        with self.connection() as conn:
+        with connection.connection(host=self.selected_host) as conn:
             if name == "caddy" and self.config.caddyfile_exists:
                 self.output.output(f"[cyan]# {self.config.caddy_config_path}[/cyan]")
                 print()
@@ -657,7 +658,7 @@ class App(BaseCommand):
             self.output.info(f"\nService already at {count} replica(s)")
 
     def _scale_on_server(self, service: str, old_count: int, new_count: int):
-        with self.connection() as conn:
+        with connection.connection(host=self.selected_host) as conn:
             app_name = self.config.app_name
 
             if new_count > old_count:

{fujin_cli-0.26.1 → fujin_cli-0.27.1}/src/fujin/commands/audit.py

@@ -11,6 +11,7 @@ from rich.markup import escape
 
 from fujin.audit import read_logs
 from fujin.commands import BaseCommand
+from fujin import connection
 
 
 @cappa.command(
@@ -28,7 +29,7 @@ class Audit(BaseCommand):
     ] = 20
 
     def __call__(self):
-        with self.connection() as conn:
+        with connection.connection(host=self.selected_host) as conn:
             records = read_logs(
                 connection=conn,
                 app_name=self.config.app_name,

{fujin_cli-0.26.1 → fujin_cli-0.27.1}/src/fujin/commands/deploy.py

@@ -24,6 +24,7 @@ from fujin.audit import log_operation
 from fujin.commands import BaseCommand
 from fujin.commands.rollback import Rollback
 from fujin.config import get_git_short_hash
+from fujin import connection
 from fujin.connection import SSH2Connection
 from fujin.errors import (
     BuildError,
@@ -577,12 +578,11 @@ class Deploy(BaseCommand):
         Acquires the deploy lock on the remote server before yielding the
         connection, and releases it on exit (even on error).
         """
-        with self.connection() as conn:
+        with connection.connection(host=self.selected_host, compress=False) as conn:
             install_dir_q = shlex.quote(self.config.install_dir)
             lock_file_q = shlex.quote(f"{self.config.install_dir}/.deploy_lock")
-            conn.run(f"mkdir -p {install_dir_q}", hide=True)
             _, acquired = conn.run(
-                f"(set -C; echo $$ > {lock_file_q}) 2>/dev/null",
+                f"mkdir -p {install_dir_q} && (set -C; echo $$ > {lock_file_q}) 2>/dev/null",
                 warn=True,
                 hide=True,
             )

{fujin_cli-0.26.1 → fujin_cli-0.27.1}/src/fujin/commands/down.py

@@ -10,6 +10,7 @@ from rich.prompt import Confirm
 from fujin import caddy
 from fujin.audit import log_operation
 from fujin.commands import BaseCommand
+from fujin import connection
 
 
 @cappa.command(
@@ -48,7 +49,7 @@ class Down(BaseCommand):
         if not confirm:
             return
 
-        with self.connection() as conn:
+        with connection.connection(host=self.selected_host) as conn:
             self.output.info("Tearing down project...")
 
             app_dir = shlex.quote(self.config.app_dir)

{fujin_cli-0.26.1 → fujin_cli-0.27.1}/src/fujin/commands/init.py

@@ -24,7 +24,7 @@ class Init(BaseCommand):
     profile: Annotated[
         str,
         cappa.Arg(
-            choices=["simple", "falco", "binary", "django"],
+            choices=["simple", "binary", "django"],
             short="-p",
             long="--profile",
             help="Configuration profile to use",
@@ -54,7 +54,6 @@ class Init(BaseCommand):
         profile_generators = {
             "simple": self._generate_simple,
             "django": self._generate_django,
-            "falco": self._generate_falco,
             "binary": self._generate_binary,
         }
 
@@ -172,11 +171,20 @@ class Init(BaseCommand):
             "# Main command - adjust to match your application\n", exec_start_pre_lines
         )
 
-        # Customize ExecStart for gunicorn
+        # Customize ExecStart for gunicorn and add reload with migrations
         service_content = service_content.replace(
             "ExecStart={install_dir}/.venv/bin/python -m myapp.web",
             f"ExecStart={{install_dir}}/.venv/bin/gunicorn {app_name}.wsgi:application --bind 0.0.0.0:8000",
         )
+        exec_reload_lines = (
+            f"ExecReload={{install_dir}}/.venv/bin/{app_name} migrate\n"
+            f"ExecReload={{install_dir}}/.venv/bin/{app_name} collectstatic --no-input\n"
+            f"ExecReload=/bin/kill -s HUP $MAINPID\n"
+        )
+        service_content = service_content.replace(
+            "ExecStartPre=/bin/bash -c 'rsync -a --delete staticfiles/",
+            f"{exec_reload_lines}ExecStartPre=/bin/bash -c 'rsync -a --delete staticfiles/",
+        )
         web_service.write_text(service_content)
         self.output.success(f"  Created {web_service}")
 
@@ -184,93 +192,6 @@ class Init(BaseCommand):
             fujin_dir, app_name, "localhost:8000", static_path="{app_dir}/staticfiles/"
         )
 
-    def _generate_falco(self, app_name: str, fujin_dir: Path):
-        """Generate Falco profile: web + worker services."""
-        systemd_dir = fujin_dir / "systemd"
-        dropin_dir = systemd_dir / "common.d"
-        dropin_dir.mkdir(parents=True, exist_ok=True)
-
-        dropin = dropin_dir / "base.conf"
-        dropin.write_text(
-            """
-[Service]
-User={{app_user}}
-WorkingDirectory={{app_dir}}
-EnvironmentFile={{install_dir}}/.env
-Restart=on-failure
-RestartSec=5s
-
-# Security Hardening
-NoNewPrivileges=true
-PrivateTmp=true
-ProtectSystem=strict
-ProtectHome=true
-ReadWritePaths={{app_dir}}
-        """
-        )
-
-        web_service = systemd_dir / "web.service"
-        web_service.write_text(
-            f"""
-[Unit]
-Description={app_name} web
-After=network.target
-Wants={{setup}}
-After={{setup}}
-
-[Service]
-UMask=0002
-RuntimeDirectory={app_name}
-RuntimeDirectoryMode=0755
-ExecStart={{install_dir}}/.venv/bin/{app_name} prodserver --uds /run/{app_name}/web.sock
-ExecReload=/bin/kill -s HUP $MAINPID
-KillMode=mixed
-TimeoutStopSec=5
-
-[Install]
-WantedBy=multi-user.target
-"""
-        )
-        self.output.success(f"  Created {web_service}")
-
-        setup_service = systemd_dir / "setup.service"
-        setup_service.write_text(
-            f"""
-[Unit]
-Description={app_name} setup
-After=network-online.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart={{install_dir}}/.venv/bin/{app_name} setup
-
-[Install]
-WantedBy=multi-user.target
-"""
-        )
-        self.output.success(f"  Created {setup_service}")
-
-        worker_service = systemd_dir / "worker.service"
-        worker_service.write_text(
-            f"""
-[Unit]
-Description={app_name} worker
-Wants={{setup}}
-After={{setup}}
-After=network.target
-
-[Service]
-ExecStart={{install_dir}}/.venv/bin/{app_name} db_worker
-
-[Install]
-WantedBy=multi-user.target
-"""
-        )
-        self.output.success(f"  Created {worker_service}")
-
-        self._create_caddyfile(fujin_dir, app_name, f"unix//run/{app_name}/web.sock")
-
     def _generate_binary(self, app_name: str, fujin_dir: Path):
         """Generate binary profile: single binary deployment."""
         systemd_dir = fujin_dir / "systemd"

{fujin_cli-0.26.1 → fujin_cli-0.27.1}/src/fujin/commands/prune.py

@@ -5,6 +5,7 @@ import cappa
 from rich.prompt import Confirm
 
 from fujin.commands import BaseCommand
+from fujin import connection
 
 
 @cappa.command(
@@ -30,7 +31,7 @@ class Prune(BaseCommand):
             raise cappa.Exit("The minimum value for the --keep option is 1", code=1)
 
         versions_dir = f"{self.config.install_dir}/.versions"
-        with self.connection() as conn:
+        with connection.connection(host=self.selected_host) as conn:
             _, success = conn.run(f"test -d {versions_dir}", warn=True, hide=True)
             if not success:
                 self.output.info("No versions directory found. Nothing to prune.")

{fujin_cli-0.26.1 → fujin_cli-0.27.1}/src/fujin/commands/rollback.py

@@ -10,6 +10,7 @@ from rich.prompt import Confirm, IntPrompt
 
 from fujin.audit import log_operation
 from fujin.commands import BaseCommand
+from fujin import connection
 
 
 @cappa.command(
@@ -35,7 +36,7 @@ class Rollback(BaseCommand):
     ] = False
 
     def __call__(self):
-        with self.connection() as conn:
+        with connection.connection(host=self.selected_host) as conn:
             shlex.quote(self.config.app_dir)
             fujin_dir = shlex.quote(self.config.install_dir)
             result, _ = conn.run(

{fujin_cli-0.26.1 → fujin_cli-0.27.1}/src/fujin/commands/server.py

@@ -15,6 +15,7 @@ from rich.table import Table
 from fujin import caddy
 from fujin.commands import BaseCommand
 from fujin.config import tomllib
+from fujin import connection
 from fujin.errors import SSHKeyError
 
 
@@ -32,7 +33,7 @@ class Server(BaseCommand):
 
     @cappa.command(help="Display information about the host system")
     def status(self):
-        with self.connection() as conn:
+        with connection.connection(host=self.selected_host) as conn:
             _, result_ok = conn.run("command -v fastfetch", warn=True, hide=True)
             if result_ok:
                 conn.run("fastfetch", pty=True)
@@ -41,7 +42,7 @@ class Server(BaseCommand):
 
     @cappa.command(help="Setup uv, web proxy, and install necessary dependencies")
     def bootstrap(self):
-        with self.connection() as conn:
+        with connection.connection(host=self.selected_host) as conn:
             self.output.info("Bootstrapping server...")
 
             self._upgrade_system(conn, packages="sqlite3 curl rsync")
@@ -91,7 +92,7 @@ class Server(BaseCommand):
         help="Upgrade server components (Caddy, uv, Python, system packages)"
     )
     def upgrade(self):
-        with self.connection() as conn:
+        with connection.connection(host=self.selected_host) as conn:
             self.output.info("Upgrading server components...")
             all_success = True
             self._upgrade_system(conn)
@@ -204,7 +205,7 @@ class Server(BaseCommand):
             bool, cappa.Arg(long="--with-password")
         ] = False,  # no short arg to force explicitness
     ):
-        with self.connection() as conn:
+        with connection.connection(host=self.selected_host) as conn:
             commands = [
                 f"sudo adduser --disabled-password --gecos '' {name}",
                 f"sudo mkdir -p /home/{name}/.ssh",
@@ -336,7 +337,7 @@ class Server(BaseCommand):
             ),
         ] = False,
     ):
-        with self.connection() as conn:
+        with connection.connection(host=self.selected_host) as conn:
             if not appenv:
                 return conn.run(command, pty=True)
             cmd = f"cd {self.config.app_dir} && source .install/.appenv && {command}"
@@ -353,7 +354,7 @@ class Server(BaseCommand):
             cappa.Arg(long="--user", help="List keys for a specific user"),
         ] = None,
     ):
-        with self.connection() as conn:
+        with connection.connection(host=self.selected_host) as conn:
             cat = "sudo cat" if user else "cat"
             path = (
                 f"/home/{user}/.ssh/authorized_keys"
@@ -401,7 +402,7 @@ class Server(BaseCommand):
             cappa.Arg(long="--user", help="Add key for a specific user"),
         ] = None,
     ):
-        with self.connection() as conn:
+        with connection.connection(host=self.selected_host) as conn:
             comment = f"{name} (fujin@{date.today().isoformat()})"
             temp_key = f"/tmp/fujin_key_{secrets.token_hex(8)}"
 
@@ -460,7 +461,7 @@ class Server(BaseCommand):
             cappa.Arg(long="--force", short="-f", help="Skip confirmation prompt"),
         ] = False,
     ):
-        with self.connection() as conn:
+        with connection.connection(host=self.selected_host) as conn:
             cat = "sudo cat" if user else "cat"
             path = (
                 f"/home/{user}/.ssh/authorized_keys"