plain.dev 0.24.0__py3-none-any.whl → 0.25.0__py3-none-any.whl

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"""
@@ -388,6 +385,12 @@ 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
+
+        # Split each service into a separate process
         services = Services.get_services(APP_PATH.parent)
         for name, data in services.items():
             env = {

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.dist-info → plain_dev-0.25.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plain.dev
-Version: 0.24.0
+Version: 0.25.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.dist-info → plain_dev-0.25.0.dist-info}/RECORD

@@ -1,15 +1,14 @@
 plain/dev/README.md,sha256=r_sONnN4zVlDdQrst_51iScrm3PlrcoPNmX9yX3MKXo,3658
 plain/dev/__init__.py,sha256=nRX1B0Br8gmqhJLqo5Z9PqzReDahBtbmwH6C-7hzuls,103
-plain/dev/cli.py,sha256=YWKBOuf-ryu5QXDtU2AZu1TH7ZzYCX3yJmKgr61Ec-M,13131
+plain/dev/cli.py,sha256=e1yBvB5PyQxTk4O9BP_73aJckL05jBAFVq2Kli6Jd-s,13138
 plain/dev/debug.py,sha256=Ka84K8zUdF0kMYNyqiLYDrdzU1jU8LSOkts3hcw_Gok,1005
 plain/dev/default_settings.py,sha256=uXWYORWP_aRDwXIFXdu5kHyiBFUZzARIJdhPeFaX35c,75
 plain/dev/entrypoints.py,sha256=diqNwA6eydUMtoO7p_rH-DtSYsw5-GBmjFe1Z5bHagc,579
 plain/dev/gunicorn_logging.json,sha256=yU23jzs5G4YGdDWBNiyAc3KypR4HirR6afIkD7w6DhU,1113
 plain/dev/mkcert.py,sha256=fm1U_UTGPREso6ZaP79WqEvd9uvA4lYWFo6fKhNglMM,3911
 plain/dev/pdb.py,sha256=4ru3rlIIyuYVXteyI7v42i4MmdBIjpJP0IJemBpf83A,3742
-plain/dev/pid.py,sha256=gRMBf7aGndrra1TnmKtPghTijnd0i0Xeo63mzfPWp7M,436
 plain/dev/requests.py,sha256=D1NX0qC8ADtf_zwsGMTp9aiE6Sh9QmoxFJCU_V8Wers,6839
-plain/dev/services.py,sha256=26WnVNjNAh37BA-wHQSGQY_9Ofw8oGgJdHhxnFaSKkg,2059
+plain/dev/services.py,sha256=bfIXEVsot20cDbyIeRJ9xAiTTVxowHrLAiZM2aOMXDU,2845
 plain/dev/urls.py,sha256=6fyl-DvxDgKjUjpyhuLN8m6GisB8L-eH4rhYH_eRmGA,188
 plain/dev/utils.py,sha256=4wMzpvj1Is_c0QxhsTu34_P9wAYlzw4glNPfVtZr_0A,123
 plain/dev/views.py,sha256=r2Ivk7OXytpRhXq4DZpsb7FXNP9vzmEE3D5kLajYG4w,1073
@@ -25,8 +24,8 @@ plain/dev/poncho/process.py,sha256=JJOKy-C6vMCg7-6JMCtu6C649h7HmOBSJqDP_hnX49I,2
 plain/dev/precommit/__init__.py,sha256=9ByBOIdM8DebChjNz-RH2atdz4vWe8somlwNEsbhwh4,40
 plain/dev/precommit/cli.py,sha256=KVHcG3Y_JZJNu3_MLIrO5s6yMYQfAArIU5L0hNWZUjg,3441
 plain/dev/templates/dev/requests.html,sha256=kQKJZq5L77juuL_t8UjcAehEU61U4RXNnKaAET-wAm8,7627
-plain_dev-0.24.0.dist-info/METADATA,sha256=8JYKVWAVB9KWsXvCG7v0sIxY9hBFGjMd1kIA8NSmYko,4163
-plain_dev-0.24.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-plain_dev-0.24.0.dist-info/entry_points.txt,sha256=zrcTOiFk_MLKsnYVlwVP7aMm1XLEqq7w4EBkJ-3ge-g,114
-plain_dev-0.24.0.dist-info/licenses/LICENSE,sha256=Cx4Dq9yR2fLHthf8Ke36B8QJvE1bZFXVzDIGE8wGzsY,4132
-plain_dev-0.24.0.dist-info/RECORD,,
+plain_dev-0.25.0.dist-info/METADATA,sha256=oOof38mcG0119ENTH8LH0hFpECPCmE_apn9-pZ4J_I0,4163
+plain_dev-0.25.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+plain_dev-0.25.0.dist-info/entry_points.txt,sha256=zrcTOiFk_MLKsnYVlwVP7aMm1XLEqq7w4EBkJ-3ge-g,114
+plain_dev-0.25.0.dist-info/licenses/LICENSE,sha256=Cx4Dq9yR2fLHthf8Ke36B8QJvE1bZFXVzDIGE8wGzsY,4132
+plain_dev-0.25.0.dist-info/RECORD,,

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()