plain 0.21.3__tar.gz → 0.21.5__tar.gz

{plain-0.21.3 → plain-0.21.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plain
-Version: 0.21.3
+Version: 0.21.5
 Summary: A web framework for building products with Python.
 Author-email: Dave Gaeddert <dave.gaeddert@dropseed.dev>
 License-File: LICENSE

{plain-0.21.3 → plain-0.21.5}/plain/cli/packages.py

@@ -14,10 +14,11 @@ class InstalledPackagesGroup(click.Group):
     """
 
     PLAIN_APPS_PREFIX = "plain."
+    APP_PREFIX = "app."
     MODULE_NAME = "cli"
 
     def list_commands(self, ctx):
-        packages_with_commands = []
+        command_names = []
 
         # Get installed packages with a cli.py module
         for app in packages.get_package_configs():
@@ -26,21 +27,37 @@ class InstalledPackagesGroup(click.Group):
 
             cli_name = app.name
 
+            # Change plain.{pkg} to just {pkg}
             if cli_name.startswith(self.PLAIN_APPS_PREFIX):
                 cli_name = cli_name[len(self.PLAIN_APPS_PREFIX) :]
 
-            packages_with_commands.append(cli_name)
+            # Change app.{pkg} to just {pkg}
+            if cli_name.startswith(self.APP_PREFIX):
+                cli_name = cli_name[len(self.APP_PREFIX) :]
 
-        return packages_with_commands
+            if cli_name in command_names:
+                raise ValueError(
+                    f"Duplicate command name {cli_name} found in installed packages."
+                )
+
+            command_names.append(cli_name)
+
+        return command_names
 
     def get_command(self, ctx, name):
-        # Try it as plain.x and just x (we don't know ahead of time which it is, but prefer plain.x)
-        for n in [self.PLAIN_APPS_PREFIX + name, name]:
-            if not find_spec(n):
-                # plain.<name> doesn't exist at all
+        # Try it as plain.x, app.x, and just x (we don't know ahead of time which it is)
+        for n in [self.PLAIN_APPS_PREFIX + name, self.APP_PREFIX + name, name]:
+            try:
+                if not find_spec(n):
+                    # plain.<name> doesn't exist at all
+                    continue
+            except ModuleNotFoundError:
                 continue
 
-            if not find_spec(f"{n}.{self.MODULE_NAME}"):
+            try:
+                if not find_spec(f"{n}.{self.MODULE_NAME}"):
+                    continue
+            except ModuleNotFoundError:
                 continue
 
             cli = importlib.import_module(f"{n}.{self.MODULE_NAME}")

{plain-0.21.3 → plain-0.21.5}/plain/packages/config.py

@@ -15,11 +15,11 @@ class PackageConfig:
     migrations_module = "migrations"
 
     def __init__(self, package_name, package_module):
-        # Full Python path to the application e.g. 'plain.staff.admin'.
+        # Full Python path to the application e.g. 'plain.admin.admin'.
         self.name = package_name
 
-        # Root module for the application e.g. <module 'plain.staff.admin'
-        # from 'staff/__init__.py'>.
+        # Root module for the application e.g. <module 'plain.admin.admin'
+        # from 'admin/__init__.py'>.
         self.module = package_module
 
         # Reference to the Packages registry that holds this PackageConfig. Set by the
@@ -43,8 +43,8 @@ class PackageConfig:
         if not hasattr(self, "path"):
             self.path = self._path_from_module(package_module)
 
-        # Module containing models e.g. <module 'plain.staff.models'
-        # from 'staff/models.py'>. Set by import_models().
+        # Module containing models e.g. <module 'plain.admin.models'
+        # from 'admin/models.py'>. Set by import_models().
         # None if the application doesn't have a models module.
         self.models_module = None
 

{plain-0.21.3 → plain-0.21.5}/plain/packages/registry.py

@@ -242,7 +242,7 @@ class Packages:
         """
         Check whether an application with this name exists in the registry.
 
-        package_name is the full name of the app e.g. 'plain.staff'.
+        package_name is the full name of the app e.g. 'plain.admin'.
         """
         self.check_packages_ready()
         return any(ac.name == package_name for ac in self.package_configs.values())

{plain-0.21.3 → plain-0.21.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "plain"
-version = "0.21.3"
+version = "0.21.5"
 description = "A web framework for building products with Python."
 authors = [{name = "Dave Gaeddert", email = "dave.gaeddert@dropseed.dev"}]
 readme = "README.md"