omdev 0.0.0.dev35__tar.gz → 0.0.0.dev36__tar.gz

{omdev-0.0.0.dev35/omdev.egg-info → omdev-0.0.0.dev36}/PKG-INFO

@@ -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 → omdev-0.0.0.dev36}/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-0.0.0.dev35 → omdev-0.0.0.dev36}/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 → omdev-0.0.0.dev36/omdev.egg-info}/PKG-INFO

@@ -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 → omdev-0.0.0.dev36}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev35
+omlish==0.0.0.dev36
 
 [all]
 pycparser~=2.22

{omdev-0.0.0.dev35 → omdev-0.0.0.dev36}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '~=3.12'
-version = '0.0.0.dev35'
+version = '0.0.0.dev36'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev35',
+    'omlish == 0.0.0.dev36',
 ]
 
 [project.optional-dependencies]