omdev 0.0.0.dev405__tar.gz → 0.0.0.dev406__tar.gz

{omdev-0.0.0.dev405/omdev.egg-info → omdev-0.0.0.dev406}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev405
+Version: 0.0.0.dev406
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev405
+Requires-Dist: omlish==0.0.0.dev406
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev405 → omdev-0.0.0.dev406}/omdev/.manifests.json

@@ -5,9 +5,9 @@
     "file": "omdev/amalg/__main__.py",
     "line": 4,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "amalg",
-        "mod_name": "omdev.amalg.__main__"
+      "!.cli.types.CliModule": {
+        "name": "amalg",
+        "module": "omdev.amalg.__main__"
       }
     }
   },
@@ -17,9 +17,9 @@
     "file": "omdev/cc/__main__.py",
     "line": 4,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "cc",
-        "mod_name": "omdev.cc.__main__"
+      "!.cli.types.CliModule": {
+        "name": "cc",
+        "module": "omdev.cc.__main__"
       }
     }
   },
@@ -29,9 +29,9 @@
     "file": "omdev/cexts/cmake.py",
     "line": 331,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "cmake",
-        "mod_name": "omdev.cexts.cmake"
+      "!.cli.types.CliModule": {
+        "name": "cmake",
+        "module": "omdev.cexts.cmake"
       }
     }
   },
@@ -41,9 +41,9 @@
     "file": "omdev/cli/clicli.py",
     "line": 233,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "cli",
-        "mod_name": "omdev.cli.clicli"
+      "!.cli.types.CliModule": {
+        "name": "cli",
+        "module": "omdev.cli.clicli"
       }
     }
   },
@@ -53,9 +53,9 @@
     "file": "omdev/cmdlog/__main__.py",
     "line": 4,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "cmdlog",
-        "mod_name": "omdev.cmdlog.__main__"
+      "!.cli.types.CliModule": {
+        "name": "cmdlog",
+        "module": "omdev.cmdlog.__main__"
       }
     }
   },
@@ -65,9 +65,9 @@
     "file": "omdev/dataclasses/__main__.py",
     "line": 4,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "dataclasses",
-        "mod_name": "omdev.dataclasses.__main__"
+      "!.cli.types.CliModule": {
+        "name": "dataclasses",
+        "module": "omdev.dataclasses.__main__"
       }
     }
   },
@@ -77,9 +77,9 @@
     "file": "omdev/imgur.py",
     "line": 136,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "imgur",
-        "mod_name": "omdev.imgur"
+      "!.cli.types.CliModule": {
+        "name": "imgur",
+        "module": "omdev.imgur"
       }
     }
   },
@@ -89,12 +89,12 @@
     "file": "omdev/intellij/cli.py",
     "line": 81,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": [
+      "!.cli.types.CliModule": {
+        "name": [
           "intellij",
           "ij"
         ],
-        "mod_name": "omdev.intellij.cli"
+        "module": "omdev.intellij.cli"
       }
     }
   },
@@ -104,9 +104,9 @@
     "file": "omdev/interp/__main__.py",
     "line": 4,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "interp",
-        "mod_name": "omdev.interp.__main__"
+      "!.cli.types.CliModule": {
+        "name": "interp",
+        "module": "omdev.interp.__main__"
       }
     }
   },
@@ -116,9 +116,9 @@
     "file": "omdev/magic/__main__.py",
     "line": 4,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "magic",
-        "mod_name": "omdev.magic.__main__"
+      "!.cli.types.CliModule": {
+        "name": "magic",
+        "module": "omdev.magic.__main__"
       }
     }
   },
@@ -128,9 +128,9 @@
     "file": "omdev/manifests/__main__.py",
     "line": 4,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "manifests",
-        "mod_name": "omdev.manifests.__main__"
+      "!.cli.types.CliModule": {
+        "name": "manifests",
+        "module": "omdev.manifests.__main__"
       }
     }
   },
@@ -140,7 +140,7 @@
     "file": "omdev/manifests/tests/packages/foo/fargles.py",
     "line": 4,
     "value": {
-      "$.manifests.tests.packages.foo.thingies.manifests.SimpleThingyManifest": {
+      "!.manifests.tests.packages.foo.thingies.manifests.SimpleThingyManifest": {
         "what": "fargles"
       }
     }
@@ -151,9 +151,9 @@
     "file": "omdev/precheck/__main__.py",
     "line": 4,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "precheck",
-        "mod_name": "omdev.precheck.__main__"
+      "!.cli.types.CliModule": {
+        "name": "precheck",
+        "module": "omdev.precheck.__main__"
       }
     }
   },
