fujin-cli 0.22.2__tar.gz → 0.23.0__tar.gz

{fujin_cli-0.22.2 → fujin_cli-0.23.0}/CHANGELOG.md

@@ -4,6 +4,13 @@ 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.23.0] - 2026-03-21
+
+### 🚀 Features
+
+- Stream .env directly to server instead of bundling
+- Add --bundle-dir option to preserve deployment bundle
+
 ## [0.22.2] - 2026-03-21
 
 ### 🐛 Bug Fixes

{fujin_cli-0.22.2 → fujin_cli-0.23.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fujin-cli
-Version: 0.22.2
+Version: 0.23.0
 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.22.2 → fujin_cli-0.23.0}/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.22.2"
+version = "0.23.0"
 description = "1Password secret adapter for Fujin"
 readme = "README.md"
 authors = [
@@ -20,7 +20,7 @@ classifiers = [
   "Programming Language :: Python :: 3.14",
 ]
 dependencies = [
-  "fujin-cli>=0.22.2",
+  "fujin-cli>=0.23",
   "python-dotenv>=1.0.1",
 ]
 

{fujin_cli-0.22.2 → fujin_cli-0.23.0}/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.22.2"
+version = "0.23.0"
 description = "Bitwarden secret adapter for Fujin"
 readme = "README.md"
 authors = [
@@ -20,7 +20,7 @@ classifiers = [
   "Programming Language :: Python :: 3.14",
 ]
 dependencies = [
-  "fujin-cli>=0.22.2",
+  "fujin-cli>=0.23",
   "python-dotenv>=1.0.1",
 ]
 

{fujin_cli-0.22.2 → fujin_cli-0.23.0}/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.22.2"
+version = "0.23.0"
 description = "Doppler secret adapter for Fujin"
 readme = "README.md"
 authors = [
@@ -20,7 +20,7 @@ classifiers = [
   "Programming Language :: Python :: 3.14",
 ]
 dependencies = [
-  "fujin-cli>=0.22.2",
+  "fujin-cli>=0.23",
   "python-dotenv>=1.0.1",
 ]
 

{fujin_cli-0.22.2 → fujin_cli-0.23.0}/pyproject.toml

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

fujin_cli-0.23.0/src/fujin/__init__.py

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

{fujin_cli-0.22.2 → fujin_cli-0.23.0}/src/fujin/_installer.py

@@ -135,13 +135,6 @@ def install(
     install_dir = app_dir / ".install"
     install_dir.mkdir(exist_ok=True)
 
-    # Move .env file to .install/
-    env_file = bundle_dir / ".env"
-    if env_file.exists():
-        shutil.move(env_file, install_dir / ".env")
-        env_file = install_dir / ".env"
-        logger.debug("Moved .env to %s", env_file)
-
     # ==========================================================================
     # PHASE 2: INSTALLATION
     # ==========================================================================
@@ -221,7 +214,6 @@ export -f {config.app_name}
     run(f"chown -R {config.deploy_user}:{config.app_user} {install_dir}")
     # Make .install directory group-writable (deploy user can update, app user can read)
     install_dir.chmod(0o775)
-    env_file.chmod(0o640)
 
     # .venv permissions: readable/executable by group, writable by owner
     # Use chmod -R with symbolic modes to traverse once instead of 3 find commands

{fujin_cli-0.22.2 → fujin_cli-0.23.0}/src/fujin/commands/deploy.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import base64
 import json
 import logging
 import shlex
@@ -8,9 +9,10 @@ import hashlib
 import subprocess
 import tempfile
 import zipapp
+from contextlib import contextmanager
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Annotated
+from typing import Annotated, Generator
 
 import cappa
 from rich.console import Console
@@ -61,6 +63,13 @@ class Deploy(BaseCommand):
             help="Disable automatic rollback on deployment failure",
         ),
     ] = False
+    bundle_dir: Annotated[
+        Path | None,
+        cappa.Arg(
+            long="--bundle-dir",
+            help="Directory to create bundle in (preserved after deploy, fails if exists)",
+        ),
+    ] = None
 
     def __call__(self):
         logger.debug("Starting deployment for %s", self.config.app_name)
@@ -124,7 +133,7 @@ class Deploy(BaseCommand):
         if not self.config.deployed_units:
             raise DeploymentError("No systemd units found, nothing to deploy")
 
-        with tempfile.TemporaryDirectory() as tmpdir:
+        with self._bundle_directory() as tmpdir:
             self.output.info("Preparing deployment bundle...")
             zipapp_dir = Path(tmpdir) / "zipapp_source"
             zipapp_dir.mkdir()
@@ -162,10 +171,9 @@ class Deploy(BaseCommand):
             # Track unresolved variables across all files
             all_unresolved = set()
 
-            # resolve and copy env file
+            # Resolve env file (uploaded separately, not bundled)
             resolved_env, unresolved = safe_format(parsed_env, **context)
             all_unresolved.update(unresolved)
-            (zipapp_dir / ".env").write_text(resolved_env)
 
             logger.debug("Validating and resolving systemd units")
             systemd_dir = zipapp_dir / "systemd"
@@ -351,6 +359,23 @@ class Deploy(BaseCommand):
                     conn.put(str(zipapp_path), remote_bundle_path_q, verify=True)
 
                 self.output.success("Bundle uploaded successfully.")
+
+                # Write .env file directly (not bundled for security)
+                remote_env_path = f"{self.config.install_dir}/.env"
+                remote_env_path_q = shlex.quote(remote_env_path)
+                install_dir_q = shlex.quote(self.config.install_dir)
+                logger.debug("Writing .env to %s", remote_env_path)
+
+                # Use base64 encoding to safely transfer content with special chars
+                encoded_env = base64.b64encode(resolved_env.encode()).decode()
+                conn.run(
+                    f"mkdir -p {install_dir_q} && "
+                    f"echo {shlex.quote(encoded_env)} | base64 -d > {remote_env_path_q} && "
+                    f"chmod 640 {remote_env_path_q} && "
+                    f"chown {self.selected_host.user}:{self.config.app_user} {remote_env_path_q}",
+                    hide=True,
+                )
+
                 self.output.info("Executing remote installation...")
 
                 rollback_ran = False
@@ -425,6 +450,26 @@ class Deploy(BaseCommand):
                 url = f"https://{domain}"
                 self.output.info(f"Application is available at: {url}")
 
+    @contextmanager
+    def _bundle_directory(self) -> Generator[Path, None, None]:
+        """Context manager for bundle directory.
+
+        If bundle_dir is specified, uses that directory (fails if exists).
+        Otherwise, creates a temporary directory that is cleaned up on exit.
+        """
+        if self.bundle_dir:
+            if self.bundle_dir.exists():
+                raise DeploymentError(
+                    f"Bundle directory already exists: {self.bundle_dir}"
+                )
+            self.bundle_dir.mkdir(parents=True)
+            logger.debug("Using bundle directory: %s", self.bundle_dir)
+            yield self.bundle_dir
+            self.output.info(f"Bundle preserved in: {self.bundle_dir}")
+        else:
+            with tempfile.TemporaryDirectory() as tmpdir:
+                yield Path(tmpdir)
+
     def _show_deployment_summary(self, bundle_size: int, bundle_version: str):
         console = Console()
 

{fujin_cli-0.22.2 → fujin_cli-0.23.0}/uv.lock

@@ -345,7 +345,7 @@ wheels = [
 
 [[package]]
 name = "fujin-cli"
-version = "0.22.0"
+version = "0.22.2"
 source = { editable = "." }
 dependencies = [
     { name = "cappa" },
@@ -401,7 +401,7 @@ docs = [
 
 [[package]]
 name = "fujin-secrets-1password"
-version = "0.22.0"
+version = "0.22.2"
 source = { editable = "plugins/fujin-secrets-1password" }
 dependencies = [
     { name = "fujin-cli" },
@@ -416,7 +416,7 @@ requires-dist = [
 
 [[package]]
 name = "fujin-secrets-bitwarden"
-version = "0.22.0"
+version = "0.22.2"
 source = { editable = "plugins/fujin-secrets-bitwarden" }
 dependencies = [
     { name = "fujin-cli" },
@@ -431,7 +431,7 @@ requires-dist = [
 
 [[package]]
 name = "fujin-secrets-doppler"
-version = "0.22.0"
+version = "0.22.2"
 source = { editable = "plugins/fujin-secrets-doppler" }
 dependencies = [
     { name = "fujin-cli" },

fujin_cli-0.22.2/src/fujin/__init__.py

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