omdev 0.0.0.dev35__py3-none-any.whl → 0.0.0.dev36__py3-none-any.whl

omdev/cli/main.py

@@ -1,12 +1,10 @@
 """
 TODO:
  - allow manually specifying manifest packages
- - omlish.bootstrap always
  - https://packaging.python.org/en/latest/guides/writing-pyproject-toml/#creating-executable-scripts
  - https://packaging.python.org/en/latest/specifications/entry-points/#entry-points
 """
 import argparse
-import functools
 import os
 import runpy
 import sys
@@ -32,27 +30,24 @@ def _main() -> None:
     for m in ldr.load(*pkgs, only=[CliModule]):
         cms.append(check.isinstance(m.value, CliModule))
 
-    parser = argparse.ArgumentParser()
-    subparsers = parser.add_subparsers()
-
-    def run(cm: CliModule) -> None:
-        sys.argv = [cm.cmd_name, *(args.args or ())]
-        runpy._run_module_as_main(cm.mod_name)  # type: ignore  # noqa
-
-    seen: set[str] = set()
+    dct: dict[str, CliModule] = {}
     for cm in cms:
-        if cm.cmd_name in seen:
+        if cm.cmd_name in dct:
             raise NameError(cm)
+        dct[cm.cmd_name] = cm
 
-        cmd_parser = subparsers.add_parser(cm.cmd_name)
-        cmd_parser.add_argument('args', nargs=argparse.REMAINDER)
-        cmd_parser.set_defaults(func=functools.partial(run, cm))
+    parser = argparse.ArgumentParser()
+    parser.add_argument('cmd', nargs='?', choices=dct.keys())
+    parser.add_argument('args', nargs=argparse.REMAINDER)
 
     args = parser.parse_args()
-    if not getattr(args, 'func', None):
+    if not args.cmd:
         parser.print_help()
-    else:
-        args.func()
+        return
+
+    cm = dct[args.cmd]
+    sys.argv = [cm.cmd_name, *(args.args or ())]
+    runpy._run_module_as_main(cm.mod_name)  # type: ignore  # noqa
 
 
 if __name__ == '__main__':

omdev/manifests/build.py

@@ -1,8 +1,9 @@
 """
 TODO:
  - separate build from cli
+ - parallelize & sort
 
-- See (entry_points):
+See (entry_points):
  - https://github.com/pytest-dev/pluggy/blob/main/src/pluggy/_manager.py#L405
  - https://docs.pytest.org/en/7.1.x/how-to/writing_plugins.html#setuptools-entry-points
  - https://packaging.python.org/en/latest/specifications/entry-points/

{omdev-0.0.0.dev35.dist-info → omdev-0.0.0.dev36.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev35
+Version: 0.0.0.dev36
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: ~=3.12
 License-File: LICENSE
-Requires-Dist: omlish ==0.0.0.dev35
+Requires-Dist: omlish ==0.0.0.dev36
 Provides-Extra: all
 Requires-Dist: pycparser ~=2.22 ; extra == 'all'
 Requires-Dist: cffi ~=1.17 ; extra == 'all'

{omdev-0.0.0.dev35.dist-info → omdev-0.0.0.dev36.dist-info}/RECORD

@@ -55,7 +55,7 @@ omdev/cexts/_distutils/compilers/options.py,sha256=H7r5IcLvga5Fs3jjXWIT-6ap3JBdu
 omdev/cexts/_distutils/compilers/unixccompiler.py,sha256=o1h8QuyupLntv4F21_XjzAZmCiwwxJuTmOirvBSL-Qw,15419
 omdev/cli/__init__.py,sha256=V_l6VP1SZMlJbO-8CJwSuO9TThOy2S_oaPepNYgIrbE,37
 omdev/cli/__main__.py,sha256=d23loR_cKfTYZwYiqpt_CmKI7dd5WcYFgIYzqMep75E,68
-omdev/cli/main.py,sha256=gqlxJyHNLohLi7DP9sicdbpxigHM0gPx8FHkmP0Ci_4,1584
+omdev/cli/main.py,sha256=0Wq2tlaRDelpSEUZDKwOginpBrdcE3hgWQqD6syaIvE,1413
 omdev/cli/types.py,sha256=rYM5jogfZqC3tpWLOHSDL6iaV3XWGWM1hJYd11I-ImA,107
 omdev/interp/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/interp/__main__.py,sha256=GMCqeGYltgt5dlJzHxY9gqisa8cRkrPfmZYuZnjg4WI,162
@@ -68,7 +68,7 @@ omdev/interp/standalone.py,sha256=XcltiL7ypcfV89C82_3knQ3Kx7aW4wnnxf2056ZXC3A,77
 omdev/interp/system.py,sha256=UFHfMR0CHCEnNx5fhrze8esAwigpRrJUA33ftq6nA0I,3514
 omdev/interp/types.py,sha256=2nM3MJaOU8O1XA8DrvwyOjBWSboBn16kgFIy5JVkDck,2440
 omdev/manifests/__init__.py,sha256=P2B0dpT8D7l5lJwRGPA92IcQj6oeXfd90X5-q9BJrKg,51
-omdev/manifests/build.py,sha256=m5PleX03pDxG4Pl2PtNKWsuZVxrNPBxPZ3Gkh6qlrEQ,9047
+omdev/manifests/build.py,sha256=_anZfhIAwUQo0J4BfKvDsvivrST2U5VigJaFKbJKXMQ,9067
 omdev/manifests/load.py,sha256=1QznPL4zNlu1eIFkoGrO78coIQCk9LlMC8FJ6PcvhNM,4373
 omdev/manifests/types.py,sha256=Jv6PAdVLPb9Hh4y6vDhPlWuMNBBViin1bC_u83jfsH4,234
 omdev/mypy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -106,9 +106,9 @@ omdev/tools/sqlrepl.py,sha256=tmFZh80-xsGM62dyQ7_UGLebChrj7IHbIPYBWDJMgVk,5741
 omdev/versioning/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/versioning/specifiers.py,sha256=6Odf9e6farwlPRsD_YqwTfYKG-BXn_dIcKtqfkhfodI,17432
 omdev/versioning/versions.py,sha256=ei2eopEsJq3zSMJmezK1nzZgikgCdxFtnF3f69nCRZQ,12246
-omdev-0.0.0.dev35.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev35.dist-info/METADATA,sha256=zipZ1FC8kOzhQo92ziMgGvv0fwRLsZEdkYh4ZaSa3Zk,1252
-omdev-0.0.0.dev35.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-omdev-0.0.0.dev35.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev35.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev35.dist-info/RECORD,,
+omdev-0.0.0.dev36.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev36.dist-info/METADATA,sha256=KAU82SqkiWBiTrxL3vGIYGpZUm1TsWeoMcJDA85tEG8,1252
+omdev-0.0.0.dev36.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+omdev-0.0.0.dev36.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev36.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev36.dist-info/RECORD,,