omdev 0.0.0.dev59__py3-none-any.whl → 0.0.0.dev61__py3-none-any.whl

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/cli/__main__.py

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

omdev/cli/main.py

@@ -38,30 +38,42 @@ _CLI_FUNCS: ta.Sequence[CliFunc] = [
 ##
 
 
-def _main() -> None:
-    ccs: list[CliCmd] = []
+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 = ldr.discover()
+    pkgs: list[str] = []
 
-    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')):
+    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:
@@ -69,53 +81,75 @@ def _main() -> None:
                 raise NameError(cc)
             dct[cn] = cc
 
-    #
+    return dct
 
-    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)
+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:
-                raise TypeError(cc)
+                print_err(
+                    f'    {cc.cmd_name[0]}'
+                    f'{(" (" + ", ".join(cc.cmd_name[1:]) + ")") if len(cc.cmd_name) > 1 else ""}',
+                )
+        print_err()
 
-        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
+    return rc
 
-    #
 
-    cc = dct[args.cmd]
+def _main() -> ta.Any:
+    parser = _build_arg_parser()
+    args = parser.parse_args()
+    cmds = _build_cmd_dct(args)
+    sel = _select_cmd(args, cmds)
 
-    if isinstance(cc, CliModule):
-        sys.argv = [args.cmd, *(args.args or ())]
-        runpy._run_module_as_main(cc.mod_name)  # type: ignore  # noqa
+    match sel:
+        case int():
+            return sel
 
-    elif isinstance(cc, CliFunc):
-        cc.fn(*(args.args or ()))
+        case CliModule() as cm:
+            sys.argv = [args.cmd, *(args.args or ())]
+            runpy._run_module_as_main(cm.mod_name)  # type: ignore  # noqa
+            return 0
 
-    else:
-        raise TypeError(cc)
+        case CliFunc() as cf:
+            return cf.fn(*(args.args or ()))
+
+        case _:
+            raise TypeError(sel)
 
 
 if __name__ == '__main__':
-    _main()
+    sys.exit(rc if isinstance(rc := _main(), int) else 0)

omdev/secrets.py

@@ -5,12 +5,12 @@ import yaml
 from omlish import secrets as sec
 
 
-SECRETS_PATH = os.getenv('SECRETS_PATH', os.path.expanduser('~/Dropbox/.dotfiles/secrets.yml'))
+SECRETS_FILE = os.getenv('SECRETS_FILE', '~/Dropbox/.dotfiles/secrets.yml')
 
 
 def load_secrets() -> sec.Secrets:
     dct: dict[str, sec.Secret] = {}
-    with open(SECRETS_PATH) as f:
+    with open(os.path.expanduser(SECRETS_FILE)) as f:
         for k, v in yaml.safe_load(f).items():
             if isinstance(v, str):
                 dct[k] = sec.Secret(key=k, value=v)

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.dist-info → omdev-0.0.0.dev61.dist-info}/METADATA

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

{omdev-0.0.0.dev59.dist-info → omdev-0.0.0.dev61.dist-info}/RECORD

@@ -1,4 +1,4 @@
-omdev/.manifests.json,sha256=YBFCesfwODi9Z0xRfCtGjZoJwWpZm5XEsn7g_ieSqy0,4476
+omdev/.manifests.json,sha256=cFtziwWnzyiOPhVOkivx6peBOopFr4Umfqz1NTK9M_Y,4476
 omdev/__about__.py,sha256=LqSNNFFcT84xW3W8fIOJ78kPYJKFLIXZyDX-AJREvN0,1005
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/bracepy.py,sha256=HwBK5XmlOsF_juTel25fRLJK9vHSJCWXuCc-OZlevRQ,2619
@@ -8,7 +8,7 @@ omdev/findimports.py,sha256=P8v4I1tm6g-PEWJiNwAKxErvWwL-Nop83vAuwq1kR5A,2246
 omdev/findmagic.py,sha256=DhBYHHP_dzwM5pIh21xnQPnkZ2YmAXCjithsr7X0ScU,2357
 omdev/git.py,sha256=riM2KqSpQPC3N89uipd7Vm3kVgv4EYYDBU9tV1Z8juM,2208
 omdev/revisions.py,sha256=U657hf4zeEN32y3g4CzqCAodx_HlfkHj2cIIKALNFDo,5009
