plain.dev 0.14.2__py3-none-any.whl → 0.16.0__py3-none-any.whl

plain/dev/cli.py

@@ -10,6 +10,9 @@ from importlib.util import find_spec
 from pathlib import Path
 
 import click
+from rich.columns import Columns
+from rich.console import Console
+from rich.text import Text
 
 from plain.runtime import APP_PATH, settings
 
@@ -17,6 +20,7 @@ from .db import cli as db_cli
 from .mkcert import MkcertManager
 from .pid import Pid
 from .poncho.manager import Manager as PonchoManager
+from .poncho.printer import Printer
 from .services import Services
 from .utils import has_pyproject_toml
 
@@ -73,7 +77,7 @@ def services():
 )
 @click.argument("entrypoint", required=False)
 def entrypoint(show_list, entrypoint):
-    f"""Entrypoints registered under {ENTRYPOINT_GROUP}"""
+    """Entrypoints registered under plain.dev"""
     if not show_list and not entrypoint:
         click.secho("Please provide an entrypoint name or use --list", fg="red")
         sys.exit(1)
@@ -91,12 +95,11 @@ class Dev:
         self.hostname = hostname
         self.log_level = log_level
 
-        self.poncho = PonchoManager()
-
         self.ssl_key_path = None
         self.ssl_cert_path = None
 
         self.url = f"https://{self.hostname}:{self.port}"
+        self.tunnel_url = os.environ.get("PLAIN_DEV_TUNNEL_URL", "")
 
         self.plain_env = {
             "PYTHONUNBUFFERED": "true",
@@ -110,6 +113,9 @@ class Dev:
             "PLAIN_DEV_URL": self.url,
         }
 
+        self.console = Console(markup=False, highlight=False)
+        self.poncho = PonchoManager(printer=Printer(lambda s: self.console.out(s)))
+
     def run(self):
         pid = Pid()
         pid.write()
@@ -133,15 +139,39 @@ class Dev:
             self.add_pyproject_run()
             self.add_services()
 
