plain 0.21.3__py3-none-any.whl → 0.21.5__py3-none-any.whl

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/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/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.dist-info → plain-0.21.5.dist-info}/METADATA

@@ -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.dist-info → plain-0.21.5.dist-info}/RECORD

@@ -18,7 +18,7 @@ plain/cli/README.md,sha256=TvWCnNwb1rNthPzJglCRMKacN5H_RLeEjYBMe62Uz4M,2461
 plain/cli/__init__.py,sha256=9ByBOIdM8DebChjNz-RH2atdz4vWe8somlwNEsbhwh4,40
 plain/cli/cli.py,sha256=UNWIVnx2r2qn-eZejh2F_UA9C80HDNFysDd1rAWh2K4,14593
 plain/cli/formatting.py,sha256=1hZH13y1qwHcU2K2_Na388nw9uvoeQH8LrWL-O9h8Yc,2207
-plain/cli/packages.py,sha256=FqRJaizaxpQ8lSS4nYNjqIGpYGDbeTmCXCvkGxusGOM,2160
+plain/cli/packages.py,sha256=TiLirp0ccj5K96jOfp_pS18rOnk1aQS9ckiTi27aRwE,2740
 plain/cli/print.py,sha256=XraUYrgODOJquIiEv78wSCYGRBplHXtXSS9QtFG5hqY,217
 plain/cli/startup.py,sha256=3LIz9JrIZoF52Sa0j0SCypQwEaBDkhvuGaBdtiQLr5Q,680
 plain/csrf/README.md,sha256=RXMWMtHmzf30gVVNOfj0kD4xlSqFIPgJh-n7dIciaEM,163
@@ -61,8 +61,8 @@ plain/logs/loggers.py,sha256=iz9SYcwP9w5QAuwpULl48SFkVyJuuMoQ_fdLgdCHpNg,2121
 plain/logs/utils.py,sha256=9UzdCCQXJinGDs71Ngw297mlWkhgZStSd67ya4NOW98,1257
 plain/packages/README.md,sha256=Vq1Nw3mmEmZ2IriQavuVi4BjcQC2nb8k7YIbnm8QjIg,799
 plain/packages/__init__.py,sha256=DnHN1wwHXiXib4Y9BV__x9WrbUaTovoTIxW-tVyScTU,106
-plain/packages/config.py,sha256=-je13ViDkXMEQXCSi0G539dG5_HPoFBKaK7cBEd_NAY,11070
-plain/packages/registry.py,sha256=C1yv-JlzMs4HE-AYam_EdiTKNQwE8IN4qgt22PKxHDE,17920
+plain/packages/config.py,sha256=6j6Y9Uw4Lbye1M7LVgOhL4rAMkSSkleTzHQU9JRBW7k,11070
+plain/packages/registry.py,sha256=WlCGssmtjPss4KhDAyXyEkIUlKtzQcu17c45iqM2bbA,17920
 plain/preflight/README.md,sha256=-PKVd0RBMh4ROiMkegPS2PgvT1Kq9qqN1KfNkmUSdFc,177
 plain/preflight/__init__.py,sha256=H-TNRvaddPtOGmv4RXoc1fxDV1AOb7_K3u7ECF8mV58,607
 plain/preflight/files.py,sha256=wbHCNgps7o1c1zQNBd8FDCaVaqX90UwuvLgEQ_DbUpY,510
@@ -138,8 +138,8 @@ plain/views/forms.py,sha256=RhlaUcZCkeqokY_fvv-NOS-kgZAG4XhDLOPbf9K_Zlc,2691
 plain/views/objects.py,sha256=g5Lzno0Zsv0K449UpcCtxwCoO7WMRAWqKlxxV2V0_qg,8263
 plain/views/redirect.py,sha256=KLnlktzK6ZNMTlaEiZpMKQMEP5zeTgGLJ9BIkIJfwBo,1733
 plain/views/templates.py,sha256=nF9CcdhhjAyp3LB0RrSYnBaHpHzMfPSw719RCdcXk7o,2007
-plain-0.21.3.dist-info/METADATA,sha256=Xt4e1YhLUehsJ9MIYBDJ5RgR0vid8vtDopIxK-VjMZM,319
-plain-0.21.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-plain-0.21.3.dist-info/entry_points.txt,sha256=DHHprvufgd7xypiBiqMANYRnpJ9xPPYhYbnPGwOkWqE,40
-plain-0.21.3.dist-info/licenses/LICENSE,sha256=m0D5O7QoH9l5Vz_rrX_9r-C8d9UNr_ciK6Qwac7o6yo,3175
-plain-0.21.3.dist-info/RECORD,,
+plain-0.21.5.dist-info/METADATA,sha256=0oF_0zeaLk49ni4P08nQzXF_3biuj_9pLd2TO68BLeA,319
+plain-0.21.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+plain-0.21.5.dist-info/entry_points.txt,sha256=DHHprvufgd7xypiBiqMANYRnpJ9xPPYhYbnPGwOkWqE,40
+plain-0.21.5.dist-info/licenses/LICENSE,sha256=m0D5O7QoH9l5Vz_rrX_9r-C8d9UNr_ciK6Qwac7o6yo,3175
+plain-0.21.5.dist-info/RECORD,,