plain.dev 0.29.1__tar.gz → 0.30.0__tar.gz

{plain_dev-0.29.1 → plain_dev-0.30.0}/PKG-INFO

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

{plain_dev-0.29.1 → plain_dev-0.30.0}/plain/dev/cli.py

@@ -18,7 +18,7 @@ from rich.console import Console
 from rich.text import Text
 
 from plain.cli import register_cli
-from plain.runtime import APP_PATH, settings
+from plain.runtime import APP_PATH, PLAIN_TEMP_PATH
 
 from .mkcert import MkcertManager
 from .poncho.manager import Manager as PonchoManager
@@ -145,14 +145,13 @@ class Dev:
         self.plain_env = {
             "PYTHONUNBUFFERED": "true",
             "PLAIN_DEV": "true",
+            **os.environ,
         }
 
         if log_level:
             self.plain_env["PLAIN_LOG_LEVEL"] = log_level.upper()
             self.plain_env["APP_LOG_LEVEL"] = log_level.upper()
 
-        self.plain_env.update(os.environ)
-
         self.custom_process_env = {
             **self.plain_env,
             "PORT": str(self.port),
@@ -197,12 +196,12 @@ class Dev:
         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",
+            storage_path=Path(PLAIN_TEMP_PATH) / "dev" / "certs",
         )
 
         self.symlink_plain_src()
         self.modify_hosts_file()
-        self.set_csrf_and_allowed_hosts()
+        self.set_allowed_hosts()
         self.run_preflight()
 
         # If we start services ourselves, we should manage the pidfile
@@ -280,10 +279,10 @@ class Dev:
         plain_path = Path(
             importlib.util.find_spec("plain.runtime").origin
         ).parent.parent
-        if not settings.PLAIN_TEMP_PATH.exists():
-            settings.PLAIN_TEMP_PATH.mkdir()
+        if not PLAIN_TEMP_PATH.exists():
+            PLAIN_TEMP_PATH.mkdir()
 
-        symlink_path = settings.PLAIN_TEMP_PATH / "src"
+        symlink_path = PLAIN_TEMP_PATH / "src"
 
         # The symlink is broken
         if symlink_path.is_symlink() and not symlink_path.exists():
@@ -355,22 +354,13 @@ class Dev:
                 )
                 sys.exit(1)
 
-    def set_csrf_and_allowed_hosts(self):
-        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,
-            )
-
+    def set_allowed_hosts(self):
         if "PLAIN_ALLOWED_HOSTS" not in os.environ:
-            allowed_hosts = json.dumps([self.hostname])
+            hostnames = [self.hostname]
+            if self.tunnel_url:
+                # Add the tunnel URL to the allowed hosts
+                hostnames.append(self.tunnel_url.split("://")[1])
+            allowed_hosts = json.dumps(hostnames)
             self.plain_env["PLAIN_ALLOWED_HOSTS"] = allowed_hosts
             self.custom_process_env["PLAIN_ALLOWED_HOSTS"] = allowed_hosts
             click.secho(

plain_dev-0.30.0/plain/dev/gunicorn_logging.json

@@ -0,0 +1,40 @@
+{
+  "version": 1,
+  "disable_existing_loggers": false,
+  "root": {
+    "level": "INFO",
+    "handlers": ["console"]
+  },
+  "loggers": {
+    "gunicorn.error": {
+      "level": "INFO",
+      "handlers": ["error_console"],
+      "propagate": false,
+      "qualname": "gunicorn.error"
+    },
+    "gunicorn.access": {
+      "level": "INFO",
+      "handlers": ["console"],
+      "propagate": false,
+      "qualname": "gunicorn.access"
+    }
+  },
+  "handlers": {
+    "console": {
+      "class": "logging.StreamHandler",
+      "formatter": "generic",
+      "stream": "ext://sys.stdout"
+    },
+    "error_console": {
+      "class": "logging.StreamHandler",
+      "formatter": "generic",
+      "stream": "ext://sys.stderr"
+    }
+  },
+  "formatters": {
+    "generic": {
+      "format": "[%(process)d] [%(levelname)s] %(message)s",
+      "class": "logging.Formatter"
+    }
+  }
+}

{plain_dev-0.29.1 → plain_dev-0.30.0}/plain/dev/requests.py

@@ -6,7 +6,7 @@ import traceback
 
 import requests
 
-from plain.runtime import settings
+from plain.runtime import PLAIN_TEMP_PATH, settings
 from plain.signals import got_request_exception
 
 
@@ -18,7 +18,7 @@ class RequestLog:
 
     @staticmethod
     def storage_path():
-        return str(settings.PLAIN_TEMP_PATH / "dev" / "requestlog")
+        return str(PLAIN_TEMP_PATH / "dev" / "requestlog")
 
     @classmethod
     def replay_request(cls, name):

{plain_dev-0.29.1 → plain_dev-0.30.0}/plain/dev/services.py

@@ -7,7 +7,7 @@ from pathlib import Path
 
 import click
 
-from plain.runtime import APP_PATH, settings
+from plain.runtime import APP_PATH, PLAIN_TEMP_PATH
 
 from .poncho.manager import Manager as PonchoManager
 from .utils import has_pyproject_toml
@@ -15,7 +15,7 @@ from .utils import has_pyproject_toml
 
 class ServicesPid:
     def __init__(self):
-        self.pidfile = settings.PLAIN_TEMP_PATH / "dev" / "services.pid"
+        self.pidfile = PLAIN_TEMP_PATH / "dev" / "services.pid"
 
     def write(self):
         pid = os.getpid()

{plain_dev-0.29.1 → plain_dev-0.30.0}/pyproject.toml

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

plain_dev-0.29.1/plain/dev/gunicorn_logging.json

@@ -1,46 +0,0 @@
-{
-    "version": 1,
-    "disable_existing_loggers": false,
-    "root": {
-        "level": "INFO",
-        "handlers": [
-            "console"
-        ]
-    },
-    "loggers": {
-        "gunicorn.error": {
-            "level": "INFO",
-            "handlers": [
-                "error_console"
-            ],
-            "propagate": false,
-            "qualname": "gunicorn.error"
-        },
-        "gunicorn.access": {
-            "level": "INFO",
-            "handlers": [
-                "console"
-            ],
-            "propagate": false,
-            "qualname": "gunicorn.access"
-        }
-    },
-    "handlers": {
-        "console": {
-            "class": "logging.StreamHandler",
-            "formatter": "generic",
-            "stream": "ext://sys.stdout"
-        },
-        "error_console": {
-            "class": "logging.StreamHandler",
-            "formatter": "generic",
-            "stream": "ext://sys.stderr"
-        }
-    },
-    "formatters": {
-        "generic": {
-            "format": "[%(process)d] [%(levelname)s] %(message)s",
-            "class": "logging.Formatter"
-        }
-    }
-}