omdev 0.0.0.dev179__py3-none-any.whl → 0.0.0.dev180__py3-none-any.whl

omdev/.manifests.json

@@ -96,14 +96,14 @@
     }
   },
   {
-    "module": ".magic.find",
+    "module": ".magic.__main__",
     "attr": "_CLI_MODULE",
-    "file": "omdev/magic/find.py",
-    "line": 230,
+    "file": "omdev/magic/__main__.py",
+    "line": 4,
     "value": {
       "$.cli.types.CliModule": {
-        "cmd_name": "py/findmagic",
-        "mod_name": "omdev.magic.find"
+        "cmd_name": "magic",
+        "mod_name": "omdev.magic.__main__"
       }
     }
   },

omdev/cli/clicli.py

@@ -21,15 +21,15 @@ class CliCli(ap.Cli):
 
     #
 
-    @ap.command(name='version', aliases=['ver'])
+    @ap.cmd(name='version', aliases=['ver'])
     def print_version(self) -> None:
         print(__about__.__version__)
 
-    @ap.command(name='revision', aliases=['rev'])
+    @ap.cmd(name='revision', aliases=['rev'])
     def print_revision(self) -> None:
         print(__about__.__revision__)
 
-    @ap.command(name='home')
+    @ap.cmd(name='home')
     def print_home(self) -> None:
         print(sys.prefix)
 
@@ -52,7 +52,7 @@ class CliCli(ap.Cli):
             ],
         )
 
