plain.dev 0.24.0__tar.gz → 0.26.0__tar.gz

{plain_dev-0.24.0 → plain_dev-0.26.0}/PKG-INFO

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

{plain_dev-0.24.0 → plain_dev-0.26.0}/plain/dev/cli.py

@@ -19,7 +19,6 @@ from plain.cli import register_cli
 from plain.runtime import APP_PATH, settings
 
 from .mkcert import MkcertManager
-from .pid import Pid
 from .poncho.manager import Manager as PonchoManager
 from .poncho.printer import Printer
 from .services import Services
@@ -104,7 +103,11 @@ def debug():
 @cli.command()
 def services():
     """Start additional services defined in pyproject.toml"""
-    Services().run()
+    _services = Services()
+    if _services.are_running():
+        click.secho("Services already running", fg="yellow")
+        return
+    _services.run()
 
 
 @cli.command()
@@ -154,65 +157,59 @@ class Dev:
         self.poncho = PonchoManager(printer=Printer(lambda s: self.console.out(s)))
 
     def run(self):
-        pid = Pid()
-        pid.write()
-
-        try:
-            mkcert_manager = MkcertManager()
-            mkcert_manager.setup_mkcert(install_path=Path.home() / ".plain" / "dev")
-            self.ssl_cert_path, self.ssl_key_path = mkcert_manager.generate_certs(
-                domain=self.hostname,
-                storage_path=Path(settings.PLAIN_TEMP_PATH) / "dev" / "certs",
-            )
+        mkcert_manager = MkcertManager()
+        mkcert_manager.setup_mkcert(install_path=Path.home() / ".plain" / "dev")
+        self.ssl_cert_path, self.ssl_key_path = mkcert_manager.generate_certs(
+            domain=self.hostname,
+            storage_path=Path(settings.PLAIN_TEMP_PATH) / "dev" / "certs",
+        )
 
-            self.symlink_plain_src()
-            self.modify_hosts_file()
-            self.set_csrf_and_allowed_hosts()
-            self.run_preflight()
-
-            # Processes for poncho to run simultaneously
-            self.add_gunicorn()
-            self.add_entrypoints()
-            self.add_pyproject_run()
-            self.add_services()
-
-            click.secho("\nStarting dev...", italic=True, dim=True)
-
-            if self.tunnel_url:
-                status_bar = Columns(
-                    [
-                        Text.from_markup(
-                            f"[bold]Tunnel[/bold] [underline][link={self.tunnel_url}]{self.tunnel_url}[/link][/underline]"
-                        ),
-                        Text.from_markup(
-                            f"[dim][bold]Server[/bold] [link={self.url}]{self.url}[/link][/dim]"
-                        ),
-                        Text.from_markup(
-                            "[dim][bold]Ctrl+C[/bold] to stop[/dim]",
-                            justify="right",
-                        ),
-                    ],
-                    expand=True,
-                )
-            else:
-                status_bar = Columns(
-                    [
-                        Text.from_markup(
-                            f"[bold]Server[/bold] [underline][link={self.url}]{self.url}[/link][/underline]"
-                        ),
-                        Text.from_markup(
-                            "[dim][bold]Ctrl+C[/bold] to stop[/dim]", justify="right"
-                        ),
-                    ],
-                    expand=True,
-                )
+        self.symlink_plain_src()
+        self.modify_hosts_file()
+        self.set_csrf_and_allowed_hosts()
+        self.run_preflight()
+
+        # Processes for poncho to run simultaneously
+        self.add_gunicorn()
+        self.add_entrypoints()
+        self.add_pyproject_run()
+        self.add_services()
+
+        click.secho("\nStarting dev...", italic=True, dim=True)
+
+        if self.tunnel_url:
+            status_bar = Columns(
+                [
+                    Text.from_markup(
+                        f"[bold]Tunnel[/bold] [underline][link={self.tunnel_url}]{self.tunnel_url}[/link][/underline]"
+                    ),
+                    Text.from_markup(
+                        f"[dim][bold]Server[/bold] [link={self.url}]{self.url}[/link][/dim]"
+                    ),
+                    Text.from_markup(
+                        "[dim][bold]Ctrl+C[/bold] to stop[/dim]",
+                        justify="right",
+                    ),
+                ],
+                expand=True,
+            )
+        else:
+            status_bar = Columns(
+                [
+                    Text.from_markup(
+                        f"[bold]Server[/bold] [underline][link={self.url}]{self.url}[/link][/underline]"
+                    ),
+                    Text.from_markup(
+                        "[dim][bold]Ctrl+C[/bold] to stop[/dim]", justify="right"
+                    ),
+                ],
+                expand=True,
+            )
 
-            with self.console.status(status_bar):
-                self.poncho.loop()
+        with self.console.status(status_bar):
+            self.poncho.loop()
 
-            return self.poncho.returncode
-        finally:
-            pid.rm()
+        return self.poncho.returncode
 
     def symlink_plain_src(self):
         """Symlink the plain package into .plain so we can look at it easily"""