@@ -163,9 +163,9 @@
     "file": "omdev/ptk/apps/ncdu.py",
     "line": 162,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "ptk/ncdu",
-        "mod_name": "omdev.ptk.apps.ncdu"
+      "!.cli.types.CliModule": {
+        "name": "ptk/ncdu",
+        "module": "omdev.ptk.apps.ncdu"
       }
     }
   },
@@ -175,12 +175,12 @@
     "file": "omdev/ptk/markdown/__main__.py",
     "line": 4,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": [
+      "!.cli.types.CliModule": {
+        "name": [
           "ptk/markdown",
           "ptk/md"
         ],
-        "mod_name": "omdev.ptk.markdown.__main__"
+        "module": "omdev.ptk.markdown.__main__"
       }
     }
   },
@@ -190,9 +190,9 @@
     "file": "omdev/py/attrdocs.py",
     "line": 160,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "py/attrdocs",
-        "mod_name": "omdev.py.attrdocs"
+      "!.cli.types.CliModule": {
+        "name": "py/attrdocs",
+        "module": "omdev.py.attrdocs"
       }
     }
   },
@@ -202,9 +202,9 @@
     "file": "omdev/py/bracepy.py",
     "line": 94,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "bracepy",
-        "mod_name": "omdev.py.bracepy"
+      "!.cli.types.CliModule": {
+        "name": "bracepy",
+        "module": "omdev.py.bracepy"
       }
     }
   },
@@ -214,9 +214,9 @@
     "file": "omdev/py/classdot.py",
     "line": 63,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "py/classdot",
-        "mod_name": "omdev.py.classdot"
+      "!.cli.types.CliModule": {
+        "name": "py/classdot",
+        "module": "omdev.py.classdot"
       }
     }
   },
@@ -226,9 +226,9 @@
     "file": "omdev/py/findimports.py",
     "line": 136,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "py/findimports",
-        "mod_name": "omdev.py.findimports"
+      "!.cli.types.CliModule": {
+        "name": "py/findimports",
+        "module": "omdev.py.findimports"
       }
     }
   },
@@ -238,9 +238,9 @@
     "file": "omdev/py/scripts/execstat.py",
     "line": 89,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "py/execstat",
-        "mod_name": "omdev.py.scripts.execstat"
+      "!.cli.types.CliModule": {
+        "name": "py/execstat",
+        "module": "omdev.py.scripts.execstat"
       }
     }
   },
@@ -250,9 +250,9 @@
     "file": "omdev/py/scripts/importtrace.py",
     "line": 491,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "py/importtrace",
-        "mod_name": "omdev.py.scripts.importtrace"
+      "!.cli.types.CliModule": {
+        "name": "py/importtrace",
+        "module": "omdev.py.scripts.importtrace"
       }
     }
   },
@@ -262,9 +262,9 @@
     "file": "omdev/py/srcheaders.py",
     "line": 65,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "py/srcheaders",
-        "mod_name": "omdev.py.srcheaders"
+      "!.cli.types.CliModule": {
+        "name": "py/srcheaders",
+        "module": "omdev.py.srcheaders"
       }
     }
   },
@@ -274,9 +274,9 @@
     "file": "omdev/py/tools/importscan.py",
     "line": 178,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "py/importscan",
-        "mod_name": "omdev.py.tools.importscan"
+      "!.cli.types.CliModule": {
+        "name": "py/importscan",
+        "module": "omdev.py.tools.importscan"
       }
     }
   },
@@ -286,9 +286,9 @@
     "file": "omdev/py/tools/mkrelimp.py",
     "line": 149,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "py/mkrelimp",
-        "mod_name": "omdev.py.tools.mkrelimp"
+      "!.cli.types.CliModule": {
+        "name": "py/mkrelimp",
+        "module": "omdev.py.tools.mkrelimp"
       }
     }
   },
@@ -298,9 +298,9 @@
     "file": "omdev/pyproject/__main__.py",
     "line": 4,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "pyproject",
-        "mod_name": "omdev.pyproject.__main__"
+      "!.cli.types.CliModule": {
+        "name": "pyproject",
+        "module": "omdev.pyproject.__main__"
       }
     }
   },
@@ -310,9 +310,9 @@
     "file": "omdev/scripts/slowcat.py",
     "line": 117,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "slowcat",
