omdev 0.0.0.dev493__tar.gz → 0.0.0.dev518__tar.gz

{omdev-0.0.0.dev493/omdev.egg-info → omdev-0.0.0.dev518}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev493
+Version: 0.0.0.dev518
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,10 +14,10 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev493
+Requires-Dist: omlish==0.0.0.dev518
 Provides-Extra: all
-Requires-Dist: black~=25.12; extra == "all"
-Requires-Dist: pycparser~=2.23; extra == "all"
+Requires-Dist: black~=26.1; extra == "all"
+Requires-Dist: pycparser~=3.0; extra == "all"
 Requires-Dist: pcpp~=1.30; extra == "all"
 Requires-Dist: docutils~=0.22; extra == "all"
 Requires-Dist: markdown-it-py~=4.0; extra == "all"
@@ -26,13 +26,14 @@ Requires-Dist: pygments~=2.19; extra == "all"
 Requires-Dist: mypy~=1.19; extra == "all"
 Requires-Dist: gprof2dot~=2025.4; extra == "all"
 Requires-Dist: segno~=1.6; extra == "all"
-Requires-Dist: rich~=14.2; extra == "all"
-Requires-Dist: textual~=6.11; extra == "all"
+Requires-Dist: rich~=14.3; extra == "all"
+Requires-Dist: textual~=7.5; extra == "all"
 Requires-Dist: textual-dev~=1.8; extra == "all"
+Requires-Dist: textual-speedups~=0.2; extra == "all"
 Provides-Extra: black
-Requires-Dist: black~=25.12; extra == "black"
+Requires-Dist: black~=26.1; extra == "black"
 Provides-Extra: c
-Requires-Dist: pycparser~=2.23; extra == "c"
+Requires-Dist: pycparser~=3.0; extra == "c"
 Requires-Dist: pcpp~=1.30; extra == "c"
 Provides-Extra: doc
 Requires-Dist: docutils~=0.22; extra == "doc"
@@ -46,9 +47,10 @@ Requires-Dist: gprof2dot~=2025.4; extra == "prof"
 Provides-Extra: qr
 Requires-Dist: segno~=1.6; extra == "qr"
 Provides-Extra: tui
-Requires-Dist: rich~=14.2; extra == "tui"
-Requires-Dist: textual~=6.11; extra == "tui"
+Requires-Dist: rich~=14.3; extra == "tui"
+Requires-Dist: textual~=7.5; extra == "tui"
 Requires-Dist: textual-dev~=1.8; extra == "tui"
+Requires-Dist: textual-speedups~=0.2; extra == "tui"
 Dynamic: license-file
 
 # Overview

{omdev-0.0.0.dev493 → omdev-0.0.0.dev518}/omdev/.omlish-manifests.json

@@ -27,7 +27,7 @@
     "module": ".cexts.cmake",
     "attr": "_CLI_MODULE",
     "file": "omdev/cexts/cmake.py",