@@ -221,12 +218,21 @@ class Dev:
         ).parent.parent
         if not settings.PLAIN_TEMP_PATH.exists():
             settings.PLAIN_TEMP_PATH.mkdir()
+
         symlink_path = settings.PLAIN_TEMP_PATH / "src"
 
-        # Remove a broken symlink if it changed
+        # The symlink is broken
         if symlink_path.is_symlink() and not symlink_path.exists():
             symlink_path.unlink()
 
+        # The symlink exists but points to the wrong place
+        if (
+            symlink_path.is_symlink()
+            and symlink_path.exists()
+            and symlink_path.resolve() != plain_path
+        ):
+            symlink_path.unlink()
+
         if plain_path.exists() and not symlink_path.exists():
             symlink_path.symlink_to(plain_path)
 
@@ -329,6 +335,8 @@ class Dev:
             str(self.ssl_cert_path),
             "--keyfile",
             str(self.ssl_key_path),
+            "--threads",
+            "4",
             "--reload",
             "plain.wsgi:app",
             "--timeout",
@@ -354,10 +362,6 @@ class Dev:
         else:
             runserver_cmd = gunicorn
 
-        if "WEB_CONCURRENCY" not in self.plain_env:
-            # Default to two workers to prevent lockups
-            self.plain_env["WEB_CONCURRENCY"] = "2"
-
         self.poncho.add_process("plain", runserver_cmd, env=self.plain_env)
 
     def add_entrypoints(self):
@@ -388,6 +392,14 @@ class Dev:
 
     def add_services(self):
         """Services are things that also run during tests (like a database), and are critical for the app to function."""
+
+        if Services.are_running():
+            click.secho("Services already running", fg="yellow")
+            return
+
+        # TODO need to set services pid here somehow...
+
+        # Split each service into a separate process
         services = Services.get_services(APP_PATH.parent)
         for name, data in services.items():
             env = {

{plain_dev-0.24.0 → plain_dev-0.26.0}/plain/dev/services.py

@@ -7,13 +7,29 @@ from pathlib import Path
 
 import click
 
-from plain.runtime import APP_PATH
+from plain.runtime import APP_PATH, settings
 
-from .pid import Pid
 from .poncho.manager import Manager as PonchoManager
 from .utils import has_pyproject_toml
 
 
+class ServicesPid:
+    def __init__(self):
+        self.pidfile = settings.PLAIN_TEMP_PATH / "dev" / "services.pid"
+
+    def write(self):
+        pid = os.getpid()
+        self.pidfile.parent.mkdir(parents=True, exist_ok=True)
+        with self.pidfile.open("w+") as f:
+            f.write(str(pid))
+
+    def rm(self):
+        self.pidfile.unlink()
+
+    def exists(self):
+        return self.pidfile.exists()
+
+
 class Services:
     @staticmethod
     def get_services(root):
@@ -33,25 +49,39 @@ class Services:
     def __init__(self):
         self.poncho = PonchoManager()
 
-    def run(self):
-        services = self.get_services(APP_PATH.parent)
-        for name, data in services.items():
-            env = {
-                **os.environ,
-                "PYTHONUNBUFFERED": "true",
-                **data.get("env", {}),
-            }
-            self.poncho.add_process(name, data["cmd"], env=env)
+    @staticmethod
+    def are_running():
+        pid = ServicesPid()
+        return pid.exists()
 
-        self.poncho.loop()
+    def run(self):
+        # Each user of Services will have to check if it is running by:
+        # - using the context manager (with Services())
+        # - calling are_running() directly
+        pid = ServicesPid()
+        pid.write()
+
+        try:
+            services = self.get_services(APP_PATH.parent)
+            for name, data in services.items():
+                env = {
+                    **os.environ,
+                    "PYTHONUNBUFFERED": "true",
+                    **data.get("env", {}),
+                }
+                self.poncho.add_process(name, data["cmd"], env=env)
+
+            self.poncho.loop()
+        finally:
+            pid.rm()
 
     def __enter__(self):
         if not self.get_services(APP_PATH.parent):
             # No-op if no services are defined
             return
 
-        if Pid().exists():
-            click.secho("Services already running in `plain dev` command", fg="yellow")
+        if self.are_running():
+            click.secho("Services already running", fg="yellow")
             return
 
         print("Starting `plain dev services`")

{plain_dev-0.24.0 → plain_dev-0.26.0}/pyproject.toml

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

plain_dev-0.24.0/plain/dev/pid.py

@@ -1,20 +0,0 @@
-import os
-
-from plain.runtime import settings
-
-
-class Pid:
-    def __init__(self):
-        self.pidfile = settings.PLAIN_TEMP_PATH / "dev.pid"
-
-    def write(self):
-        pid = os.getpid()
-        self.pidfile.parent.mkdir(parents=True, exist_ok=True)
-        with self.pidfile.open("w+") as f:
-            f.write(str(pid))
-
-    def rm(self):
-        self.pidfile.unlink()
-
-    def exists(self):
-        return self.pidfile.exists()