plain.dev 0.8.0__tar.gz → 0.8.2__tar.gz

{plain_dev-0.8.0 → plain_dev-0.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plain.dev
-Version: 0.8.0
+Version: 0.8.2
 Summary: Local development tools for Plain.
 Home-page: https://plainframework.com
 License: BSD-3-Clause

{plain_dev-0.8.0 → plain_dev-0.8.2}/plain/dev/cli.py

@@ -81,22 +81,30 @@ class Dev:
             "PYTHONPATH": os.path.join(APP_PATH.parent, "app"),
         }
         self.project_name = os.path.basename(os.getcwd())
-        self.domain = f"{self.project_name}.localhost"
         self.ssl_cert_path = None
         self.ssl_key_path = None
 
+        self.is_codespace = "CODESPACES" in os.environ
+
+        if self.is_codespace:
+            codespace_name = os.environ["CODESPACE_NAME"]
+            codespace_forward_domain = os.environ[
+                "GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN"
+            ]
+            self.domain = f"{codespace_name}-{self.port}.{codespace_forward_domain}"
+            self.url = f"https://{self.domain}/"
+            self.gunicorn_bind = str(self.port)
+        else:
+            self.domain = f"{self.project_name}.localhost"
+            self.url = f"https://{self.domain}:{self.port}/"
+            self.gunicorn_bind = f"{self.domain}:{self.port}"
+
     def run(self):
         pid = Pid()
         pid.write()
 
         try:
-            if "CODESPACES" in os.environ:
-                codespace_name = os.environ["CODESPACE_NAME"]
-                codespace_forward_domain = os.environ[
-                    "GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN"
-                ]
-                self.domain = f"https://{codespace_name}.{codespace_forward_domain}"
-            else:
+            if not self.is_codespace:
                 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(
@@ -115,9 +123,8 @@ class Dev:
             self.add_services()
 
             # Output the clickable link before starting the manager loop
-            url = f"https://{self.domain}:{self.port}/"
             click.secho(
-                f"\nYour app will run at: {click.style(url, fg='green', underline=True)}\n",
+                f"\nYour app will run at: {click.style(self.url, fg='green', underline=True)}\n",
                 bold=True,
             )
 
@@ -223,11 +230,7 @@ class Dev:
         gunicorn_cmd = [
             "gunicorn",
             "--bind",
-            f"{self.domain}:{self.port}",
-            "--certfile",
-            str(self.ssl_cert_path),
-            "--keyfile",
-            str(self.ssl_key_path),
+            self.gunicorn_bind,
             "--reload",
             "plain.wsgi:app",
             "--timeout",
@@ -242,6 +245,15 @@ class Dev:
             "--log-config-json",
             str(Path(__file__).parent / "gunicorn_logging.json"),
         ]
+
+        if self.ssl_cert_path and self.ssl_key_path:
+            gunicorn_cmd += [
+                "--certfile",
+                str(self.ssl_cert_path),
+                "--keyfile",
+                str(self.ssl_key_path),
+            ]
+
         gunicorn = " ".join(gunicorn_cmd)
 
         if plain_db_installed:

{plain_dev-0.8.0 → plain_dev-0.8.2}/pyproject.toml

@@ -5,7 +5,7 @@ packages = [
     { include = "plain" },
 ]
 
-version = "0.8.0"
+version = "0.8.2"
 description = "Local development tools for Plain."
 authors = ["Dave Gaeddert <dave.gaeddert@dropseed.dev>"]
 license = "BSD-3-Clause"