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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plain
-Version: 0.21.4
+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.4.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
@@ -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.4.dist-info/METADATA,sha256=vkgTcZHb7c8a8ks2-AjrBiYsRwKY-ZJ4K5gYUM8_Nfc,319
-plain-0.21.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-plain-0.21.4.dist-info/entry_points.txt,sha256=DHHprvufgd7xypiBiqMANYRnpJ9xPPYhYbnPGwOkWqE,40
-plain-0.21.4.dist-info/licenses/LICENSE,sha256=m0D5O7QoH9l5Vz_rrX_9r-C8d9UNr_ciK6Qwac7o6yo,3175
-plain-0.21.4.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,,