plain.dev 0.29.0__tar.gz → 0.29.2__tar.gz

{plain_dev-0.29.0 → plain_dev-0.29.2}/PKG-INFO

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

{plain_dev-0.29.0 → plain_dev-0.29.2}/plain/dev/cli.py

@@ -49,8 +49,8 @@ ENTRYPOINT_GROUP = "plain.dev"
 @click.option(
     "--log-level",
     "-l",
-    default="info",
-    type=click.Choice(["debug", "info", "warning", "error", "critical"]),
+    default="",
+    type=click.Choice(["debug", "info", "warning", "error", "critical", ""]),
     help="Log level",
 )
 def cli(ctx, port, hostname, log_level):
@@ -145,10 +145,13 @@ class Dev:
         self.plain_env = {
             "PYTHONUNBUFFERED": "true",
             "PLAIN_DEV": "true",
-            "PLAIN_LOG_LEVEL": self.log_level.upper(),
-            "APP_LOG_LEVEL": self.log_level.upper(),
             **os.environ,
         }
+
+        if log_level:
+            self.plain_env["PLAIN_LOG_LEVEL"] = log_level.upper()
+            self.plain_env["APP_LOG_LEVEL"] = log_level.upper()
+
         self.custom_process_env = {
             **self.plain_env,
             "PORT": str(self.port),
@@ -198,7 +201,7 @@ class Dev:
 
         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
@@ -351,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(
@@ -404,7 +398,7 @@ class Dev:
             "--timeout",
             "60",
             "--log-level",
-            self.log_level,
+            self.log_level or "info",
             "--access-logfile",
             "-",
             "--error-logfile",

{plain_dev-0.29.0 → plain_dev-0.29.2}/pyproject.toml

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