omdev 0.0.0.dev304__tar.gz → 0.0.0.dev306__tar.gz

{omdev-0.0.0.dev304/omdev.egg-info → omdev-0.0.0.dev306}/PKG-INFO

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

{omdev-0.0.0.dev304 → omdev-0.0.0.dev306}/omdev/.manifests.json

@@ -47,6 +47,18 @@
       }
     }
   },
+  {
+    "module": ".cmdlog.__main__",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/cmdlog/__main__.py",
+    "line": 4,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "cmdlog",
+        "mod_name": "omdev.cmdlog.__main__"
+      }
+    }
+  },
   {
     "module": ".imgur",
     "attr": "_FOO_CLI_MODULE",

{omdev-0.0.0.dev304 → omdev-0.0.0.dev306}/omdev/cache/data/specs.py

@@ -63,7 +63,7 @@ class UrlSpec(Spec):
 
     _: dc.KW_ONLY
 
-    headers: ta.Mapping[str, str] | None = dc.field(default=None) | msh.update_field_metadata(omit_if=operator.not_)
+    headers: ta.Mapping[str, str] | None = dc.field(default=None) | msh.with_field_metadata(omit_if=operator.not_)
 
     @cached.property
     def file_name_or_default(self) -> str:

omdev-0.0.0.dev306/omdev/cmdlog/__init__.py

@@ -0,0 +1,7 @@
+from ._cmdlog import (  # noqa
+    CmdLogEntry,
+)
+
+from .cmdlog import (  # noqa
+    CmdLog,
+)

omdev-0.0.0.dev306/omdev/cmdlog/__main__.py

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

omdev-0.0.0.dev306/omdev/cmdlog/_cmdlog.py

@@ -0,0 +1,73 @@
+# NOTE: not '@omlish-lite' due to root level __init__ imports, but effectively lite.
+import dataclasses as dc
+import fcntl
+import json
+import os.path
+import shutil
+import sys
+import time
+import typing as ta
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class CmdLogEntry:
+    cmd: str
+    pid: int
+    ppid: int
+    time: float
+    cwd: str
+
+    argv: ta.Sequence[str]
+    env: ta.Mapping[str, str]
+
+
+##
+
+
+LOG_FILE_ENV_VAR: str = '_CMD_LOG_FILE'
+
+
+def _main() -> None:
+    cmd = os.path.basename(sys.argv[0])
+
+    entry = CmdLogEntry(
+        cmd=cmd,
+        pid=os.getpid(),
+        ppid=os.getppid(),
+        time=time.time(),
+        cwd=os.getcwd(),
+
+        argv=sys.argv,
+        env=dict(os.environ),
+    )
+
+    entry_json = json.dumps(dc.asdict(entry), separators=(',', ':'), indent=None)
+
+    log_file = os.environ[LOG_FILE_ENV_VAR]
+    fd = os.open(log_file, os.O_WRONLY | os.O_CREAT | os.O_APPEND)
+    fcntl.flock(fd, fcntl.LOCK_EX)
+    os.write(fd, entry_json.encode() + b'\n')
+    os.close(fd)
+
+    u_ap = None  # type: str | None
+    self_ap = os.path.abspath(os.path.realpath(__file__))
+    for p in os.environ.get('PATH', '').split(os.pathsep):
+        if (p_cmd := shutil.which(cmd, path=p)) is None:
+            continue
+        p_ap = os.path.abspath(os.path.realpath(p_cmd))
+        if p_ap == self_ap:
+            continue
+        u_ap = p_ap
+        break
+
+    if u_ap is None:
+        raise FileNotFoundError(cmd)
+
+    os.execl(u_ap, cmd, *sys.argv[1:])
+
+
+if __name__ == '__main__':
+    _main()

omdev-0.0.0.dev306/omdev/cmdlog/cli.py

@@ -0,0 +1,67 @@
+import argparse
+import os.path
+import subprocess
+import sys
+import typing as ta
+
+from omlish.formats import json
+
+from .cmdlog import CmdLog
+
+
+##
+
+
+DEFAULT_PROXIED_CMDS: ta.Collection[str] = [
+    'ar',
+    'as',
+    'clang',
+    'clang++',
+    'g++',
+    'gcc',
+    'ld',
+    'lld',
+    'make',
+]
+
+
+def _main() -> None:
+    parser = argparse.ArgumentParser()
+    parser.add_argument('cmd', nargs=argparse.REMAINDER)
+    parser.add_argument('-l', '--log-file')
+    parser.add_argument('-P', '--print', action='store_true')
+    parser.add_argument('-p', '--proxy', action='append')
+    args = parser.parse_args()
+
+    if not args.cmd:
+        parser.error('Must specify cmd')
+        raise RuntimeError  # noqa
+
+    exec_cmd, *exec_argv = args.cmd
+
+    #
+
+    cl = CmdLog(
+        args.proxy if args.proxy is not None else DEFAULT_PROXIED_CMDS,
+        log_file=os.path.abspath(args.log_file) if args.log_file is not None else None,
+    )
+    cl.exe()
+    cl.proxy_cmds()
+
+    rc = subprocess.call(
+        [exec_cmd, *exec_argv],
+        env=cl.child_env(),
+    )
+
+    if args.log_file is None or args.print:
+        if os.path.exists(cl.log_file()):
+            with open(cl.log_file()) as f:
+                log_lines = f.readlines()
+            entry_dcts = [json.loads(sl) for l in log_lines if (sl := l.strip())]
+            print(json.dumps_compact(entry_dcts))
+
+    sys.exit(rc)
+
+
+if __name__ == '__main__':
+    _main()

omdev-0.0.0.dev306/omdev/cmdlog/cmdlog.py

@@ -0,0 +1,86 @@
+import inspect
+import os.path
+import sys
+import tempfile
+import typing as ta
+
+from omlish import cached
+from omlish import check
+
+from . import _cmdlog
+
+
+##
+
+
+class CmdLog:
+    def __init__(
+            self,
+            proxied_cmds: ta.Iterable[str],
+            *,
+            tmp_dir: str | None = None,
+            log_file: str | None = None,
+            exe_name: str | None = None,
+    ) -> None:
+        super().__init__()
+
+        self._proxied_cmds = {
+            check.non_empty_str(c)
+            for c in check.not_isinstance(proxied_cmds, str)
+        }
+
+        self._given_tmp_dir = tmp_dir
+        self._given_log_file = log_file
+        self._exe_name = check.non_empty_str(exe_name) if exe_name is not None else self.DEFAULT_EXE_NAME
+
+    #
+
+    @cached.function
+    def tmp_dir(self) -> str:
+        if (gtd := self._given_tmp_dir) is not None:
+            return gtd
+        return tempfile.mkdtemp()
+
+    #
+
+    DEFAULT_LOG_FILE_NAME: ta.ClassVar[str] = '_cmdlog.jsonl'
+
+    @cached.function
+    def log_file(self) -> str:
+        if (glf := self._given_log_file) is not None:
+            return glf
+        return os.path.join(self.tmp_dir(), self.DEFAULT_LOG_FILE_NAME)
+
+    #
+
+    DEFAULT_EXE_NAME: ta.ClassVar[str] = '_cmdlog.py'
+
+    @cached.function
+    def exe(self) -> str:
+        src = '\n'.join([
+            f'#!{os.path.abspath(sys.executable)}',
+            inspect.getsource(_cmdlog),
+        ])
+
+        exe = os.path.join(self.tmp_dir(), self._exe_name)
+
+        with open(exe, 'w') as f:
+            f.write(src)
+
+        os.chmod(exe, 0o550)  # noqa
+
+        return exe
+
+    #
+
+    def proxy_cmds(self) -> None:
+        for p_c in self._proxied_cmds:
+            os.symlink(self._exe_name, os.path.join(self.tmp_dir(), p_c))
+
+    #
+
+    def child_env(self) -> ta.Mapping[str, str]:
+        return {
+            _cmdlog.LOG_FILE_ENV_VAR: self.log_file(),
+            'PATH': os.pathsep.join([self.tmp_dir(), os.environ['PATH']]),
+        }

{omdev-0.0.0.dev304 → omdev-0.0.0.dev306/omdev.egg-info}/PKG-INFO

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

{omdev-0.0.0.dev304 → omdev-0.0.0.dev306}/omdev.egg-info/SOURCES.txt

@@ -124,6 +124,11 @@ omdev/clipboard/__init__.py
 omdev/clipboard/clipboard.py
 omdev/clipboard/darwin_cf.py
 omdev/clipboard/linux_x11.py
+omdev/cmdlog/__init__.py
+omdev/cmdlog/__main__.py
+omdev/cmdlog/_cmdlog.py
+omdev/cmdlog/cli.py
+omdev/cmdlog/cmdlog.py
 omdev/dataserver/__init__.py
 omdev/dataserver/handlers.py
 omdev/dataserver/http.py

{omdev-0.0.0.dev304 → omdev-0.0.0.dev306}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev304
+omlish==0.0.0.dev306
 
 [all]
 black~=25.1

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