plain.dev 0.32.1__py3-none-any.whl → 0.33.1__py3-none-any.whl

plain/dev/services.py

@@ -1,36 +1,17 @@
 import os
-import subprocess
-import time
 import tomllib
-from importlib.util import find_spec
 from pathlib import Path
 
-import click
-
 from plain.runtime import APP_PATH, PLAIN_TEMP_PATH
 
-from .poncho.manager import Manager as PonchoManager
+from .process import ProcessManager
 from .utils import has_pyproject_toml
 
 
-class ServicesPid:
-    def __init__(self):
-        self.pidfile = 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 ServicesProcess(ProcessManager):
+    pidfile = PLAIN_TEMP_PATH / "dev" / "services.pid"
+    log_dir = PLAIN_TEMP_PATH / "dev" / "logs" / "services"
 
-
-class Services:
     @staticmethod
     def get_services(root):
         if not has_pyproject_toml(root):
@@ -46,20 +27,10 @@ class Services:
             .get("services", {})
         )
 
-    def __init__(self):
-        self.poncho = PonchoManager()
-
-    @staticmethod
-    def are_running():
-        pid = ServicesPid()
-        return pid.exists()
-
     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()
+        self.write_pidfile()
+        self.prepare_log()
+        self.init_poncho(print)
 
         try:
             services = self.get_services(APP_PATH.parent)
@@ -73,34 +44,5 @@ class Services:
 
             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 self.are_running():
-            click.secho("Services already running", fg="yellow")
-            return
-
-        print("Starting `plain dev services`")
-        self._subprocess = subprocess.Popen(
-            ["plain", "dev", "services"], cwd=APP_PATH.parent
-        )
-
-        if find_spec("plain.models"):
-            time.sleep(0.5)  # Give it a chance to hit on the first try
-            subprocess.check_call(["plain", "models", "db-wait"], env=os.environ)
-        else:
-            # A bit of a hack to wait for the services to start
-            time.sleep(3)
-
-    def __exit__(self, *args):
-        if not hasattr(self, "_subprocess"):
-            return
-
-        self._subprocess.terminate()
-
-        # Flush the buffer so the output doesn't spill over
-        self._subprocess.communicate()
+            self.rm_pidfile()
+            self.close()