-            # Output the clickable link before starting the manager loop
-            click.secho(
-                f"\nYour app will run at: {click.style(self.url, fg='green', underline=True)}\n",
-                bold=True,
-            )
-
-            click.secho("Starting services (Ctrl+C to stop):", italic=True, dim=True)
+            click.secho("\nStarting dev...", italic=True, dim=True)
+
+            if self.tunnel_url:
+                status_bar = Columns(
+                    [
+                        Text.from_markup(
+                            f"[bold]Tunnel URL[/bold] [underline][link={self.tunnel_url}]{self.tunnel_url}[/link][/underline]"
+                        ),
+                        Text.from_markup(
+                            f"[dim][bold]Localhost URL[/bold] [link={self.url}]{self.url}[/link][/dim]"
+                        ),
+                        Text.from_markup(
+                            "[dim]Press [bold]Ctrl+C[/bold] to stop[/dim]",
+                            justify="right",
+                        ),
+                    ],
+                    expand=True,
+                )
+            else:
+                status_bar = Columns(
+                    [
+                        Text.from_markup(
+                            f"[bold]Localhost URL[/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.poncho.loop()
+            with self.console.status(status_bar):
+                self.poncho.loop()
 
             return self.poncho.returncode
         finally:

plain/dev/contribute/cli.py

@@ -7,11 +7,14 @@ import click
 
 @click.command("contribute")
 @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"
+)
 @click.argument("packages", nargs=-1)
-def cli(packages, repo):
+def cli(packages, repo, reset):
     """Contribute to plain by linking packages locally."""
 
-    if "reset" in packages:
+    if reset:
         click.secho("Undoing any changes to pyproject.toml and uv.lock", bold=True)
         result = subprocess.run(["git", "checkout", "pyproject.toml", "uv.lock"])
         if result.returncode:

plain/dev/poncho/printer.py

@@ -1,8 +1,5 @@
-import sys
 from collections import namedtuple
 
-from .compat import ON_WINDOWS
-
 Message = namedtuple("Message", "type data time name color")
 
 
@@ -15,27 +12,18 @@ class Printer:
 
     def __init__(
         self,
-        output=sys.stdout,
+        print_func,
         time_format="%H:%M:%S",
         width=0,
         color=True,
         prefix=True,
     ):
-        self.output = output
+        self.print_func = print_func
         self.time_format = time_format
         self.width = width
         self.color = color
         self.prefix = prefix
 
-        try:
-            # We only want to print colored messages if the given output supports
-            # ANSI escape sequences. Usually, testing if it is a TTY is safe enough.
-            self._colors_supported = self.output.isatty()
-        except AttributeError:
-            # If the given output does not implement isatty(), we assume that it
-            # is not able to handle ANSI escape sequences.
-            self._colors_supported = False
-
     def write(self, message):
         if message.type != "line":
             raise RuntimeError('Printer can only process messages of type "line"')
@@ -58,28 +46,14 @@ class Printer:
             if self.prefix:
                 time_formatted = message.time.strftime(self.time_format)
                 prefix = f"{time_formatted} {name}| "
-                if self.color and self._colors_supported and message.color:
+                if self.color and message.color:
                     prefix = _color_string(message.color, prefix)
-            print(prefix + line, file=self.output, flush=True)
 
-
-def _ansi(code):
-    return f"\033[{code}m"
+            self.print_func(prefix + line)
 
 
 def _color_string(color, s):
-    return f"{_ansi(0)}{_ansi(color)}{s}{_ansi(0)}"
+    def _ansi(code):
+        return f"\033[{code}m"
 
-
-if ON_WINDOWS:
-    # The colorama package provides transparent support for ANSI color codes
-    # on Win32 platforms. We try and import and configure that, but fall back
-    # to no color if we fail.
-    try:
-        import colorama
-    except ImportError:
-
-        def _color_string(color, s):
-            return s
-    else:
-        colorama.init()
+    return f"{_ansi(0)}{_ansi(color)}{s}{_ansi(0)}"

{plain_dev-0.14.2.dist-info → plain_dev-0.16.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plain.dev
-Version: 0.14.2
+Version: 0.16.0
 Summary: Local development tools for Plain.
 Author-email: Dave Gaeddert <dave.gaeddert@dropseed.dev>
 License-Expression: BSD-3-Clause
@@ -13,6 +13,7 @@ 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
 Description-Content-Type: text/markdown
 
 <!-- This file is compiled from plain-dev/plain/dev/README.md. Do not edit this file directly. -->

{plain_dev-0.14.2.dist-info → plain_dev-0.16.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 plain/dev/README.md,sha256=-yR4qzwEP7vDVvCAHJ22aaQHQ7rXVW9uy0KEZjCzmz4,3662
 plain/dev/__init__.py,sha256=C1JrkNE5XX2DLgBXXLAV_UyhofwVd0ZPL59fPUMbOKo,139
-plain/dev/cli.py,sha256=dvEMZ0YkUNnLl3qDlKMkuhso4dTW9r8fHAvNprJwqPk,10612
+plain/dev/cli.py,sha256=La7Tcw6Szla-eTAqnQkbKYv_ctzHPd7f5YNtd1acAsA,11924
 plain/dev/debug.py,sha256=fIrecLfAK_lXSDyn3WmYikzZSse3KY47xcVVbZqJGhk,294
 plain/dev/default_settings.py,sha256=uXWYORWP_aRDwXIFXdu5kHyiBFUZzARIJdhPeFaX35c,75
 plain/dev/entrypoints.py,sha256=qBTP2A9pgxQmZ9hGV0OiBL92v9wa7TeJdOXnKZcX6AE,81
@@ -13,7 +13,7 @@ plain/dev/urls.py,sha256=b4NL2I6Ok-t7nTPjRnKoz_LQRttE3_mp8l2NlmeYQ9I,146
 plain/dev/utils.py,sha256=4wMzpvj1Is_c0QxhsTu34_P9wAYlzw4glNPfVtZr_0A,123
 plain/dev/views.py,sha256=r2Ivk7OXytpRhXq4DZpsb7FXNP9vzmEE3D5kLajYG4w,1073
 plain/dev/contribute/__init__.py,sha256=9ByBOIdM8DebChjNz-RH2atdz4vWe8somlwNEsbhwh4,40
-plain/dev/contribute/cli.py,sha256=vrHSYM0Y2XtIUbxmNcJqssoPN-ZbkH4T_p65NVkYrV4,2339
+plain/dev/contribute/cli.py,sha256=mIK4u1rhee8iMovUpuHTNjfWolqNgS24_gTb8ZaSY-8,2432
 plain/dev/db/__init__.py,sha256=9ByBOIdM8DebChjNz-RH2atdz4vWe8somlwNEsbhwh4,40
 plain/dev/db/cli.py,sha256=058HjRKLGz-FxauQEpwsPoh_LCiy-_NEIpRZl9W1ZKM,2855
 plain/dev/db/container.py,sha256=RlPJU_CCMKA-zN8Kp0sYAu3jabOizxYAj8fSCsjCf60,5147
@@ -21,13 +21,13 @@ plain/dev/poncho/__init__.py,sha256=MDOk2rhhoR3V-I-rg6tMHFeX60vTGJuQ14RI-_N6tQY,
 plain/dev/poncho/color.py,sha256=Dk77inPR9qNc9vCaZOGk8W9skXfRgoUlxp_E6mhPNns,610
 plain/dev/poncho/compat.py,sha256=l66WZLR7kRpO8P8DI5-aUsbNlohPaXEurQ5xXESQYDs,1276
 plain/dev/poncho/manager.py,sha256=l_m_RhNTF9Fs6p0Tk8pdjd5ZxQxU1kbGEgDD-qJaFGs,6366
-plain/dev/poncho/printer.py,sha256=KSkSXx6KiejekJ9e4bzutIAIL8oZPDGimtVHNRJyFbQ,2671
+plain/dev/poncho/printer.py,sha256=wt1ioaGcPnVyrPy-UjvdsR9zfcr4DTTycmapW1MIdSU,1785
 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=D_A5Mk2eXqjJDSUE6qyCFFddhM7wBZR3C9hgkDRx_v8,3411
 plain/dev/templates/dev/requests.html,sha256=kQKJZq5L77juuL_t8UjcAehEU61U4RXNnKaAET-wAm8,7627
-plain_dev-0.14.2.dist-info/METADATA,sha256=bJajMNTo0ucuFRhBfXMlCuV4JLEtnyOG7Uox_5PjjT8,4254
-plain_dev-0.14.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-plain_dev-0.14.2.dist-info/entry_points.txt,sha256=jncRPB4B7d27YWkzWqzt68y534ntliHPNukv_kQu5KY,171
-plain_dev-0.14.2.dist-info/licenses/LICENSE,sha256=YDg-l_Rj7LVP5uDXy04eQPGb_DYVXAHAHYd9r3pU1Cg,2713
-plain_dev-0.14.2.dist-info/RECORD,,
+plain_dev-0.16.0.dist-info/METADATA,sha256=YNoKWIzI0wrsff1bmX6HCdFD8xFl6NiHRx5PkffCtzg,4274
+plain_dev-0.16.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+plain_dev-0.16.0.dist-info/entry_points.txt,sha256=jncRPB4B7d27YWkzWqzt68y534ntliHPNukv_kQu5KY,171
+plain_dev-0.16.0.dist-info/licenses/LICENSE,sha256=YDg-l_Rj7LVP5uDXy04eQPGb_DYVXAHAHYd9r3pU1Cg,2713
+plain_dev-0.16.0.dist-info/RECORD,,