omdev 0.0.0.dev38__tar.gz → 0.0.0.dev40__tar.gz

{omdev-0.0.0.dev38/omdev.egg-info → omdev-0.0.0.dev40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev38
+Version: 0.0.0.dev40
 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.dev38
+Requires-Dist: omlish==0.0.0.dev40
 Provides-Extra: all
 Requires-Dist: pycparser~=2.22; extra == "all"
 Requires-Dist: cffi~=1.17; extra == "all"

{omdev-0.0.0.dev38 → omdev-0.0.0.dev40}/README.rst

@@ -11,3 +11,11 @@ Core packages installable from git via:
 
 Core packages have no required dependencies, but numerous optional ones - see their respective ``pyproject.toml`` files
 for details.
+
+The cli is installable through uvx or pipx via:
+
+.. code-block::
+
+  curl -LsSf https://raw.githubusercontent.com/wrmsr/omlish/master/omdev/cli/install.py | python3 -
+
+Additional deps to be injected may be appended to the command.

{omdev-0.0.0.dev38 → omdev-0.0.0.dev40}/omdev/.manifests.json

@@ -99,7 +99,7 @@
     "module": ".tools.piptools",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/piptools.py",
-    "line": 87,
+    "line": 88,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "pip",

{omdev-0.0.0.dev38 → omdev-0.0.0.dev40}/omdev/cli/install.py

@@ -46,7 +46,7 @@ class InstallMgr(abc.ABC):
         raise NotImplementedError
 
 
-class UvInstallMgr(InstallMgr):
+class UvxInstallMgr(InstallMgr):
     def is_available(self) -> bool:
         return bool(shutil.which('uv'))
 
@@ -110,7 +110,7 @@ class PipxInstallMgr(InstallMgr):
 
 
 INSTALL_MGRS = {
-    'uv': UvInstallMgr(),
+    'uvx': UvxInstallMgr(),
     'pipx': PipxInstallMgr(),
 }
 
@@ -132,18 +132,17 @@ def _main() -> None:
     if not (py := args.py):
         raise ValueError(f'Must specify py')
 
-    if not (mgr := args.mgr):
-        if shutil.which('uv'):
-            mgr = 'uv'
-        elif shutil.which('pipx'):
-            mgr = 'pipx'
+    if mgr := args.mgr:
+        if (im := INSTALL_MGRS.get(mgr)) is None:
+            raise ValueError(f'Unsupported mgr: {mgr}')
+        if not im.is_available():
+            raise ValueError(f'Unavailable mgr: {mgr}')
+    else:
+        for im in INSTALL_MGRS.values():
+            if im.is_available():
+                break
         else:
-            raise RuntimeError("Can't find package manager")
-
-    if (im := INSTALL_MGRS.get(mgr)) is None:
-        raise ValueError(f'Unsupported mgr: {mgr}')
-    if not im.is_available():
-        raise ValueError(f'Unavailable mgr: {mgr}')
+            raise RuntimeError("Can't find install manager")
 
     for m in INSTALL_MGRS.values():
         if m.is_available():

{omdev-0.0.0.dev38 → omdev-0.0.0.dev40}/omdev/cli/main.py

@@ -9,14 +9,39 @@ import os
 import runpy
 import sys
 
+from omlish import __about__
 from omlish import check
 
 from ..manifests.load import ManifestLoader
+from .types import CliCmd
+from .types import CliFunc
 from .types import CliModule
 
 
+##
+
+
+def _print_version() -> None:
+    print(__about__.__version__)
+
+
+def _print_revision() -> None:
+    print(__about__.__revision__)
+
+
+_CLI_FUNCS = [
+    CliFunc('version', _print_version),
+    CliFunc('revision', _print_revision),
+]
+
+
+##
+
+
 def _main() -> None:
-    cms: list[CliModule] = []
+    ccs: list[CliCmd] = []
+
+    #
 
     ldr = ManifestLoader.from_entry_point(globals())
 
@@ -28,13 +53,21 @@ def _main() -> None:
                 pkgs.append(n)
 
     for m in ldr.load(*pkgs, only=[CliModule]):
-        cms.append(check.isinstance(m.value, CliModule))
+        ccs.append(check.isinstance(m.value, CliModule))
+
+    #
+
+    ccs.extend(_CLI_FUNCS)
+
+    #
+
+    dct: dict[str, CliCmd] = {}
+    for cc in ccs:
+        if cc.cmd_name in dct:
+            raise NameError(cc)
+        dct[cc.cmd_name] = cc
 
-    dct: dict[str, CliModule] = {}
-    for cm in cms:
-        if cm.cmd_name in dct:
-            raise NameError(cm)
-        dct[cm.cmd_name] = cm
+    #
 
     parser = argparse.ArgumentParser()
     parser.add_argument('cmd', nargs='?', choices=dct.keys())
@@ -45,9 +78,19 @@ def _main() -> None:
         parser.print_help()
         return
 
-    cm = dct[args.cmd]
-    sys.argv = [cm.cmd_name, *(args.args or ())]
-    runpy._run_module_as_main(cm.mod_name)  # type: ignore  # noqa
+    #
+
+    cc = dct[args.cmd]
+
+    if isinstance(cc, CliModule):
+        sys.argv = [cc.cmd_name, *(args.args or ())]
+        runpy._run_module_as_main(cc.mod_name)  # type: ignore  # noqa
+
+    elif isinstance(cc, CliFunc):
+        cc.fn(*(args.args or ()))
+
+    else:
+        raise TypeError(cc)
 
 
 if __name__ == '__main__':

omdev-0.0.0.dev40/omdev/cli/types.py

@@ -0,0 +1,17 @@
+import dataclasses as dc
+import typing as ta
+
+
+@dc.dataclass(frozen=True)
+class CliCmd:
+    cmd_name: str
+
+
+@dc.dataclass(frozen=True)
+class CliModule(CliCmd):
+    mod_name: str
+
+
+@dc.dataclass(frozen=True)
+class CliFunc(CliCmd):
+    fn: ta.Callable

{omdev-0.0.0.dev38 → omdev-0.0.0.dev40}/omdev/tools/piptools.py

@@ -56,6 +56,7 @@ class Cli(ap.Cli):
         ap.arg('path', nargs='*'),
     )
     def list_root_dists(self) -> None:
+        # FIXME: track req extras - tuple[str, str] with ('pkg', '') as 'bare'?
         paths = self.args.path or sys.path
 
         dists: set[str] = set()

omdev-0.0.0.dev40/omdev/tools/proftools.py

@@ -0,0 +1,4 @@
+"""
+TODO:
+ - rm prof.pstats.pdf ; ./python -m gprof2dot -f pstats prof.pstats | dot -Tpdf -o prof.pstats.pdf && open prof.pstats.pdf
+"""  # noqa

{omdev-0.0.0.dev38 → omdev-0.0.0.dev40/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev38
+Version: 0.0.0.dev40
 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.dev38
+Requires-Dist: omlish==0.0.0.dev40
 Provides-Extra: all
 Requires-Dist: pycparser~=2.22; extra == "all"
 Requires-Dist: cffi~=1.17; extra == "all"

{omdev-0.0.0.dev38 → omdev-0.0.0.dev40}/omdev.egg-info/SOURCES.txt

@@ -117,5 +117,6 @@ omdev/tools/gittools.py
 omdev/tools/importscan.py
 omdev/tools/importtrace.py
 omdev/tools/piptools.py
+omdev/tools/proftools.py
 omdev/tools/rst.py
 omdev/tools/sqlrepl.py

{omdev-0.0.0.dev38 → omdev-0.0.0.dev40}/omdev.egg-info/requires.txt

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

{omdev-0.0.0.dev38 → omdev-0.0.0.dev40}/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.dev38'
+version = '0.0.0.dev40'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev38',
+    'omlish == 0.0.0.dev40',
 ]
 
 [project.optional-dependencies]

omdev-0.0.0.dev38/omdev/cli/types.py

@@ -1,7 +0,0 @@
-import dataclasses as dc
-
-
-@dc.dataclass(frozen=True)
-class CliModule:
-    cmd_name: str
-    mod_name: str