-        "mod_name": "omdev.scripts.slowcat"
+      "!.cli.types.CliModule": {
+        "name": "slowcat",
+        "module": "omdev.scripts.slowcat"
       }
     }
   },
@@ -322,9 +322,9 @@
     "file": "omdev/scripts/tmpexec.py",
     "line": 50,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "tmpexec",
-        "mod_name": "omdev.scripts.tmpexec"
+      "!.cli.types.CliModule": {
+        "name": "tmpexec",
+        "module": "omdev.scripts.tmpexec"
       }
     }
   },
@@ -334,9 +334,9 @@
     "file": "omdev/tools/antlr/__main__.py",
     "line": 4,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "antlr",
-        "mod_name": "omdev.tools.antlr.__main__"
+      "!.cli.types.CliModule": {
+        "name": "antlr",
+        "module": "omdev.tools.antlr.__main__"
       }
     }
   },
@@ -346,9 +346,9 @@
     "file": "omdev/tools/cloc.py",
     "line": 248,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "cloc",
-        "mod_name": "omdev.tools.cloc"
+      "!.cli.types.CliModule": {
+        "name": "cloc",
+        "module": "omdev.tools.cloc"
       }
     }
   },
@@ -358,9 +358,9 @@
     "file": "omdev/tools/diff.py",
     "line": 24,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "diff",
-        "mod_name": "omdev.tools.diff"
+      "!.cli.types.CliModule": {
+        "name": "diff",
+        "module": "omdev.tools.diff"
       }
     }
   },
@@ -370,9 +370,9 @@
     "file": "omdev/tools/doc.py",
     "line": 106,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "doc",
-        "mod_name": "omdev.tools.doc"
+      "!.cli.types.CliModule": {
+        "name": "doc",
+        "module": "omdev.tools.doc"
       }
     }
   },
@@ -382,9 +382,9 @@
     "file": "omdev/tools/docker.py",
     "line": 259,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "docker",
-        "mod_name": "omdev.tools.docker"
+      "!.cli.types.CliModule": {
+        "name": "docker",
+        "module": "omdev.tools.docker"
       }
     }
   },
@@ -394,9 +394,9 @@
     "file": "omdev/tools/git/__main__.py",
     "line": 4,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "git",
-        "mod_name": "omdev.tools.git.__main__"
+      "!.cli.types.CliModule": {
+        "name": "git",
+        "module": "omdev.tools.git.__main__"
       }
     }
   },
@@ -406,9 +406,9 @@
     "file": "omdev/tools/git/messages.py",
     "line": 81,
     "value": {
-      "$.tools.git.messages.GitMessageGeneratorManifest": {
-        "mod_name": "omdev.tools.git.messages",
-        "attr_name": "TimestampGitMessageGenerator",
+      "!.tools.git.messages.GitMessageGeneratorManifest": {
+        "module": "omdev.tools.git.messages",
+        "attr": "TimestampGitMessageGenerator",
         "name": "timestamp",
         "aliases": [
           "ts"
@@ -422,12 +422,12 @@
     "file": "omdev/tools/json/__main__.py",
     "line": 4,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": [
+      "!.cli.types.CliModule": {
+        "name": [
           "json",
           "j"
         ],
-        "mod_name": "omdev.tools.json.__main__"
+        "module": "omdev.tools.json.__main__"
       }
     }
   },
@@ -437,12 +437,12 @@
     "file": "omdev/tools/jsonview/__main__.py",
     "line": 4,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": [
+      "!.cli.types.CliModule": {
+        "name": [
           "jsonview",
           "jv"
         ],
-        "mod_name": "omdev.tools.jsonview.__main__"
+        "module": "omdev.tools.jsonview.__main__"
       }
     }
   },
@@ -452,9 +452,9 @@
     "file": "omdev/tools/linehisto.py",
     "line": 330,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "linehisto",
-        "mod_name": "omdev.tools.linehisto"
+      "!.cli.types.CliModule": {
+        "name": "linehisto",
+        "module": "omdev.tools.linehisto"
       }
     }
   },
@@ -464,11 +464,11 @@
     "file": "omdev/tools/mkenv.py",
     "line": 123,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": [
+      "!.cli.types.CliModule": {
+        "name": [
           "mkenv"
         ],
-        "mod_name": "omdev.tools.mkenv"
+        "module": "omdev.tools.mkenv"
       }
     }
   },
@@ -478,12 +478,12 @@
     "file": "omdev/tools/notebook.py",
     "line": 123,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": [
