omdev 0.0.0.dev59__tar.gz → 0.0.0.dev60__tar.gz

{omdev-0.0.0.dev59/omdev.egg-info → omdev-0.0.0.dev60}/PKG-INFO

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

{omdev-0.0.0.dev59 → omdev-0.0.0.dev60}/omdev/.manifests.json

@@ -135,7 +135,7 @@
     "module": ".tools.gittools",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/gittools.py",
-    "line": 64,
+    "line": 74,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "git",

omdev-0.0.0.dev60/omdev/cli/__main__.py

@@ -0,0 +1,6 @@
+if __name__ == '__main__':
+    import sys
+
+    from .main import _main  # noqa
+
+    sys.exit(rc if isinstance(rc := _main(), int) else 0)

omdev-0.0.0.dev60/omdev/cli/main.py

@@ -0,0 +1,155 @@
+"""
+TODO:
+ - cache ldr.discover() somehow if in uvx/pipx - very slow
+  - <venv-root>/.omdev-cli-manifest-cache.json - {pkg_name: manifests_json}
+ - allow manually specifying manifest packages
+"""
+import argparse
+import os
+import runpy
+import sys
+import typing as ta
+
+from omlish import check
+
+from ..manifests.load import ManifestLoader
+from .types import CliCmd
+from .types import CliFunc
+from .types import CliModule
+
+
+##
+
+
+def _post_install(cli_pkg: str) -> None:
+    from .managers import setup_install_manager
+
+    setup_install_manager(cli_pkg)
+
+
+##
+
+
+_CLI_FUNCS: ta.Sequence[CliFunc] = [
+    CliFunc('_post_install', _post_install),
+]
+
+
+##
+
+
+def _build_arg_parser() -> argparse.ArgumentParser:
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--cli-pkg-root', action='append')
+    parser.add_argument('cmd', nargs='?')
+    parser.add_argument('args', nargs=argparse.REMAINDER)
+    return parser
+
+
+def _build_cmd_dct(args: ta.Any) -> ta.Mapping[str, CliCmd]:
+    ccs: list[CliCmd] = []
+
+    ldr = ManifestLoader.from_entry_point(globals())
+
+    pkgs: list[str] = []
+
+    def scan_pkg_root(r: str) -> None:
+        r = os.path.expanduser(r)
+        for n in os.listdir(r):
+            if os.path.isdir(p := os.path.join(r, n)) and os.path.exists(os.path.join(p, '__init__.py')):
+                pkgs.append(n)
+
+    if args.cli_pkg_root:
+        for r in args.cli_pkg_root:
+            scan_pkg_root(r)
+
+    else:
+        pkgs.extend(ldr.discover())
+
+        if not pkgs:
+            scan_pkg_root(os.getcwd())
+
+    for m in ldr.load(*pkgs, only=[CliModule]):
+        ccs.append(check.isinstance(m.value, CliModule))
+
+    ccs.extend(_CLI_FUNCS)
+
+    dct: dict[str, CliCmd] = {}
+    for cc in ccs:
+        for cn in [cc.cmd_name] if isinstance(cc.cmd_name, str) else cc.cmd_name:
+            if cn in dct:
+                raise NameError(cc)
+            dct[cn] = cc
+
+    return dct
+
+
+def _select_cmd(args: ta.Any, cmds: ta.Mapping[str, CliCmd]) -> CliCmd | int:
+    cmd = args.cmd
+    if cmd and cmd in cmds:
+        return cmds[cmd]
+
+    def print_err(*args, **kwargs):  # noqa
+        print(*args, **kwargs, file=sys.stderr)
+
+    if cmd:
+        print_err(f'Invalid command: {cmd}\n')
+        rc = 1
+    else:
+        rc = 0
+
+    mset = set()
+    mdct: dict = {}
+    for cc in cmds.values():
+        if id(cc) in mset:
+            continue
+        mset.add(id(cc))
+        if isinstance(cc.cmd_name, str) and cc.cmd_name[0] == '_':
+            continue
+        if isinstance(cc, CliFunc):
+            mdct.setdefault('-', []).append(cc)
+        elif isinstance(cc, CliModule):
+            mdct.setdefault(cc.mod_name.partition('.')[0], []).append(cc)
+        else:
+            raise TypeError(cc)
+
+    print_err('Subcommands:\n')
+    for m, l in sorted(mdct.items(), key=lambda t: (t[0] == '-', t[0])):
+        print_err(f'  {m}')
+        for cc in sorted(l, key=lambda c: c.primary_name):
+            if isinstance(cc.cmd_name, str):
+                print_err(f'    {cc.cmd_name}')
+            else:
+                print_err(
+                    f'    {cc.cmd_name[0]}'
+                    f'{(" (" + ", ".join(cc.cmd_name[1:]) + ")") if len(cc.cmd_name) > 1 else ""}',
+                )
+        print_err()
+
+    return rc
+
+
+def _main() -> ta.Any:
+    parser = _build_arg_parser()
+    args = parser.parse_args()
+    cmds = _build_cmd_dct(args)
+    sel = _select_cmd(args, cmds)
+
+    match sel:
+        case int():
+            return sel
+
+        case CliModule() as cm:
+            sys.argv = [args.cmd, *(args.args or ())]
+            runpy._run_module_as_main(cm.mod_name)  # type: ignore  # noqa
+            return 0
+
+        case CliFunc() as cf:
+            return cf.fn(*(args.args or ()))
+
+        case _:
+            raise TypeError(sel)
+
+
+if __name__ == '__main__':
+    sys.exit(rc if isinstance(rc := _main(), int) else 0)