{plain_dev-0.32.1.dist-info → plain_dev-0.33.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plain.dev
-Version: 0.32.1
+Version: 0.33.1
 Summary: Local development tools for Plain.
 Author-email: Dave Gaeddert <dave.gaeddert@dropseed.dev>
 License-Expression: BSD-3-Clause
@@ -10,7 +10,6 @@ Requires-Dist: click>=8.0.0
 Requires-Dist: gunicorn>20
 Requires-Dist: inotify
 Requires-Dist: plain<1.0.0
-Requires-Dist: psycopg[binary]~=3.2.2
 Requires-Dist: python-dotenv~=1.0.0
 Requires-Dist: requests>=2.0.0
 Requires-Dist: rich
@@ -26,6 +25,7 @@ The `plain.dev` package can be [installed from PyPI](https://pypi.org/project/pl
 
 - [`plain dev`](#plain-dev)
 - [`plain dev services`](#plain-dev-services)
+- [`plain dev logs`](#plain-dev-logs)
 - [`plain pre-commit`](#plain-pre-commit)
 - [`plain contrib`](#plain-contrib)
 - [VS Code debugging](#vscode-debugging)
@@ -62,12 +62,26 @@ Unlike [services](#services), custom processes are _only_ run during `plain dev`
 ```toml
 # pyproject.toml
 [tool.plain.dev.run]
-ngrok = {command = "ngrok http $PORT"}
+    ngrok = {command = "ngrok http $PORT"}
 ```
 
 ## `plain dev services`
 
 Starts your [services](#services) by themselves.
+Logs are stored in `.plain/dev/logs/services/`.
+
+## `plain dev logs`
+
+Show output from recent `plain dev` runs.
+
+Logs are stored in `.plain/dev/logs/run/`.
+
+```bash
+plain dev logs        # print last log
+plain dev logs -f     # follow the latest log
+plain dev logs --pid 1234
+plain dev logs --path
+```
 
 ## `plain pre-commit`
 

{plain_dev-0.32.1.dist-info → plain_dev-0.33.1.dist-info}/RECORD

@@ -1,29 +1,30 @@
-plain/dev/CHANGELOG.md,sha256=c6IruZ_ktdWBVOfkMpbaTurjttyYa_pLUmf44RqAnhU,1621
-plain/dev/README.md,sha256=F0tkPLqQQLqqJFi5-r7VE6GB8bS1m84QUrGx8xNW9HE,3765
+plain/dev/CHANGELOG.md,sha256=jAFWdcHPeVbC9k1uvbii7gRV18rbszI0y_5inhN9I5s,3653
+plain/dev/README.md,sha256=Q-lyWmFH5DOq-xCGCLtEUNcanoldzQGANionqiE67Nw,4109
 plain/dev/__init__.py,sha256=9ByBOIdM8DebChjNz-RH2atdz4vWe8somlwNEsbhwh4,40
-plain/dev/cli.py,sha256=gITJpDAZb0lfuv7hNB8Oinb2HAaBhnz-XiS_R1_esQA,16617
+plain/dev/cli.py,sha256=siRCSuSOoeYUWGUr3OPeat-OULozhGYhMmJ_gAe9DpA,8146
+plain/dev/core.py,sha256=SOR1xH0-TYY6zDo_G7dTqatKbg3hNuVO9uHBIVt7_Ac,12086
 plain/dev/debug.py,sha256=Ka84K8zUdF0kMYNyqiLYDrdzU1jU8LSOkts3hcw_Gok,1005
 plain/dev/default_settings.py,sha256=uXWYORWP_aRDwXIFXdu5kHyiBFUZzARIJdhPeFaX35c,75
-plain/dev/dev_pid.py,sha256=wV8avKNY-zyd-FVQYjtjg5y4zOE7sgiVOhIjj9OmWNg,882
 plain/dev/entrypoints.py,sha256=diqNwA6eydUMtoO7p_rH-DtSYsw5-GBmjFe1Z5bHagc,579
 plain/dev/gunicorn_logging.json,sha256=3H6b6bQf_KdY61gzypvI0ly_Jduy-Uhqs2ra9ttzGJQ,867
 plain/dev/mkcert.py,sha256=fm1U_UTGPREso6ZaP79WqEvd9uvA4lYWFo6fKhNglMM,3911
 plain/dev/pdb.py,sha256=4ru3rlIIyuYVXteyI7v42i4MmdBIjpJP0IJemBpf83A,3742
-plain/dev/services.py,sha256=0MfPLoffItypUg_1PkX-juigR-abSS42nFHFZ5Eag-k,2843
+plain/dev/process.py,sha256=2Gdfng8ptRA7qPLONXbCP8vUTh-k-trmXqt6dcPV3o8,4051
+plain/dev/services.py,sha256=wg0pBhrnZDIALjFy6jFv6U1tryADGybLnhQPXMx1WoA,1269
 plain/dev/utils.py,sha256=4wMzpvj1Is_c0QxhsTu34_P9wAYlzw4glNPfVtZr_0A,123
 plain/dev/contribute/README.md,sha256=v9Ympugu2wvDEe_045WJnF1dmC4ZH7v_Bnxkpfaf_rM,329
 plain/dev/contribute/__init__.py,sha256=9ByBOIdM8DebChjNz-RH2atdz4vWe8somlwNEsbhwh4,40
-plain/dev/contribute/cli.py,sha256=7oO7L_cRaLXaxgixxqhRFDUwFxzPIySYaFeif0NTFIo,3598
+plain/dev/contribute/cli.py,sha256=jQnXxmv29sHa19vPUqYWH6z8HvsNL12rEdCPzPJge-U,3575
 plain/dev/poncho/__init__.py,sha256=MDOk2rhhoR3V-I-rg6tMHFeX60vTGJuQ14RI-_N6tQY,97
 plain/dev/poncho/color.py,sha256=Dk77inPR9qNc9vCaZOGk8W9skXfRgoUlxp_E6mhPNns,610
 plain/dev/poncho/compat.py,sha256=l66WZLR7kRpO8P8DI5-aUsbNlohPaXEurQ5xXESQYDs,1276
 plain/dev/poncho/manager.py,sha256=l0tcVslJ0snEiNPn4Pgphti_aIFKp1yfRx6Cng1F55w,6817
-plain/dev/poncho/printer.py,sha256=wt1ioaGcPnVyrPy-UjvdsR9zfcr4DTTycmapW1MIdSU,1785
+plain/dev/poncho/printer.py,sha256=1LhaQx55ujxmo-SSwQtzsh0bO6HL5q2_kiA0jLWEB-o,2976
 plain/dev/poncho/process.py,sha256=JJOKy-C6vMCg7-6JMCtu6C649h7HmOBSJqDP_hnX49I,2637
 plain/dev/precommit/__init__.py,sha256=9ByBOIdM8DebChjNz-RH2atdz4vWe8somlwNEsbhwh4,40
-plain/dev/precommit/cli.py,sha256=umWTjJPtwdNFZdmT5jfWbPW13N82BxH1ujdV0JQhs0o,3414
-plain_dev-0.32.1.dist-info/METADATA,sha256=n3wIpwCvpz5JAsz7zeFK_KM-f6fEKA4-al8QJ45lUZk,4270
-plain_dev-0.32.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-plain_dev-0.32.1.dist-info/entry_points.txt,sha256=zrcTOiFk_MLKsnYVlwVP7aMm1XLEqq7w4EBkJ-3ge-g,114
-plain_dev-0.32.1.dist-info/licenses/LICENSE,sha256=Cx4Dq9yR2fLHthf8Ke36B8QJvE1bZFXVzDIGE8wGzsY,4132
-plain_dev-0.32.1.dist-info/RECORD,,
+plain/dev/precommit/cli.py,sha256=ax_2cUpYfOhh6iZirhZS5cX0jy6rTfJAWzwm1qeRm58,3176
+plain_dev-0.33.1.dist-info/METADATA,sha256=v0E-ImpPqMVUApj6s8tddCAd3bYHwI3IF7NSSbnt6E4,4576
+plain_dev-0.33.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+plain_dev-0.33.1.dist-info/entry_points.txt,sha256=zrcTOiFk_MLKsnYVlwVP7aMm1XLEqq7w4EBkJ-3ge-g,114
+plain_dev-0.33.1.dist-info/licenses/LICENSE,sha256=Cx4Dq9yR2fLHthf8Ke36B8QJvE1bZFXVzDIGE8wGzsY,4132
+plain_dev-0.33.1.dist-info/RECORD,,

plain/dev/dev_pid.py

@@ -1,36 +0,0 @@
-import os
-
-from plain.runtime import PLAIN_TEMP_PATH
-
-
-class DevPid:
-    """Manage a pidfile for the running ``plain dev`` command."""
-
-    def __init__(self):
-        self.pidfile = PLAIN_TEMP_PATH / "dev" / "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):
-        if self.pidfile.exists():
-            self.pidfile.unlink()
-
-    def exists(self):
-        if not self.pidfile.exists():
-            return False
-        try:
-            pid = int(self.pidfile.read_text())
-        except (ValueError, OSError):
-            self.rm()
-            return False
-        try:
-            os.kill(pid, 0)
-        except OSError:
-            # Stale pidfile
-            self.rm()
-            return False
-        return True