-omdev/secrets.py,sha256=Or0Dw-D1FY1uaZulcTWLmHCGI9bs8UWbyaPIJSSstQ4,437
+omdev/secrets.py,sha256=MBCTWMxZbKS3FmvUYT9I3Yd_TfIBx5qXIJHprrNKKyo,437
 omdev/tokens.py,sha256=GusxQ1Cd_eiScuR8XTTtc9QFhOgYviYGBZmFnn3Hj7s,756
 omdev/wheelfile.py,sha256=yfupGcGkbFlmzGzKU64k_vmOKpaKnUlDWxeGn2KdekU,10005
 omdev/amalg/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -58,10 +58,10 @@ omdev/cexts/_distutils/compilers/ccompiler.py,sha256=cTs88qrvj0hBVXHfemSDE_du_nE
 omdev/cexts/_distutils/compilers/options.py,sha256=H7r5IcLvga5Fs3jjXWIT-6ap3JBduXRKgtpDmSGCZxs,3818
 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=5IeIERm-371fSI5ZvPv8eldAJBwgKwpR0R49pTsILNM,76
+omdev/cli/__main__.py,sha256=mOJpgc07o0r5luQ1DlX4tk2PqZkgmbwPbdzJ3KmtjgQ,138
 omdev/cli/clicli.py,sha256=rQ9-F9XI3BevnfIVALHVKrrHNQPdYhkQ-IKESTNB5RA,2447
 omdev/cli/install.py,sha256=C-W171YlIHt4Cfok-nWSMbHwWhqF_PFqq2HixFttYx8,4460
-omdev/cli/main.py,sha256=sTlrox_s-3zM5zbbZhQ_V_TOy42NiPBR_gLZQiUH4co,2870
+omdev/cli/main.py,sha256=oCwKlTiEWIvFT5O1_1R3XxldjFabWI_kEyeRUWJJNiI,3856
 omdev/cli/managers.py,sha256=zqhMgNnv2VbXoTP6SgZeSuWfAVo1Ge-HJnQ1ftL-Mq8,2590
 omdev/cli/types.py,sha256=bqKw9SbtBtAip2vF9v4khh0CqKG6LBr6n9VzWBz7AJE,474
 omdev/interp/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
@@ -111,7 +111,7 @@ omdev/toml/parser.py,sha256=84bn09uhYHwQGyfww6Rw6y1RxPAE_HDltODOSakcqDM,29186
 omdev/toml/writer.py,sha256=lk3on3YXVbWuLJa-xsOzOhs1bBAT1vXqw4mBbluZl_w,3040
 omdev/tools/__init__.py,sha256=iVJAOQ0viGTQOm0DLX4uZLro-9jOioYJGLg9s0kDx1A,78
 omdev/tools/dockertools.py,sha256=x00GV8j1KReMXwxJ641GlcsVwHoWeuzdIKVBp36BqwU,5298
-omdev/tools/gittools.py,sha256=i2WFM2pX5riDJBchFXMmegOCuLSjvTkKC1ltqShSo7E,1773
+omdev/tools/gittools.py,sha256=SMuKeonZP16lYBecmKB7sn_VZ-ljQnJJF6TGX0isVwA,2031
 omdev/tools/importscan.py,sha256=vxOMdAABShqt5-G3n6DGHopCZ5uGgciThY0MCa5W0mA,4066
 omdev/tools/mkrelimp.py,sha256=fwt4GWzenuLNVtzdK2uaJJTSuJbUVJZquF5adwAwlPg,4051
 omdev/tools/nbtools.py,sha256=JZcgTMX3IP-nAtk2QAVU_PXlF4FFNxRDebB8zQX_RQ0,1260
@@ -119,9 +119,9 @@ omdev/tools/piptools.py,sha256=-jR5q3w4sHqntxCLExFCBNIARB788FUsAbJ62PK2sBU,2774
 omdev/tools/proftools.py,sha256=xKSm_yPoCnfsvS3iT9MblDqFMuZmGfI3_koGj8amMyU,145
 omdev/tools/rst.py,sha256=6dWk8QZHoGiLSuBw3TKsXZjjFK6wWBEtPi9krdCLKKg,977
 omdev/tools/sqlrepl.py,sha256=tmFZh80-xsGM62dyQ7_UGLebChrj7IHbIPYBWDJMgVk,5741
-omdev-0.0.0.dev59.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev59.dist-info/METADATA,sha256=DwUCqPNW2EXhsYnskKg_oppQTYWF_XQnnJpzjA2eJzg,1252
-omdev-0.0.0.dev59.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-omdev-0.0.0.dev59.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev59.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev59.dist-info/RECORD,,
+omdev-0.0.0.dev61.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev61.dist-info/METADATA,sha256=M-ND1diCFqD5wMkvo8x_etYENZI5gtH2UJC2RF8C7iY,1252
+omdev-0.0.0.dev61.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+omdev-0.0.0.dev61.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev61.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev61.dist-info/RECORD,,