-    "line": 335,
+    "line": 375,
     "value": {
       "!.cli.types.CliModule": {
         "name": "cmake",
@@ -341,7 +341,7 @@
     "module": ".tools.docker",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/docker.py",
-    "line": 271,
+    "line": 288,
     "value": {
       "!.cli.types.CliModule": {
         "name": "docker",
@@ -527,7 +527,7 @@
     "module": ".tools.sqlrepl",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/sqlrepl.py",
-    "line": 196,
+    "line": 307,
     "value": {
       "!.cli.types.CliModule": {
         "name": "sqlrepl",

{omdev-0.0.0.dev493 → omdev-0.0.0.dev518}/omdev/__about__.py

@@ -13,11 +13,11 @@ class Project(ProjectBase):
 
     optional_dependencies = {
         'black': [
-            'black ~= 25.12',
+            'black ~= 26.1',
         ],
 
         'c': [
-            'pycparser ~= 2.23',
+            'pycparser ~= 3.0',
             'pcpp ~= 1.30',
         ],
 
@@ -43,9 +43,10 @@ class Project(ProjectBase):
         ],
 
         'tui': [
-            'rich ~= 14.2',
-            'textual ~= 6.11',  # [syntax]
+            'rich ~= 14.3',
+            'textual ~= 7.5',  # [syntax]
             'textual-dev ~= 1.8',
+            'textual-speedups ~= 0.2',
         ],
     }
 

{omdev-0.0.0.dev493 → omdev-0.0.0.dev518}/omdev/amalg/cli/main.py

@@ -58,6 +58,7 @@ def _gen_one(
     ).gen_amalg()
 
     if output_path is not None:
+        os.makedirs(os.path.dirname(output_path), exist_ok=True)
         with open(output_path, 'w') as f:
             f.write(src)
 

{omdev-0.0.0.dev493 → omdev-0.0.0.dev518}/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.with_field_metadata(omit_if=operator.not_)
+    headers: ta.Mapping[str, str] | None = dc.field(default=None) | msh.with_field_options(omit_if=operator.not_)
 
     @cached.property
     def file_name_or_default(self) -> str:

{omdev-0.0.0.dev493 → omdev-0.0.0.dev518}/omdev/cexts/cmake.py

@@ -55,6 +55,33 @@ log = logs.get_module_logger(globals())
 ##
 
 
+CLANG_TIDY_COMMAND_TEMPLATE = """
+find_program(CLANG_TIDY_EXE NAMES clang-tidy)
+
+if(CLANG_TIDY_EXE)
+    add_custom_target(tidy
+        COMMAND ${CLANG_TIDY_EXE}
+            -p ${CMAKE_BINARY_DIR}
+            ${ALL_SOURCE_FILES}
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        COMMENT "Running clang-tidy on all source files"
+    )
+
+    add_custom_target(tidy-fix
+        COMMAND ${CLANG_TIDY_EXE}
+            -p ${CMAKE_BINARY_DIR}
+            -fix
+            ${ALL_SOURCE_FILES}
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        COMMENT "Running clang-tidy with automatic fixes"
+    )
+endif()
+"""
+
+
+##
+
+
 def _sep_str_grps(*ls: ta.Sequence[str]) -> list[str]:
     o = []
     for i, l in enumerate(ls):
@@ -112,6 +139,15 @@ class CmakeProjectGen:
         with open(os.path.join(self.cmake_dir(), '.gitignore'), 'w') as f:
             f.write('\n'.join(sorted(['/cmake-*', '/build'])))
 
+    def add_root_symlinks(self) -> None:
+        for fn in [
+            '.clang-tidy',
+        ]:
+            check.state(os.path.isfile(sfp := os.path.abspath(os.path.join(self._prj_root, fn))))
+            dfp = os.path.join(self.cmake_dir(), fn)
+            rp = os.path.relpath(os.path.abspath(sfp), self.cmake_dir())
+            os.symlink(rp, dfp)
+
     #
 
     @dc.dataclass(frozen=True, kw_only=True)
@@ -218,7 +254,7 @@ class CmakeProjectGen:
                         ['TARGET', ext_name, 'POST_BUILD'],
                         [
                             ' '.join([
-                                'COMMAND ${CMAKE_COMMAND} -E ',
+                                'COMMAND ${CMAKE_COMMAND} -E',
                                 f'copy $<TARGET_FILE_NAME:{ext_name}> ../../../{os.path.dirname(ext_src)}/{so_name}',
                             ]),
                             'COMMAND_EXPAND_LISTS',
@@ -235,6 +271,9 @@ class CmakeProjectGen:
             self.g.write(f'project({self.p.prj_name()})')
             self.g.write('')
 
+            self.g.write('set(CMAKE_EXPORT_COMPILE_COMMANDS ON)')
+            self.g.write('')
+
             self.g.write_var(cmake.Var(
                 f'{self.var_prefix}_INCLUDE_DIRECTORIES',
                 _sep_str_grps(
@@ -309,6 +348,7 @@ class CmakeProjectGen:
 
         self.cmake_dir()
         self.write_git_ignore()
+        self.add_root_symlinks()
 
         out = io.StringIO()
         clg = self._CmakeListsGen(self, out)

omdev-0.0.0.dev518/omdev/clipboard/__init__.py

@@ -0,0 +1,18 @@
+from .commands import (  # noqa
+    TextCommandClipboard,
+
+    XclipLinuxClipboard,
+    PbcopyDarwinClipboard,
+)
+
+from .types import (  # noqa
+    ClipboardContents,
+    TextClipboardContents,
+    ImageClipboardContents,
+
+    Clipboard,
+)
+
+from .platform import (  # noqa
+    get_platform_clipboard,
+)

{omdev-0.0.0.dev493/omdev/clipboard → omdev-0.0.0.dev518/omdev/clipboard/capi}/darwin_cf.py

@@ -3,12 +3,12 @@ import ctypes as ct
 import dataclasses as dc
 import typing as ta
 
-from ..capi.darwin import aps
-from ..capi.darwin import cf
-from .clipboard import Clipboard
-from .clipboard import ClipboardContents
-from .clipboard import ImageClipboardContents
-from .clipboard import TextClipboardContents
+from ...capi.darwin import aps
+from ...capi.darwin import cf
+from ..types import Clipboard
+from ..types import ClipboardContents
+from ..types import ImageClipboardContents
+from ..types import TextClipboardContents
 
 
 ##

{omdev-0.0.0.dev493/omdev/clipboard → omdev-0.0.0.dev518/omdev/clipboard/capi}/linux_x11.py

@@ -2,7 +2,7 @@
 # flake8: noqa: E302 E305
 import ctypes as ct
 
-from ..capi.linux import x11
+from ...capi.linux import x11
 
 
 ##

omdev-0.0.0.dev493/omdev/clipboard/clipboard.py → omdev-0.0.0.dev518/omdev/clipboard/commands.py

@@ -1,42 +1,12 @@
-""" https://askubuntu.com/questions/11925/a-command-line-clipboard-copy-and-paste-utility
-"""
 import abc
-import dataclasses as dc
 import subprocess
 import typing as ta
 
 from omlish import lang
 
-
-##
-
-
-@dc.dataclass(frozen=True)
-class ClipboardContents(lang.Abstract):
-    pass
-
-
-@dc.dataclass(frozen=True)
-class TextClipboardContents(ClipboardContents):
-    s: str
-
-
-@dc.dataclass(frozen=True)
-class ImageClipboardContents(ClipboardContents):
-    b: bytes
-
-
-##
-
-
-class Clipboard(lang.Abstract):
-    @abc.abstractmethod
-    def get(self) -> list[ClipboardContents]:
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def put(self, c: ClipboardContents) -> None:
-        raise NotImplementedError
+from .types import Clipboard
+from .types import ClipboardContents
+from .types import TextClipboardContents
 
 
 ##
@@ -64,6 +34,9 @@ class TextCommandClipboard(Clipboard, lang.Abstract):
             raise TypeError(c)
 
 
+#
+
+
 class XclipLinuxClipboard(TextCommandClipboard):
     _get_cmd = ('xclip', '-selection', 'clipboard', '-o')
     _put_cmd = ('xclip', '-selection', 'clipboard')

omdev-0.0.0.dev518/omdev/clipboard/platform.py

@@ -0,0 +1,21 @@
+import platform
+
+from omlish import lang
+
+from .commands import PbcopyDarwinClipboard
+from .commands import XclipLinuxClipboard
+from .types import Clipboard
+
+
+##
+
+
+@lang.cached_function
+def get_platform_clipboard() -> Clipboard | None:
+    match platform.system():
+        case 'Darwin':
+            return PbcopyDarwinClipboard()
+        case 'Linux':
+            return XclipLinuxClipboard()
+        case _:
+            return None

omdev-0.0.0.dev518/omdev/clipboard/types.py

@@ -0,0 +1,38 @@
+"""
+https://askubuntu.com/questions/11925/a-command-line-clipboard-copy-and-paste-utility
+"""
+import abc
+import dataclasses as dc
+
+from omlish import lang
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class ClipboardContents(lang.Abstract):
+    pass
+
+
+@dc.dataclass(frozen=True)
+class TextClipboardContents(ClipboardContents):
+    s: str
+
+
+@dc.dataclass(frozen=True)
+class ImageClipboardContents(ClipboardContents):
+    b: bytes
+
+
+##
+
+
+class Clipboard(lang.Abstract):
+    @abc.abstractmethod
+    def get(self) -> list[ClipboardContents]:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def put(self, c: ClipboardContents) -> None:
+        raise NotImplementedError

{omdev-0.0.0.dev493 → omdev-0.0.0.dev518}/omdev/dataclasses/_dumping.py

@@ -38,7 +38,7 @@ def __omlish_amalg__():  # noqa
     return dict(
         src_files=[
             dict(path='../../omlish/lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
-            dict(path='../../omlish/lite/check.py', sha1='bb6b6b63333699b84462951a854d99ae83195b94'),
+            dict(path='../../omlish/lite/check.py', sha1='7996e893097b9318089017b1342c9965d4024eb0'),
             dict(path='../../omlish/lite/json.py', sha1='57eeddc4d23a17931e00284ffa5cb6e3ce089486'),
             dict(path='../../omlish/lite/objects.py', sha1='9566bbf3530fd71fcc56321485216b592fae21e9'),
             dict(path='../../omlish/lite/reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
@@ -554,6 +554,63 @@ class Checks:
 
         raise RuntimeError  # noqa
 
+    async def async_single(self, obj: ta.AsyncIterable[T], msg: CheckMessage = None) -> T:
+        ait = obj.__aiter__()
+
+        try:
+            try:
+                value = await ait.__anext__()
+            except StopAsyncIteration:
+                pass
+
+            else:
+                try:
+                    await ait.__anext__()
+                except StopAsyncIteration:
+                    return value
+
+        finally:
+            if inspect.isasyncgen(ait):
+                await ait.aclose()
+
+        self._raise(
+            ValueError,
+            'Must be single',
+            msg,
+            Checks._ArgsKwargs(obj),
+            render_fmt='%s',
+        )
+
+        raise RuntimeError  # noqa
+
+    async def async_opt_single(self, obj: ta.AsyncIterable[T], msg: CheckMessage = None) -> ta.Optional[T]:
+        ait = obj.__aiter__()
+
+        try:
+            try:
+                value = await ait.__anext__()
+            except StopAsyncIteration:
+                return None
+
+            try:
+                await ait.__anext__()
+            except StopAsyncIteration:
+                return value  # noqa
+
+        finally:
+            if inspect.isasyncgen(ait):
+                await ait.aclose()
+
+        self._raise(
+            ValueError,
+            'Must be empty or single',
+            msg,
+            Checks._ArgsKwargs(obj),
+            render_fmt='%s',
+        )
+
+        raise RuntimeError  # noqa
+
     #
 
     def none(self, v: ta.Any, msg: CheckMessage = None) -> None:

omdev-0.0.0.dev518/omdev/dockerdev/content.py

@@ -0,0 +1,57 @@
+# ruff: noqa: UP007
+import typing as ta
+
+from omlish import dataclasses as dc
+from omlish import lang
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class Resource:
+    path: str
+
+
+def read_resource(r: Resource) -> str:
+    d, _, f = r.path.rpartition('/')
+    p = 'resources'
+    if d:
+        p = '.'.join([p, *d.split('/')])
+    rs = lang.get_relative_resources(p, globals=globals())
+    return rs[f].read_text()
+
+
+#
+
+
+StaticEnv: ta.TypeAlias = ta.Union[
+    ta.Mapping[str, str | ta.Sequence[str]],
+    ta.Callable[[], ta.Mapping[str, str | ta.Sequence[str]]],
+]
+
+
+@dc.dataclass(frozen=True)
+class WithStaticEnv:
+    body: 'Content'
+    env: StaticEnv
+
+
+#
+
+
+@dc.dataclass(frozen=True)
+class LazyContent:
+    fn: ta.Callable[[], 'Content']
+
+
+#
+
+
+Content: ta.TypeAlias = ta.Union[
+    str,
+    Resource,
+    WithStaticEnv,
+    LazyContent,
+    ta.Sequence['Content'],
+]

omdev-0.0.0.dev518/omdev/dockerdev/gen.py

@@ -0,0 +1,166 @@
+"""
+docker run --rm -it "$(docker build -q -f x/dockerdev/Dockerfile .)" bash
+"""
+import io
+import typing as ta
+
+from .content import LazyContent
+from .content import Resource
+from .helpers import APT_CACHE_MOUNTS
+from .helpers import fragment_section
+from .helpers import read_versions_file_versions
+from .helpers import render_apt_install_deps
+from .ops import Cmd
+from .ops import Entrypoint
+from .ops import Env
+from .ops import From
+from .ops import Op
+from .ops import Run
+from .ops import Section
+from .ops import Workdir
+from .ops import Write
+from .rendering import render_op
+
+
+##
+
+
+BASE_IMAGE = 'ubuntu:24.04'
+
+JDKS: ta.Sequence[str] = [
+    'zulu21-ca-jdk',
+    'zulu25-ca-jdk',
+]
+
+GO_VERSION = '1.25.6'
+ZIG_VERSION = '0.15.2'
+
+NVM_VERSIONS: ta.Sequence[str] = [
+    '20',
+    '22',
+    '25',
+]
+
+PYENV_VERSION_KEYS: ta.Sequence[str] = [
+    '8',
+    '13',
+    '14',
+]
+
+CONFIG_FILES: ta.Sequence[str] = [
+    '.gdbinit',
+    '.tmux.conf',
+    '.vimrc',
+]
+
+WORKDIR = '/omlish'
+
+
+#
+
+
+OPS: ta.Sequence[Op] = [
+    From(BASE_IMAGE),
+
+    # Section('timestamp', [
+    #     Copy(src='docker/.timestamp', dst='/'),
+    # ]),
+
+    Section('locale', [
+        Env([
+            ('LANG', 'en_US.UTF-8'),
+            ('LANGUAGE', 'en_US:en'),
+            ('LC_ALL', 'en_US.UTF-8'),
+        ]),
+    ]),
+
+    Section('deps', [
+        Run(
+            [
+                Resource('fragments/apt.sh'),
+                LazyContent(render_apt_install_deps),
+            ],
+            cache_mounts=APT_CACHE_MOUNTS,
+        ),
+    ]),
+
+    fragment_section(
+        'firefox',
+        cache_mounts=APT_CACHE_MOUNTS,
+    ),
+
+    fragment_section(
+        'docker',
+        cache_mounts=APT_CACHE_MOUNTS,
+    ),
+
+    fragment_section(
+        'jdk',
+        static_env={'JDKS': JDKS},
+        cache_mounts=APT_CACHE_MOUNTS,
+    ),
+
+    fragment_section('rustup'),
+
+    fragment_section(
+        'go',
+        static_env={'GO_VERSION': GO_VERSION},
+    ),
+
+    fragment_section(
+        'zig',
+        static_env={'ZIG_VERSION': ZIG_VERSION},
+    ),
+
+    fragment_section('vcpkg'),
+
+    fragment_section(
+        'nvm',
+        static_env={'NVM_VERSIONS': NVM_VERSIONS},
+    ),
+
+    fragment_section(
+        'pyenv',
+        static_env=lambda: {
+            'PYENV_VERSIONS': list(read_versions_file_versions(*[
+                f'PYTHON_{k}' for k in PYENV_VERSION_KEYS
+            ]).values()),
+        },
+        cache_mounts=['/root/.pyenv_cache'],
+    ),
+
+    fragment_section('sshd'),
+
+    # Section('x11', [
+    #     Run('touch /root/.Xauthority'),
+    #     Write('/root/xu', Resource('xu')),
+    # ]),
+
+    Section('configs', [
+        Write(f'/root/{n}', Resource(f'configs/{n}'))
+        for n in CONFIG_FILES
+    ]),
+
+    Section('entrypoint', [
+        Workdir(WORKDIR),
+        Entrypoint(['dumb-init', '--']),
+        Cmd(['sh', '-c', 'echo "Ready" && sleep infinity']),
+    ]),
+]
+
+
+##
+
+
+def _main() -> None:
+    out = io.StringIO()
+    for i, section in enumerate(OPS):
+        if i:
+            out.write('\n\n\n')
+        out.write(render_op(section))
+
+    print(out.getvalue())
+
+
+if __name__ == '__main__':
+    _main()