+      "!.cli.types.CliModule": {
+        "name": [
           "notebook",
           "nb"
         ],
-        "mod_name": "omdev.tools.notebook"
+        "module": "omdev.tools.notebook"
       }
     }
   },
@@ -493,9 +493,9 @@
     "file": "omdev/tools/pawk/pawk.py",
     "line": 392,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "pawk",
-        "mod_name": "omdev.tools.pawk.pawk"
+      "!.cli.types.CliModule": {
+        "name": "pawk",
+        "module": "omdev.tools.pawk.pawk"
       }
     }
   },
@@ -505,9 +505,9 @@
     "file": "omdev/tools/pip.py",
     "line": 123,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "pip",
-        "mod_name": "omdev.tools.pip"
+      "!.cli.types.CliModule": {
+        "name": "pip",
+        "module": "omdev.tools.pip"
       }
     }
   },
@@ -517,9 +517,9 @@
     "file": "omdev/tools/prof.py",
     "line": 128,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "prof",
-        "mod_name": "omdev.tools.prof"
+      "!.cli.types.CliModule": {
+        "name": "prof",
+        "module": "omdev.tools.prof"
       }
     }
   },
@@ -529,9 +529,9 @@
     "file": "omdev/tools/qr.py",
     "line": 77,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "qr",
-        "mod_name": "omdev.tools.qr"
+      "!.cli.types.CliModule": {
+        "name": "qr",
+        "module": "omdev.tools.qr"
       }
     }
   },
@@ -541,9 +541,9 @@
     "file": "omdev/tools/shadow.py",
     "line": 68,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "shadow",
-        "mod_name": "omdev.tools.shadow"
+      "!.cli.types.CliModule": {
+        "name": "shadow",
+        "module": "omdev.tools.shadow"
       }
     }
   },
@@ -553,12 +553,12 @@
     "file": "omdev/tools/shell.py",
     "line": 110,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": [
+      "!.cli.types.CliModule": {
+        "name": [
           "shell",
           "sh"
         ],
-        "mod_name": "omdev.tools.shell"
+        "module": "omdev.tools.shell"
       }
     }
   },
@@ -568,9 +568,9 @@
     "file": "omdev/tools/sqlrepl.py",
     "line": 196,
     "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "sqlrepl",
-        "mod_name": "omdev.tools.sqlrepl"
+      "!.cli.types.CliModule": {
+        "name": "sqlrepl",
+        "module": "omdev.tools.sqlrepl"
       }
     }
   }

{omdev-0.0.0.dev405 → omdev-0.0.0.dev406}/omdev/cli/main.py

@@ -61,20 +61,20 @@ class CliCmdSet:
     def _make_entry(self, cmd: CliCmd) -> Entry:
         help_path: StrTuple | None
 
-        if isinstance(cmd.cmd_name, str):
-            ns = [cmd.cmd_name]
+        if isinstance(cmd.name, str):
+            ns = [cmd.name]
         else:
-            ns = list(cmd.cmd_name)
+            ns = list(cmd.name)
         exec_paths = [tuple(n.split('/')) for n in ns]
 
-        if isinstance(cmd.cmd_name, str) and cmd.cmd_name[0] == '_':
+        if isinstance(cmd.name, str) and cmd.name[0] == '_':
             help_path = None
 
         elif isinstance(cmd, CliFunc):
             help_path = ('-', *exec_paths[0])
 
         elif isinstance(cmd, CliModule):
-            help_path = (cmd.mod_name.partition('.')[0], *exec_paths[0])
+            help_path = (cmd.module.partition('.')[0], *exec_paths[0])
 
         else:
             raise TypeError(cmd)
@@ -128,10 +128,10 @@ class CliCmdSet:
             if h in c:
                 raise NameError(e)
 
-            if isinstance(e.cmd.cmd_name, str):
-                l = [e.cmd.cmd_name]
+            if isinstance(e.cmd.name, str):
+                l = [e.cmd.name]
             else:
-                l = list(e.cmd.cmd_name)
+                l = list(e.cmd.name)
 
             s = (
                 f'{l[0].split("/")[-1]}'
@@ -256,7 +256,7 @@ def _main() -> ta.Any:
         cmd = sel.cmd
         if isinstance(cmd, CliModule):
             sys.argv = [args.cmd, *(sel.args or ())]
-            runpy._run_module_as_main(cmd.mod_name)  # type: ignore  # noqa
+            runpy._run_module_as_main(cmd.module)  # type: ignore  # noqa
             return 0
 
         elif isinstance(cmd, CliFunc):