plain.dev 0.27.0__tar.gz → 0.28.0__tar.gz

{plain_dev-0.27.0 → plain_dev-0.28.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plain.dev
-Version: 0.27.0
+Version: 0.28.0
 Summary: Local development tools for Plain.
 Author-email: Dave Gaeddert <dave.gaeddert@dropseed.dev>
 License-Expression: BSD-3-Clause

{plain_dev-0.27.0 → plain_dev-0.28.0}/plain/dev/cli.py

@@ -1,11 +1,11 @@
 import importlib
 import json
+import multiprocessing
 import os
 import platform
 import signal
 import subprocess
 import sys
-import threading
 import time
 import tomllib
 from importlib.metadata import entry_points
@@ -223,21 +223,16 @@ class Dev:
         # If plain.models is installed (common) then we
         # will do a couple extra things before starting all of the app-related
         # processes (this way they don't all have to db-wait or anything)
+        process = None
         if find_spec("plain.models") is not None:
             # Use a custom signal to tell the main thread to add
             # the app processes once the db is ready
             signal.signal(signal.SIGUSR1, self.start_app)
 
-            def _thread(env):
-                subprocess.run(["plain", "models", "db-wait"], env=env, check=True)
-                subprocess.run(["plain", "migrate", "--backup"], env=env, check=True)
-                # preflight with db?
-                os.kill(os.getpid(), signal.SIGUSR1)
-
-            thread = threading.Thread(
-                target=_thread, daemon=True, args=(self.plain_env,)
+            process = multiprocessing.Process(
+                target=_process_task, args=(self.plain_env,)
             )
-            thread.start()
+            process.start()
         else:
             # Start the app processes immediately
             self.start_app(None, None)
@@ -253,6 +248,14 @@ class Dev:
             if services_pid:
                 services_pid.rm()
 
+            # Make sure the process is terminated if it is still running
+            if process and process.is_alive():
+                os.killpg(os.getpgid(process.pid), signal.SIGTERM)
+                process.join(timeout=3)
+                if process.is_alive():
+                    os.killpg(os.getpgid(process.pid), signal.SIGKILL)
+                    process.join()
+
         return self.poncho.returncode
 
     def start_app(self, signum, frame):
@@ -349,24 +352,26 @@ class Dev:
                 sys.exit(1)
 
     def set_csrf_and_allowed_hosts(self):
-        csrf_trusted_origins = json.dumps(
-            [
-                self.url,
-            ]
-        )
-        allowed_hosts = json.dumps([self.hostname])
-
-        # Set environment variables
-        self.plain_env["PLAIN_CSRF_TRUSTED_ORIGINS"] = csrf_trusted_origins
-        self.custom_process_env["PLAIN_CSRF_TRUSTED_ORIGINS"] = csrf_trusted_origins
-
-        self.plain_env["PLAIN_ALLOWED_HOSTS"] = allowed_hosts
-        self.custom_process_env["PLAIN_ALLOWED_HOSTS"] = allowed_hosts
+        if "PLAIN_CSRF_TRUSTED_ORIGINS" not in os.environ:
+            csrf_trusted_origins = json.dumps(
+                [
+                    self.url,
+                ]
+            )
+            self.plain_env["PLAIN_CSRF_TRUSTED_ORIGINS"] = csrf_trusted_origins
+            self.custom_process_env["PLAIN_CSRF_TRUSTED_ORIGINS"] = csrf_trusted_origins
+            click.secho(
+                f"Automatically set PLAIN_CSRF_TRUSTED_ORIGINS={csrf_trusted_origins}",
+                dim=True,
+            )
 
-        click.secho(
-            f"Automatically set PLAIN_ALLOWED_HOSTS={allowed_hosts} PLAIN_CSRF_TRUSTED_ORIGINS={csrf_trusted_origins}",
-            dim=True,
-        )
+        if "PLAIN_ALLOWED_HOSTS" not in os.environ:
+            allowed_hosts = json.dumps([self.hostname])
+            self.plain_env["PLAIN_ALLOWED_HOSTS"] = allowed_hosts
+            self.custom_process_env["PLAIN_ALLOWED_HOSTS"] = allowed_hosts
+            click.secho(
+                f"Automatically set PLAIN_ALLOWED_HOSTS={allowed_hosts}", dim=True
+            )
 
     def run_preflight(self):
         click.echo()
@@ -379,7 +384,9 @@ class Dev:
         extra_watch_files = []
         for f in os.listdir(APP_PATH.parent):
             if f.startswith(".env"):
-                extra_watch_files.append(f)
+                # Needs to be absolute or "./" for inotify to work on Linux...
+                # https://github.com/dropseed/plain/issues/26
+                extra_watch_files.append(str(Path(APP_PATH.parent) / f))
 
         reload_extra = " ".join(f"--reload-extra-file {f}" for f in extra_watch_files)
         gunicorn_cmd = [
@@ -437,3 +444,16 @@ class Dev:
                 **data.get("env", {}),
             }
             self.poncho.add_process(name, data["cmd"], env=env)
+
+
+def _process_task(env):
+    # Make this process the leader of a new group which can be killed together if it doesn't finish
+    os.setsid()
+
+    subprocess.run(["plain", "models", "db-wait"], env=env, check=True)
+    subprocess.run(["plain", "migrate", "--backup"], env=env, check=True)
+
+    # preflight with db?
+
+    # Send SIGUSR1 to the parent process so the parent's handler is invoked
+    os.kill(os.getppid(), signal.SIGUSR1)

{plain_dev-0.27.0 → plain_dev-0.28.0}/plain/dev/contribute/cli.py

@@ -8,7 +8,7 @@ from plain.cli import register_cli
 
 
 @register_cli("contrib")
-@click.command("contribute")
+@click.command("contribute", hidden=True)
 @click.option("--repo", default="../plain", help="Path to the plain repo")
 @click.option(
     "--reset", is_flag=True, help="Undo any changes to pyproject.toml and uv.lock"

{plain_dev-0.27.0 → plain_dev-0.28.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "plain.dev"
-version = "0.27.0"
+version = "0.28.0"
 description = "Local development tools for Plain."
 authors = [{name = "Dave Gaeddert", email = "dave.gaeddert@dropseed.dev"}]
 license = "BSD-3-Clause"