-    @ap.command(
+    @ap.cmd(
         ap.arg('args', nargs=ap.REMAINDER),
         name='python',
         accepts_unknown=True,
@@ -60,7 +60,7 @@ class CliCli(ap.Cli):
     def python_cmd(self) -> None:
         self._passthrough_args_cmd(sys.executable)
 
-    @ap.command(
+    @ap.cmd(
         ap.arg('args', nargs=ap.REMAINDER),
         name='pip',
         accepts_unknown=True,
@@ -70,7 +70,7 @@ class CliCli(ap.Cli):
 
     #
 
-    @ap.command(
+    @ap.cmd(
         ap.arg('--url', default=DEFAULT_REINSTALL_URL),
         ap.arg('--local', action='store_true'),
         ap.arg('extra_deps', nargs='*'),

omdev/imgur.py

@@ -107,7 +107,7 @@ def _main() -> None:
     from omlish.argparse import all as ap
 
     class Cli(ap.Cli):
-        @ap.command(
+        @ap.cmd(
             ap.arg('file'),
         )
         def upload(self) -> None:

omdev/interp/cli.py

@@ -12,7 +12,7 @@ import typing as ta
 
 from omlish.argparse.cli import ArgparseCli
 from omlish.argparse.cli import argparse_arg
-from omlish.argparse.cli import argparse_command
+from omlish.argparse.cli import argparse_cmd
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
 from omlish.lite.inject import Injector
@@ -37,7 +37,7 @@ class InterpCli(ArgparseCli):
 
     #
 
-    @argparse_command(
+    @argparse_cmd(
         argparse_arg('version'),
         argparse_arg('-d', '--debug', action='store_true'),
     )
@@ -46,7 +46,7 @@ class InterpCli(ArgparseCli):
         s = InterpSpecifier.parse(self.args.version)
         await r.list(s)
 
-    @argparse_command(
+    @argparse_cmd(
         argparse_arg('version'),
         argparse_arg('-p', '--provider'),
         argparse_arg('-d', '--debug', action='store_true'),

omdev/magic/__main__.py

@@ -0,0 +1,11 @@
+from ..cli import CliModule
+
+
+# @omlish-manifest
+_CLI_MODULE = CliModule('magic', __name__)
+
+
+if __name__ == '__main__':
+    from .cli import _main
+
+    _main()

omdev/magic/cli.py

@@ -0,0 +1,54 @@
+# ruff: noqa: UP006 UP007
+import typing as ta
+
+from omlish.argparse.cli import ArgparseCli
+from omlish.argparse.cli import argparse_arg
+from omlish.argparse.cli import argparse_cmd
+
+from .find import find_magic_files
+from .find import find_magic_py_modules
+from .styles import C_MAGIC_STYLE
+from .styles import PY_MAGIC_STYLE
+
+
+##
+
+
+class MagicCli(ArgparseCli):
+    @argparse_cmd(
+        argparse_arg('--style', '-s', default='py'),
+        argparse_arg('--key', '-k', dest='keys', action='append'),
+        argparse_arg('--modules', action='store_true'),
+        argparse_arg('roots', nargs='*'),
+    )
+    def find(self) -> None:
+        style = {
+            'py': PY_MAGIC_STYLE,
+            'c': C_MAGIC_STYLE,
+        }[self.args.style]
+
+        kw: dict = dict(
+            roots=self.args.roots,
+            style=style,
+            keys=self.args.keys,
+        )
+
+        fn: ta.Callable
+        if self.args.modules:
+            fn = find_magic_py_modules
+        else:
+            fn = find_magic_files
+
+        for out in fn(**kw):
+            print(out)
+
+
+##
+
+
+def _main(argv=None) -> None:
+    MagicCli(argv).cli_run_and_exit()
+
+
+if __name__ == '__main__':
+    _main()

omdev/magic/find.py

@@ -7,7 +7,6 @@ import typing as ta
 from .magic import Magic
 from .prepare import MagicPrepareError
 from .prepare import py_compile_magic_preparer
-from .styles import C_MAGIC_STYLE
 from .styles import PY_MAGIC_STYLE
 from .styles import MagicStyle
 
@@ -222,47 +221,3 @@ def find_magic_py_modules(
             yield fp[:-3].replace(os.sep, '.')
         else:
             yield fp
-
-
-##
-
-
-# @omlish-manifest
-_CLI_MODULE = {'$omdev.cli.types.CliModule': {
-    'cmd_name': 'py/findmagic',
-    'mod_name': __name__,
-}}
-
-
-if __name__ == '__main__':
-    def _main(argv=None) -> None:
-        import argparse
-
-        arg_parser = argparse.ArgumentParser()
-        arg_parser.add_argument('--style', '-s', default='py')
-        arg_parser.add_argument('--key', '-k', dest='keys', action='append')
-        arg_parser.add_argument('--modules', action='store_true')
-        arg_parser.add_argument('roots', nargs='*')
-        args = arg_parser.parse_args(argv)
-
-        style = {
-            'py': PY_MAGIC_STYLE,
-            'c': C_MAGIC_STYLE,
-        }[args.style]
-
-        kw: dict = dict(
-            roots=args.roots,
-            style=style,
-            keys=args.keys,
-        )
-
-        fn: ta.Callable
-        if args.modules:
-            fn = find_magic_py_modules
-        else:
-            fn = find_magic_files
-
-        for out in fn(**kw):
-            print(out)
-
-    _main()

omdev/pycharm/cli.py

@@ -77,11 +77,11 @@ def parse_wmctrl_lxp_line(l: str) -> WmctrlLine:
 
 
 class Cli(ap.Cli):
-    @ap.command()
+    @ap.cmd()
     def version(self) -> None:
         print(get_pycharm_version())
 
-    @ap.command(
+    @ap.cmd(
         ap.arg('python-exe'),
         ap.arg('args', nargs=ap.REMAINDER),
     )
@@ -99,7 +99,7 @@ class Cli(ap.Cli):
         proc = subprocess.run([exe, src_file, *self.args.args], check=False)
         return proc.returncode
 
-    @ap.command(
+    @ap.cmd(
         ap.arg('dir', nargs='?'),
         ap.arg('--clion', action='store_true'),
     )

omdev/pyproject/cli.py

@@ -35,7 +35,7 @@ import typing as ta
 
 from omlish.argparse.cli import ArgparseCli
 from omlish.argparse.cli import argparse_arg
-from omlish.argparse.cli import argparse_command
+from omlish.argparse.cli import argparse_cmd
 from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
@@ -141,7 +141,7 @@ class Run:
 class PyprojectCli(ArgparseCli):
     _docker_container = argparse_arg('--_docker_container', help=argparse.SUPPRESS)
 
-    @argparse_command(
+    @argparse_cmd(
         argparse_arg('name'),
         argparse_arg('-e', '--docker-env', action='append'),
         argparse_arg('cmd', nargs='?'),
@@ -223,7 +223,7 @@ class PyprojectCli(ArgparseCli):
         else:
             raise Exception(f'unknown subcommand: {cmd}')
 
-    @argparse_command(
+    @argparse_cmd(
         argparse_arg('-b', '--build', action='store_true'),
         argparse_arg('-r', '--revision', action='store_true'),
         argparse_arg('-j', '--jobs', type=int),

omdev/scripts/interp.py

@@ -78,7 +78,7 @@ UnparsedVersionVar = ta.TypeVar('UnparsedVersionVar', bound=UnparsedVersion)
 CallableVersionOperator = ta.Callable[['Version', str], bool]
 
 # ../../omlish/argparse/cli.py
-ArgparseCommandFn = ta.Callable[[], ta.Optional[int]]  # ta.TypeAlias
+ArgparseCmdFn = ta.Callable[[], ta.Optional[int]]  # ta.TypeAlias
 
 # ../../omlish/lite/inject.py
 U = ta.TypeVar('U')
@@ -1953,15 +1953,15 @@ def argparse_arg(*args, **kwargs) -> ArgparseArg:
 
 
 @dc.dataclass(eq=False)
-class ArgparseCommand:
+class ArgparseCmd:
     name: str
-    fn: ArgparseCommandFn
+    fn: ArgparseCmdFn
     args: ta.Sequence[ArgparseArg] = ()  # noqa
 
     # _: dc.KW_ONLY
 
     aliases: ta.Optional[ta.Sequence[str]] = None
-    parent: ta.Optional['ArgparseCommand'] = None
+    parent: ta.Optional['ArgparseCmd'] = None
     accepts_unknown: bool = False
 
     def __post_init__(self) -> None:
@@ -1976,7 +1976,7 @@ class ArgparseCommand:
 
         check.arg(callable(self.fn))
         check.arg(all(isinstance(a, ArgparseArg) for a in self.args))
-        check.isinstance(self.parent, (ArgparseCommand, type(None)))
+        check.isinstance(self.parent, (ArgparseCmd, type(None)))
         check.isinstance(self.accepts_unknown, bool)
 
         functools.update_wrapper(self, self.fn)
@@ -1990,21 +1990,21 @@ class ArgparseCommand:
         return self.fn(*args, **kwargs)
 
 
-def argparse_command(
+def argparse_cmd(
         *args: ArgparseArg,
         name: ta.Optional[str] = None,
         aliases: ta.Optional[ta.Iterable[str]] = None,
-        parent: ta.Optional[ArgparseCommand] = None,
+        parent: ta.Optional[ArgparseCmd] = None,
         accepts_unknown: bool = False,
-) -> ta.Any:  # ta.Callable[[ArgparseCommandFn], ArgparseCommand]:  # FIXME
+) -> ta.Any:  # ta.Callable[[ArgparseCmdFn], ArgparseCmd]:  # FIXME
     for arg in args:
         check.isinstance(arg, ArgparseArg)
     check.isinstance(name, (str, type(None)))
-    check.isinstance(parent, (ArgparseCommand, type(None)))
+    check.isinstance(parent, (ArgparseCmd, type(None)))
     check.not_isinstance(aliases, str)
 
     def inner(fn):
-        return ArgparseCommand(
+        return ArgparseCmd(
             (name if name is not None else fn.__name__).replace('_', '-'),
             fn,
             args,
@@ -2059,7 +2059,7 @@ class ArgparseCli:
         for bns in [bcls.__dict__ for bcls in reversed(mro)] + [ns]:
             bseen = set()  # type: ignore
             for k, v in bns.items():
-                if isinstance(v, (ArgparseCommand, ArgparseArg)):
+                if isinstance(v, (ArgparseCmd, ArgparseArg)):
                     check.not_in(v, bseen)
                     bseen.add(v)
                     objs[k] = v
@@ -2086,7 +2086,7 @@ class ArgparseCli:
         subparsers = parser.add_subparsers()
 
         for att, obj in objs.items():
-            if isinstance(obj, ArgparseCommand):
+            if isinstance(obj, ArgparseCmd):
                 if obj.parent is not None:
                     raise NotImplementedError
 
@@ -2148,7 +2148,7 @@ class ArgparseCli:
 
     #
 
-    def _bind_cli_cmd(self, cmd: ArgparseCommand) -> ta.Callable:
+    def _bind_cli_cmd(self, cmd: ArgparseCmd) -> ta.Callable:
         return cmd.__get__(self, type(self))
 
     def prepare_cli_run(self) -> ta.Optional[ta.Callable]:
@@ -5034,7 +5034,7 @@ class InterpCli(ArgparseCli):
 
     #
 
-    @argparse_command(
+    @argparse_cmd(
         argparse_arg('version'),
         argparse_arg('-d', '--debug', action='store_true'),
     )
@@ -5043,7 +5043,7 @@ class InterpCli(ArgparseCli):
         s = InterpSpecifier.parse(self.args.version)
         await r.list(s)
 
-    @argparse_command(
+    @argparse_cmd(
         argparse_arg('version'),
         argparse_arg('-p', '--provider'),
         argparse_arg('-d', '--debug', action='store_true'),

omdev/scripts/pyproject.py

@@ -114,7 +114,7 @@ UnparsedVersionVar = ta.TypeVar('UnparsedVersionVar', bound=UnparsedVersion)
 CallableVersionOperator = ta.Callable[['Version', str], bool]
 
 # ../../omlish/argparse/cli.py
-ArgparseCommandFn = ta.Callable[[], ta.Optional[int]]  # ta.TypeAlias
+ArgparseCmdFn = ta.Callable[[], ta.Optional[int]]  # ta.TypeAlias
 
 # ../../omlish/lite/inject.py
 U = ta.TypeVar('U')
@@ -2910,16 +2910,6 @@ def find_magic_py_modules(
             yield fp
 
 
-##
-
-
-# # @omlish-manifest
-# _CLI_MODULE = {'$omdev.cli.types.CliModule': {
-#     'cmd_name': 'py/findmagic',
-#     'mod_name': __name__,
-# }}
-
-
 ########################################
 # ../../packaging/specifiers.py
 # Copyright (c) Donald Stufft and individual contributors.
@@ -3553,15 +3543,15 @@ def argparse_arg(*args, **kwargs) -> ArgparseArg:
 
 
 @dc.dataclass(eq=False)
-class ArgparseCommand:
+class ArgparseCmd:
     name: str
-    fn: ArgparseCommandFn
+    fn: ArgparseCmdFn
     args: ta.Sequence[ArgparseArg] = ()  # noqa
 
     # _: dc.KW_ONLY
 
     aliases: ta.Optional[ta.Sequence[str]] = None
-    parent: ta.Optional['ArgparseCommand'] = None
+    parent: ta.Optional['ArgparseCmd'] = None
     accepts_unknown: bool = False
 
     def __post_init__(self) -> None:
@@ -3576,7 +3566,7 @@ class ArgparseCommand:
 
         check.arg(callable(self.fn))
         check.arg(all(isinstance(a, ArgparseArg) for a in self.args))
-        check.isinstance(self.parent, (ArgparseCommand, type(None)))
+        check.isinstance(self.parent, (ArgparseCmd, type(None)))
         check.isinstance(self.accepts_unknown, bool)
 
         functools.update_wrapper(self, self.fn)
@@ -3590,21 +3580,21 @@ class ArgparseCommand:
         return self.fn(*args, **kwargs)
 
 
-def argparse_command(
+def argparse_cmd(
         *args: ArgparseArg,
         name: ta.Optional[str] = None,
         aliases: ta.Optional[ta.Iterable[str]] = None,
-        parent: ta.Optional[ArgparseCommand] = None,
+        parent: ta.Optional[ArgparseCmd] = None,
         accepts_unknown: bool = False,
-) -> ta.Any:  # ta.Callable[[ArgparseCommandFn], ArgparseCommand]:  # FIXME
+) -> ta.Any:  # ta.Callable[[ArgparseCmdFn], ArgparseCmd]:  # FIXME
     for arg in args:
         check.isinstance(arg, ArgparseArg)
     check.isinstance(name, (str, type(None)))
-    check.isinstance(parent, (ArgparseCommand, type(None)))
+    check.isinstance(parent, (ArgparseCmd, type(None)))
     check.not_isinstance(aliases, str)
 
     def inner(fn):
-        return ArgparseCommand(
+        return ArgparseCmd(
             (name if name is not None else fn.__name__).replace('_', '-'),
             fn,
             args,
@@ -3659,7 +3649,7 @@ class ArgparseCli:
         for bns in [bcls.__dict__ for bcls in reversed(mro)] + [ns]:
             bseen = set()  # type: ignore
             for k, v in bns.items():
-                if isinstance(v, (ArgparseCommand, ArgparseArg)):
+                if isinstance(v, (ArgparseCmd, ArgparseArg)):
                     check.not_in(v, bseen)
                     bseen.add(v)
                     objs[k] = v
@@ -3686,7 +3676,7 @@ class ArgparseCli:
         subparsers = parser.add_subparsers()
 
         for att, obj in objs.items():
-            if isinstance(obj, ArgparseCommand):
+            if isinstance(obj, ArgparseCmd):
                 if obj.parent is not None:
                     raise NotImplementedError
 
@@ -3748,7 +3738,7 @@ class ArgparseCli:
 
     #
 
-    def _bind_cli_cmd(self, cmd: ArgparseCommand) -> ta.Callable:
+    def _bind_cli_cmd(self, cmd: ArgparseCmd) -> ta.Callable:
         return cmd.__get__(self, type(self))
 
     def prepare_cli_run(self) -> ta.Optional[ta.Callable]:
@@ -8152,7 +8142,7 @@ class Run:
 class PyprojectCli(ArgparseCli):
     _docker_container = argparse_arg('--_docker_container', help=argparse.SUPPRESS)
 
-    @argparse_command(
+    @argparse_cmd(
         argparse_arg('name'),
         argparse_arg('-e', '--docker-env', action='append'),
         argparse_arg('cmd', nargs='?'),
@@ -8234,7 +8224,7 @@ class PyprojectCli(ArgparseCli):
         else:
             raise Exception(f'unknown subcommand: {cmd}')
 
-    @argparse_command(
+    @argparse_cmd(
         argparse_arg('-b', '--build', action='store_true'),
         argparse_arg('-r', '--revision', action='store_true'),
         argparse_arg('-j', '--jobs', type=int),

omdev/tools/doc.py

@@ -64,7 +64,7 @@ class Cli(ap.Cli):
 
         return src, name
 
-    @ap.command(
+    @ap.cmd(
         ap.arg('input-file', nargs='?'),
         ap.arg('--report-level', type=int),
         ap.arg('-O', '--open', action='store_true'),
@@ -85,7 +85,7 @@ class Cli(ap.Cli):
         else:
             print(html)
 
-    @ap.command(
+    @ap.cmd(
         ap.arg('input-file', nargs='?'),
         ap.arg('-O', '--open', action='store_true'),
     )

omdev/tools/docker.py

@@ -37,7 +37,7 @@ def get_local_platform() -> str:
 
 
 class Cli(ap.Cli):
-    @ap.command(
+    @ap.cmd(
         ap.arg('args', nargs='*'),
     )
     def ns1(self) -> None:
@@ -69,7 +69,7 @@ class Cli(ap.Cli):
             *self.args.args,
         )
 
-    @ap.command(
+    @ap.cmd(
         ap.arg('--amd64', action='store_true'),
     )
     def enable_ptrace(self) -> None:
@@ -87,7 +87,7 @@ class Cli(ap.Cli):
             'sh', '-c', 'echo 0 > /proc/sys/kernel/yama/ptrace_scope',
         )
 
-    @ap.command(
+    @ap.cmd(
         ap.arg('-f', '--file'),
         ap.arg('-w', '--write', action='store_true'),
         ap.arg('-q', '--quiet', action='store_true'),
@@ -182,7 +182,7 @@ class Cli(ap.Cli):
             with open(yml_file, 'w') as f:
                 f.write(new_src)
 
-    @ap.command(
+    @ap.cmd(
         ap.arg('repo'),
         ap.arg('tags', nargs='*'),
     )
@@ -192,7 +192,7 @@ class Cli(ap.Cli):
         print(json.dumps_pretty(msh.marshal(info)))
         return 0
 
-    @ap.command(
+    @ap.cmd(
         ap.arg('image'),
     )
     def repo_latest_image(self) -> int:
@@ -205,7 +205,7 @@ class Cli(ap.Cli):
         print(dck.select_latest_tag(info.tags, base=base))
         return 0
 
-    @ap.command(
+    @ap.cmd(
         ap.arg('-f', '--file'),
     )
     def compose_image_updates(self) -> None:
@@ -234,7 +234,7 @@ class Cli(ap.Cli):
 
     #
 
-    @ap.command()
+    @ap.cmd()
     def dockly(self) -> None:
         os.execl(
             exe := docker_exe(),
@@ -244,7 +244,7 @@ class Cli(ap.Cli):
             'lirantal/dockly',
         )
 
-    @ap.command()
+    @ap.cmd()
     def lazy(self) -> None:
         os.execl(
             exe := docker_exe(),

omdev/tools/git.py

@@ -43,7 +43,7 @@ def get_first_commit_of_day(rev: str) -> str | None:
 
 
 class Cli(ap.Cli):
-    @ap.command()
+    @ap.cmd()
     def blob_sizes(self) -> None:
         # https://stackoverflow.com/a/42544963
         subprocess.check_call(  # noqa
@@ -56,7 +56,7 @@ class Cli(ap.Cli):
 
     #
 
-    @ap.command()
+    @ap.cmd()
     def commits_by_date(self) -> None:
         subprocess.check_call(['git log --date=short --pretty=format:%ad | sort | uniq -c'], shell=True)  # noqa
 
@@ -64,7 +64,7 @@ class Cli(ap.Cli):
 
     _GITHUB_PAT = re.compile(r'((http(s)?://)?(www\./)?github(\.com)?/)?(?P<user>[^/.]+)/(?P<repo>[^/.]+)(/.*)?')
 
-    @ap.command(
+    @ap.cmd(
         ap.arg('repo'),
         ap.arg('args', nargs=ap.REMAINDER),
         accepts_unknown=True,
@@ -107,7 +107,7 @@ class Cli(ap.Cli):
         finally:
             print(out_dir)
 
-    @ap.command(
+    @ap.cmd(
         ap.arg('rev', nargs='?', default='HEAD'),
         ap.arg('-d', '--diff', action='store_true'),
         ap.arg('-s', '--stat', action='store_true'),
@@ -147,7 +147,7 @@ class Cli(ap.Cli):
         else:
             print(base_rev)
 
-    @ap.command(
+    @ap.cmd(
         ap.arg('-v', '--verbose', action='store_true'),
     )
     def status(self) -> None:
@@ -184,7 +184,7 @@ class Cli(ap.Cli):
 
     # Lazy helpers
 
-    @ap.command(
+    @ap.cmd(
         ap.arg('-m', '--message', nargs='?'),
         ap.arg('--time-fmt', default='%Y-%m-%dT%H:%M:%SZ'),
         aliases=['acp'],
@@ -204,7 +204,7 @@ class Cli(ap.Cli):
 
         subprocess.check_call(['git', 'push'])
 
-    @ap.command(
+    @ap.cmd(
         aliases=['psu'],
     )
     def pull_submodule_update(self) -> None:

omdev/tools/notebook.py

@@ -18,7 +18,7 @@ from ..cli import CliModule
 
 
 class Cli(ap.Cli):
-    @ap.command(
+    @ap.cmd(
         ap.arg('file'),
         ap.arg('-w', '--write', action='store_true'),
         ap.arg('-o', '--overwrite', action='store_true'),

omdev/tools/pip.py

@@ -20,20 +20,20 @@ from ..pip import lookup_latest_package_version
 
 
 class Cli(ap.Cli):
-    @ap.command(
+    @ap.cmd(
         ap.arg('package'),
     )
     def lookup_latest_version(self) -> None:
         print(lookup_latest_package_version(self.args.package))
 
-    @ap.command(
+    @ap.cmd(
         ap.arg('path', nargs='*'),
     )
     def list_root_dists(self) -> None:
         for d in get_root_dists(paths=self.args.path):
             print(d)
 
-    @ap.command(
+    @ap.cmd(
         ap.arg('file'),
         ap.arg('-w', '--write', action='store_true'),
         ap.arg('-q', '--quiet', action='store_true'),
@@ -57,7 +57,7 @@ class Cli(ap.Cli):
             with open(self.args.file, 'w') as f:
                 f.write(new_src)
 
-    @ap.command(
+    @ap.cmd(
         ap.arg('files', nargs='*'),
         ap.arg('-r', '--follow-requirements', action='store_true'),
         ap.arg('-j', '--json', action='store_true'),

omdev/tools/prof.py

@@ -13,7 +13,7 @@ from ..cli import CliModule
 
 
 class Cli(ap.Cli):
-    @ap.command(
+    @ap.cmd(
         ap.arg('file'),
         ap.arg('out-file', nargs='?'),
         ap.arg('-w', '--write', action='store_true'),

omdev/tools/sqlrepl.py

@@ -157,7 +157,7 @@ def exec_postgres_cli(
 
 
 class Cli(ap.Cli):
-    @ap.command(
+    @ap.cmd(
         ap.arg('--no-dbcli', action='store_true'),
         ap.arg('dialect'),
         ap.arg('target'),

{omdev-0.0.0.dev179.dist-info → omdev-0.0.0.dev180.dist-info}/METADATA

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

{omdev-0.0.0.dev179.dist-info → omdev-0.0.0.dev180.dist-info}/RECORD

@@ -1,11 +1,11 @@
-omdev/.manifests.json,sha256=tF8O0ywJseQMbbhT2b67QAvjuAaHXLY1MyjeMrDObos,8306
+omdev/.manifests.json,sha256=nfFGet5cWIICf5szYBXbQvnH2TrJD-jtyBxuwKeA7ZY,8309
 omdev/__about__.py,sha256=n5x-SO70OgbDQFzQ1d7sZDVMsnkQc4PxQZPFaIQFa0E,1281
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/bracepy.py,sha256=I8EdqtDvxzAi3I8TuMEW-RBfwXfqKbwp06CfOdj3L1o,2743
 omdev/classdot.py,sha256=YOvgy6x295I_8NKBbBlRVd3AN7Osirm_Lqt4Wj0j9rY,1631
 omdev/cmake.py,sha256=Diy2ry65806dQP125DAstD3w46z_wszMH7PwC2-6iik,4578
 omdev/findimports.py,sha256=2t8QP852saEEJFeXySEzhi_nxRSxghlkXz2jVdvy08M,2392
-omdev/imgur.py,sha256=NK-kqGqGu4rDfpPbRyLEnIMJ2GHQQft5nSuwxLgyhNQ,2996
+omdev/imgur.py,sha256=PNRrA440WP10DGm2bpXhisZdA4ODYCpOj1HqEzNx0Fs,2992
 omdev/pip.py,sha256=7cZ_IOpekQvgPm_gKnX3Pr8xjqUid50PPScTlZCYVlM,2118
 omdev/revisions.py,sha256=7Bgwd7cuKtcXJE4eDXmWP4Qx1aqZqf_LNFkOCuYS9I0,5008
 omdev/secrets.py,sha256=bcquaBIDKqX4UIKOzUuKrX7nxVCenj67rRHIMIrd9bk,540
@@ -67,7 +67,7 @@ omdev/cexts/_distutils/compilers/unixccompiler.py,sha256=o1h8QuyupLntv4F21_XjzAZ
 omdev/cli/__init__.py,sha256=V_l6VP1SZMlJbO-8CJwSuO9TThOy2S_oaPepNYgIrbE,37
 omdev/cli/__main__.py,sha256=mOJpgc07o0r5luQ1DlX4tk2PqZkgmbwPbdzJ3KmtjgQ,138
 omdev/cli/_pathhack.py,sha256=kxqb2kHap68Lkh8b211rDbcgj06hidBiAKA3f9posyc,2119
-omdev/cli/clicli.py,sha256=PNnhSu8fHjMPd9mbhG3A7jiGFgKQmWMYYKVSY4UcEOI,3508
+omdev/cli/clicli.py,sha256=RiB-0Wis3L3Y0xet9Imm6V1tN87d9FN2rQhcdeXA9bg,3484
 omdev/cli/install.py,sha256=C-W171YlIHt4Cfok-nWSMbHwWhqF_PFqq2HixFttYx8,4460
 omdev/cli/main.py,sha256=OY7ir2WWuDUM1Urmh-WdEv7uEhidRRGnE4FNYHaEN3s,7033
 omdev/cli/managers.py,sha256=BV98_n30Jj63OJrFgRoVZRfICxMLXEZKoEn4rMj9LV4,1160
@@ -82,7 +82,7 @@ omdev/git/status.py,sha256=s_5kzyaSO-ikimdi54A6DrjOQPMeM5SRXLTrb22Alp4,8106
 omdev/git/subtrees.py,sha256=XFxE74PBqu_E5arpkCRRgsus5nof0TBfd2nmgh4cczA,2398
 omdev/interp/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/interp/__main__.py,sha256=GMCqeGYltgt5dlJzHxY9gqisa8cRkrPfmZYuZnjg4WI,162
-omdev/interp/cli.py,sha256=dgHVB4JTpU43t2DYSQgqo3cGi9AIVKGQF0g63liQ83I,2406
+omdev/interp/cli.py,sha256=_oaG5fN-UE2sQUNeCi4b9m5UF_lPEJ2S9nO_no1cvXI,2394
 omdev/interp/default.py,sha256=FTFQVvA8Lipe8k5eFbf-mLIbrcmfuEXka4ifPyQP8CA,285
 omdev/interp/inject.py,sha256=BE3VjFxU0gJ7KwSdKaNIlgXD7EAr-nidlJqSLwhGeNk,1479
 omdev/interp/inspect.py,sha256=ufYKUsGc_C1hwWDKqsfu1Cm7Hks7lAc5l8gt1MUKNDQ,2849
@@ -101,7 +101,9 @@ omdev/interp/uv/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/interp/uv/inject.py,sha256=3nHYu8qQMbV5iXdp-ItzNtfYE0zkIxrzmt7QdV7WiXU,314
 omdev/interp/uv/uv.py,sha256=oP4V6WJ0aYLIzFwkIvKMPLD_5HxppTuhd8fvtz6UoXs,671
 omdev/magic/__init__.py,sha256=CBzRB71RLyylkrj8dph6JUEddA8KSMJvDgriHqFfJGU,478
-omdev/magic/find.py,sha256=tTmpWXAleaXG3_kNOsRF7s8D0CpYMXbdz6-HbCNBW90,7070
+omdev/magic/__main__.py,sha256=1_BAKDtA6Rn5hswyl4S5J78BPRbynX4is_wQsD0U7jI,161
+omdev/magic/cli.py,sha256=puL5Snnc-i9Dpa3AU8DtaCp5qUd_7RXwv-qWU_B2fa8,1184
+omdev/magic/find.py,sha256=lnVWO4Ux0BkatBihVloZ7XrsOJ4Tsc-YRhGd4ENL3Ro,6037
 omdev/magic/magic.py,sha256=h1nxoW6CV1MRCiHjDt3sO4kmG0qTtTRbkDNiPLGo2BE,224
 omdev/magic/prepare.py,sha256=V5jYT2AeFmazzPwk9sNismSouLwFXEoik6FwKcWCNUY,589
 omdev/magic/styles.py,sha256=YQ-HgwfvFWPj-o_705E7A-yehEn1G1hRNLPWpeWCK0U,605
@@ -130,11 +132,11 @@ omdev/ptk/apps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/ptk/apps/ncdu.py,sha256=dOkEJoc2Wjv1u_Uge7Vpei_LvXldoPP5833Eia355tc,4548
 omdev/pycharm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/pycharm/__main__.py,sha256=hUPp11D024eMdT86BxXiRVtF7AGBk5W6Zn8_mEHSksY,163
-omdev/pycharm/cli.py,sha256=dYRDCzRSLBTmoNg6Flswu3gI62yAGUtoh1aNcpBUBYU,3797
+omdev/pycharm/cli.py,sha256=a7qnTeN0g0FwMqSy2b49DLoTO0yC662tSr4qKuvclGs,3785
 omdev/pyproject/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/pyproject/__main__.py,sha256=gn3Rl1aYPYdiTtEqa9ifi0t-e4ZwPY0vhJ4UXvYdJDY,165
 omdev/pyproject/cexts.py,sha256=x13piOOnNrYbA17qZLDVuR0p1sqhgEwpk4FtImX-klM,4281
-omdev/pyproject/cli.py,sha256=TXoYDfX-FotgCT9LVFfNMwqmfhfvW0-I7dYTG2ub67Y,8765
+omdev/pyproject/cli.py,sha256=ViNZUqFXcm8lIDCeNI6uy4OuHuo9aEV0S_jKoyanuf4,8753
 omdev/pyproject/configs.py,sha256=K9H5cGwVLgHi8wKwtYvlXHZ9ThtmnI4jo8JAb-t1-70,2859
 omdev/pyproject/pkg.py,sha256=x71WLK3Amnt2Wjhpqz3_lBRGEdsjN5vRGlAr5eDVFqE,14552
 omdev/pyproject/reqs.py,sha256=8feZ71YnGzwKbLK4zO28CDQeNcZIIuq6cnkBhs6M-7E,2406
@@ -144,8 +146,8 @@ omdev/scripts/bumpversion.py,sha256=Kn7fo73Hs8uJh3Hi3EIyLOlzLPWAC6dwuD_lZ3cIzuY,
 omdev/scripts/execrss.py,sha256=mR0G0wERBYtQmVIn63lCIIFb5zkCM6X_XOENDFYDBKc,651
 omdev/scripts/exectime.py,sha256=sFb376GflU6s9gNX-2-we8hgH6w5MuQNS9g6i4SqJIo,610
 omdev/scripts/importtrace.py,sha256=oa7CtcWJVMNDbyIEiRHej6ICfABfErMeo4_haIqe18Q,14041
-omdev/scripts/interp.py,sha256=5pOp_GbyA6He7-aM3PtsBIKF9soERAifd_8TF7OfcnU,140545
-omdev/scripts/pyproject.py,sha256=stHTUWOWHfa9_p_tpTLqN8Hc9RoFVP1ZR5Mb89W18Pc,239282
+omdev/scripts/interp.py,sha256=rtGqd0vYT2f7dy8rWXu8KIRnt_baBgN7nynJCsniGfs,140481
+omdev/scripts/pyproject.py,sha256=Q_CjZ_q-Fvhlb_guUg7GVE0cbovaQvuBgWTXGCCCmlw,239074
 omdev/scripts/slowcat.py,sha256=lssv4yrgJHiWfOiHkUut2p8E8Tq32zB-ujXESQxFFHY,2728
 omdev/scripts/tmpexec.py,sha256=WTYcf56Tj2qjYV14AWmV8SfT0u6Y8eIU6cKgQRvEK3c,1442
 omdev/toml/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
@@ -153,16 +155,16 @@ omdev/toml/parser.py,sha256=ojhCYIk23ELRx2f9xUCwLTRq13UM6wrYGWoyxZBurlo,29327
 omdev/toml/writer.py,sha256=lk3on3YXVbWuLJa-xsOzOhs1bBAT1vXqw4mBbluZl_w,3040
 omdev/tools/__init__.py,sha256=iVJAOQ0viGTQOm0DLX4uZLro-9jOioYJGLg9s0kDx1A,78
 omdev/tools/cloc.py,sha256=r5HkvaLoGw8djgvGdt_W_CjfSklW585dar9bDhDFeF8,5098
-omdev/tools/doc.py,sha256=iblgUq9_7JZN2i8qmvewrz4OX0paObscBaCj8u77WqI,2555
-omdev/tools/docker.py,sha256=mu0sWnH_L1JjScfWCXXYaux03mcotCS03SD65I93qHI,7384
-omdev/tools/git.py,sha256=zfdPnN-9WSeOQlLoTw5aqAX-UWvz-2p330dx_zaU0WQ,7014
+omdev/tools/doc.py,sha256=wvgGhv6aFaV-Zl-Qivejx37i-lKQ207rZ-4K2fPf-Ss,2547
+omdev/tools/docker.py,sha256=KVFckA8eAdiapFUr8xkfMw9Uv3Qy4oNq0e70Lqt1F7I,7352
+omdev/tools/git.py,sha256=VPx61R-UC2IH4s1tEnCsBp6kSsM6r9fimQfF8amg5kE,6986
 omdev/tools/importscan.py,sha256=nhJIhtjDY6eFVlReP7fegvv6L5ZjN-Z2VeyhsBonev4,4639
 omdev/tools/mkrelimp.py,sha256=kyu_BbUakKHEEOxNEvYWk7tH1ixCfVb3NqqT8U-BozE,4066
-omdev/tools/notebook.py,sha256=lIQIG-ytxGistyt7twuTbquSKbd7HQzR2jgBcGApwu8,3498
-omdev/tools/pip.py,sha256=KcIehb04owzJjeG_vRucgXkEup2mEL5SrWBhEtHc3FA,3475
-omdev/tools/prof.py,sha256=0-0_uFaKycnKCEHIaBn600qEMXWBy7ADp5hv2VdTJC8,1471
+omdev/tools/notebook.py,sha256=q1YMGwM1skHv-dPbtT_cM7UOGFNiMEAxjr6rr6rbobk,3494
+omdev/tools/pip.py,sha256=eBD41hp-V3thGfhUBM3Erxl4CSG-5LG6Szo1sA76P2k,3459
+omdev/tools/prof.py,sha256=hQakAsViJD4gLJpLLZnTkOqmTDAwM48Nx5q-O_aFlYM,1467
 omdev/tools/qr.py,sha256=tm68lPwEAkEwIL2sUKPKBYfwwPtjVWG1DBZwur8_jY8,1737
-omdev/tools/sqlrepl.py,sha256=y9BPG3FSJDJgDieFVOXWG75q4dhTPjlYUiLHuinUTpg,5757
+omdev/tools/sqlrepl.py,sha256=wAjrfXNrRV63-NJCC2HlGQnFh7lUH0bHMnOjYotQqFs,5753
 omdev/tools/json/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/json/__main__.py,sha256=wqpkN_NsQyNwKW4qjVj8ADJ4_C98KhrFBtE-Z1UamfU,168
 omdev/tools/json/cli.py,sha256=EubIMT-n2XsjWBZjSy2fWXqijlwrIhLsfbkg3SZzi28,9586
@@ -174,9 +176,9 @@ omdev/tools/json/rendering.py,sha256=jNShMfCpFR9-Kcn6cUFuOChXHjg71diuTC4x7Ofmz-o
 omdev/tools/pawk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/pawk/__main__.py,sha256=VCqeRVnqT1RPEoIrqHFSu4PXVMg4YEgF4qCQm90-eRI,66
 omdev/tools/pawk/pawk.py,sha256=Eckymn22GfychCQcQi96BFqRo_LmiJ-EPhC8TTUJdB4,11446
-omdev-0.0.0.dev179.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev179.dist-info/METADATA,sha256=cv44HVDfVsjgNkrMZMvXr6JspwW4xpGmu238sBd3QoE,1760
-omdev-0.0.0.dev179.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-omdev-0.0.0.dev179.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev179.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev179.dist-info/RECORD,,
+omdev-0.0.0.dev180.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev180.dist-info/METADATA,sha256=mqiMhNfVPplwJ5oOFoyh-rWp7N4cfr3v2AICPOSK21E,1760
+omdev-0.0.0.dev180.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+omdev-0.0.0.dev180.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev180.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev180.dist-info/RECORD,,