omdev 0.0.0.dev509__tar.gz → 0.0.0.dev511__tar.gz

{omdev-0.0.0.dev509/omdev.egg-info → omdev-0.0.0.dev511}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev509
+Version: 0.0.0.dev511
 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.dev509
+Requires-Dist: omlish==0.0.0.dev511
 Provides-Extra: all
 Requires-Dist: black~=26.1; extra == "all"
-Requires-Dist: pycparser~=2.23; 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,14 +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~=7.3; extra == "all"
+Requires-Dist: rich~=14.3; extra == "all"
+Requires-Dist: textual~=7.4; extra == "all"
 Requires-Dist: textual-dev~=1.8; extra == "all"
 Requires-Dist: textual-speedups~=0.2; extra == "all"
 Provides-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"
@@ -47,8 +47,8 @@ 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~=7.3; extra == "tui"
+Requires-Dist: rich~=14.3; extra == "tui"
+Requires-Dist: textual~=7.4; extra == "tui"
 Requires-Dist: textual-dev~=1.8; extra == "tui"
 Requires-Dist: textual-speedups~=0.2; extra == "tui"
 Dynamic: license-file

{omdev-0.0.0.dev509 → omdev-0.0.0.dev511}/omdev/.omlish-manifests.json

@@ -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",

{omdev-0.0.0.dev509 → omdev-0.0.0.dev511}/omdev/__about__.py

@@ -17,7 +17,7 @@ class Project(ProjectBase):
         ],
 
         'c': [
-            'pycparser ~= 2.23',
+            'pycparser ~= 3.0',
             'pcpp ~= 1.30',
         ],
 
@@ -43,8 +43,8 @@ class Project(ProjectBase):
         ],
 
         'tui': [
-            'rich ~= 14.2',
-            'textual ~= 7.3',  # [syntax]
+            'rich ~= 14.3',
+            'textual ~= 7.4',  # [syntax]
             'textual-dev ~= 1.8',
             'textual-speedups ~= 0.2',
         ],

omdev-0.0.0.dev511/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.dev509/omdev/clipboard → omdev-0.0.0.dev511/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.dev509/omdev/clipboard → omdev-0.0.0.dev511/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.dev509/omdev/clipboard/clipboard.py → omdev-0.0.0.dev511/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.dev511/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.dev511/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.dev511/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.dev511/omdev/dockerdev/helpers.py

@@ -0,0 +1,86 @@
+import io
+import tomllib
+import typing as ta
+
+from .content import Content
+from .content import Resource
+from .content import StaticEnv
+from .content import WithStaticEnv
+from .content import read_resource
+from .ops import Run
+from .ops import Section
+from .rendering import render_var_sections
+
+
+##
+
+
+def fragment_section(
+        name: str,
+        *,
+        static_env: StaticEnv | None = None,
+        cache_mounts: ta.Sequence[str] | None = None,
+) -> Section:
+    body: Content = Resource(f'fragments/{name}.sh')
+
+    if static_env is not None:
+        body = WithStaticEnv(body, static_env)
+
+    return Section(name, [
+        Run(
+            body,
+            cache_mounts=cache_mounts or None,
+        ),
+    ])
+
+
+##
+
+
+APT_CACHE_MOUNTS: ta.Sequence[str] = [
+    '/var/lib/apt/lists',
+    '/var/cache/apt',
+]
+
+
+def render_apt_install_deps() -> str:
+    out = io.StringIO()
+
+    dsl: list[tuple[str, ta.Sequence[str]]] = []
+
+    for dsn in [
+        'tools',
+        'python',
+    ]:
+        dso = tomllib.loads(read_resource(Resource(f'depsets/{dsn}.toml')))
+        dsl.append((dsn, sorted(set(dso['deps']))))
+
+    out.write(render_var_sections('DEPS', *dsl))
+    out.write('\n')
+
+    out.write('apt-get install -y $DEPS\n')
+
+    return out.getvalue()
+
+
+##
+
+
+def read_versions_file(file_path: str | None = None) -> ta.Mapping[str, str]:
+    if file_path is None:
+        file_path = '.versions'
+    with open(file_path) as f:
+        s = f.read()
+
+    return {
+        k.strip(): v.strip()
+        for l in s.splitlines()
+        for l in [l.split('#')[0].strip()]
+        if '=' in l
+        for k, _, v in [l.partition('=')]
+    }
+
+
+def read_versions_file_versions(*keys: str, file_path: str | None = None) -> ta.Mapping[str, str]:
+    dct = read_versions_file(file_path)
+    return {k: dct[k] for k in keys}

omdev-0.0.0.dev511/omdev/dockerdev/main.py

@@ -0,0 +1,156 @@
+"""
+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 Copy
+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'
+
+ZIG_VERSION = '0.15.2'
+GO_VERSION = '1.25.6'
+
+JDKS: ta.Sequence[str] = [
+    'zulu21-ca-jdk',
+    'zulu25-ca-jdk',
+]
+
+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(
+        '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()

omdev-0.0.0.dev511/omdev/dockerdev/ops.py

@@ -0,0 +1,69 @@
+import typing as ta
+
+from omlish import dataclasses as dc
+from omlish import lang
+
+from .content import Content
+
+
+##
+
+
+class Op(lang.Abstract):
+    pass
+
+
+@dc.dataclass(frozen=True)
+class From(Op):
+    spec: str
+
+
+@dc.dataclass(frozen=True)
+class Section(Op):
+    header: str | None
+    body: ta.Sequence[Op]
+
+
+@dc.dataclass(frozen=True)
+class Env(Op):
+    items: ta.Iterable[tuple[str, str]]
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class Copy(Op):
+    src: str
+    dst: str
+
+
+@dc.dataclass(frozen=True)
+class Write(Op):
+    path: str
+    content: Content
+
+    _: dc.KW_ONLY
+
+    append: bool = False
+
+
+@dc.dataclass(frozen=True)
+class Run(Op):
+    body: Content
+
+    _: dc.KW_ONLY
+
+    cache_mounts: ta.Sequence[str] | None = None
+
+
+@dc.dataclass(frozen=True)
+class Workdir(Op):
+    path: str
+
+
+@dc.dataclass(frozen=True)
+class Entrypoint(Op):
+    parts: ta.Sequence[str]
+
+
+@dc.dataclass(frozen=True)
+class Cmd(Op):
+    parts: ta.Sequence[str]