{omdev-0.0.0.dev59 → omdev-0.0.0.dev60}/omdev/tools/gittools.py

@@ -1,6 +1,7 @@
 import os
 import re
 import subprocess
+import urllib.parse
 
 from omlish import argparse as ap
 from omlish import logs
@@ -36,29 +37,38 @@ class Cli(ap.Cli):
         accepts_unknown=True,
     )
     def clone(self) -> None:
-        if not (m := self._GITHUB_PAT.fullmatch(self.args.repo)):
+        out_dir: str
+
+        if (m := self._GITHUB_PAT.fullmatch(self.args.repo)):
+            user = m.group('user')
+            repo = m.group('repo')
+
+            os.makedirs(user, 0o755, exist_ok=True)
+
             subprocess.check_call([
                 'git',
                 'clone',
                 *self.unknown_args,
                 *self.args.args,
-                self.args.repo,
+                f'https://github.com/{user}/{repo}.git',
+                os.path.join(user, repo),
             ])
-            return
 
-        user = m.group('user')
-        repo = m.group('repo')
+            out_dir = os.path.join(user, repo)
+
+        else:
+            parsed = urllib.parse.urlparse(self.args.repo)
+            out_dir = parsed.path.split('/')[-1]
 
-        os.makedirs(user, 0o755, exist_ok=True)
+            subprocess.check_call([
+                'git',
+                'clone',
+                *self.unknown_args,
+                *self.args.args,
+                self.args.repo,
+            ])
 
-        subprocess.check_call([
-            'git',
-            'clone',
-            *self.unknown_args,
-            *self.args.args,
-            f'https://github.com/{user}/{repo}.git',
-            os.path.join(user, repo),
-        ])
+        print(out_dir)
 
 
 # @omlish-manifest

{omdev-0.0.0.dev59 → omdev-0.0.0.dev60/omdev.egg-info}/PKG-INFO

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

{omdev-0.0.0.dev59 → omdev-0.0.0.dev60}/omdev.egg-info/requires.txt

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

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

omdev-0.0.0.dev59/omdev/cli/__main__.py

@@ -1,4 +0,0 @@
-if __name__ == '__main__':
-    from .main import _main  # noqa
-
-    _main()

omdev-0.0.0.dev59/omdev/cli/main.py

@@ -1,121 +0,0 @@
-"""
-TODO:
- - cache ldr.discover() somehow if in uvx/pipx - very slow
-  - <venv-root>/.omdev-cli-manifest-cache.json - {pkg_name: manifests_json}
- - allow manually specifying manifest packages
-"""
-import argparse
-import os
-import runpy
-import sys
-import typing as ta
-
-from omlish import check
-
-from ..manifests.load import ManifestLoader
-from .types import CliCmd
-from .types import CliFunc
-from .types import CliModule
-
-
-##
-
-
-def _post_install(cli_pkg: str) -> None:
-    from .managers import setup_install_manager
-
-    setup_install_manager(cli_pkg)
-
-
-##
-
-
-_CLI_FUNCS: ta.Sequence[CliFunc] = [
-    CliFunc('_post_install', _post_install),
-]
-
-
-##
-
-
-def _main() -> None:
-    ccs: list[CliCmd] = []
-
-    #
-
-    ldr = ManifestLoader.from_entry_point(globals())
-
-    pkgs = ldr.discover()
-
-    if not pkgs:
-        pkgs = []
-        for n in os.listdir(os.getcwd()):
-            if os.path.isdir(n) and os.path.exists(os.path.join(n, '__init__.py')):
-                pkgs.append(n)
-
-    for m in ldr.load(*pkgs, only=[CliModule]):
-        ccs.append(check.isinstance(m.value, CliModule))
-
-    #
-
-    ccs.extend(_CLI_FUNCS)
-
-    #
-
-    dct: dict[str, CliCmd] = {}
-    for cc in ccs:
-        for cn in [cc.cmd_name] if isinstance(cc.cmd_name, str) else cc.cmd_name:
-            if cn in dct:
-                raise NameError(cc)
-            dct[cn] = cc
-
-    #
-
-    parser = argparse.ArgumentParser()
-    parser.add_argument('cmd', nargs='?', choices=dct.keys())
-    parser.add_argument('args', nargs=argparse.REMAINDER)
-
-    args = parser.parse_args()
-    if not args.cmd:
-        mdct: dict = {}
-        for cc in ccs:
-            if isinstance(cc.cmd_name, str) and cc.cmd_name[0] == '_':
-                continue
-            if isinstance(cc, CliFunc):
-                mdct.setdefault('-', []).append(cc)
-            elif isinstance(cc, CliModule):
-                mdct.setdefault(cc.mod_name.partition('.')[0], []).append(cc)
-            else:
-                raise TypeError(cc)
-
-        print('Subcommands:\n')
-        for m, l in sorted(mdct.items(), key=lambda t: (t[0] == '-', t[0])):
-            print(f'  {m}')
-            for cc in sorted(l, key=lambda c: c.primary_name):
-                if isinstance(cc.cmd_name, str):
-                    print(f'    {cc.cmd_name}')
-                else:
-                    print(
-                        f'    {cc.cmd_name[0]}'
-                        f'{(" (" + ", ".join(cc.cmd_name[1:]) + ")") if len(cc.cmd_name) > 1 else ""}',
-                    )
-            print()
-        return
-
-    #
-
-    cc = dct[args.cmd]
-
-    if isinstance(cc, CliModule):
-        sys.argv = [args.cmd, *(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__':
-    _main()