omdev 0.0.13__tar.gz → 0.0.14__tar.gz

{omdev-0.0.13/omdev.egg-info → omdev-0.0.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.13
+Version: 0.0.14
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,10 +14,10 @@ Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.13
+Requires-Dist: omlish==0.0.14
 Provides-Extra: all
-Requires-Dist: ominfra==0.0.13; extra == "all"
-Requires-Dist: ommlds==0.0.13; extra == "all"
+Requires-Dist: ominfra==0.0.14; extra == "all"
+Requires-Dist: ommlds==0.0.14; extra == "all"
 Requires-Dist: black~=26.3; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"
 Requires-Dist: pcpp~=1.30; extra == "all"
@@ -33,9 +33,9 @@ Requires-Dist: textual~=8.2; extra == "all"
 Requires-Dist: textual-dev~=1.8; extra == "all"
 Requires-Dist: textual-speedups~=0.2; extra == "all"
 Provides-Extra: ominfra
-Requires-Dist: ominfra==0.0.13; extra == "ominfra"
+Requires-Dist: ominfra==0.0.14; extra == "ominfra"
 Provides-Extra: ommlds
-Requires-Dist: ommlds==0.0.13; extra == "ommlds"
+Requires-Dist: ommlds==0.0.14; extra == "ommlds"
 Provides-Extra: black
 Requires-Dist: black~=26.3; extra == "black"
 Provides-Extra: c

{omdev-0.0.13 → omdev-0.0.14}/omdev/dockerdev/config.py

@@ -6,13 +6,17 @@ from omlish import dataclasses as dc
 ##
 
 
+DEFAULT_UID = 4317
+DEFAULT_GID = DEFAULT_UID
+
+
 @dc.dataclass(frozen=True)
 class Config:
     base_image: str
 
     user: str | None = None
-    uid: int = 2000
-    gid: int = 2000
+    uid: int = DEFAULT_UID
+    gid: int = DEFAULT_GID
 
     workdir: str | None = None
 

{omdev-0.0.13 → omdev-0.0.14}/omdev/dockerdev/gen.py

@@ -4,6 +4,7 @@ TODO:
  - install pnpm
 """
 import io
+import re
 import typing as ta
 
 from omlish import lang
@@ -26,6 +27,7 @@ from .ops import Section
 from .ops import User
 from .ops import Workdir
 from .ops import Write
+from .rendering import RenderContext
 from .rendering import render_op
 
 
@@ -70,9 +72,9 @@ def gen_ops(cfg: Config) -> ta.Sequence[Op]:
                 WithStaticEnv(
                     Resource('fragments/user.sh'),
                     {
-                        'NEWUSER': cfg.user,
-                        'NEWUID': str(cfg.uid),
-                        'NEWGID': str(cfg.gid),
+                        'NEW_USER': cfg.user,
+                        'NEW_UID': str(cfg.uid),
+                        'NEW_GID': str(cfg.gid),
                     },
                 ),
             ),
@@ -136,6 +138,27 @@ def gen_ops(cfg: Config) -> ta.Sequence[Op]:
         cache_mount_args=[f'uid={cfg.uid}', f'gid={cfg.gid}'],
     ))
 
+    ##
+    # ownership
+
+    if cfg.workdir is not None:
+        ops.append(fragment_section(
+            'workdir',
+            static_env={
+                'WORKDIR': cfg.workdir,
+            },
+        ))
+
+    ops.append(fragment_section(
+        'chgrp',
+        static_env={
+            'CHGRP_ROOTS': [
+                home,
+                *([cfg.workdir] if cfg.workdir is not None else []),
+            ],
+        },
+    ))
+
     ##
     # config
 
@@ -167,13 +190,32 @@ def gen_ops(cfg: Config) -> ta.Sequence[Op]:
     return ops
 
 
+##
+
+
+RESOURCE_PREAMBLES: ta.Sequence[tuple[re.Pattern, ta.Sequence[str]]] = [
+    (re.compile(r'.*\.sh$'), [
+        'set -ex ;',
+        'umask 0002 ;',
+    ]),
+]
+
+
+WRITE_CHMOD = '664'
+
+
 def gen_src(cfg: Config) -> str:
     ops = gen_ops(cfg)
 
+    ctx = RenderContext(
+        resource_preambles=RESOURCE_PREAMBLES,
+        write_chmod=WRITE_CHMOD,
+    )
+
     out = io.StringIO()
     for i, section in enumerate(ops):
         if i:
             out.write('\n\n\n')
-        out.write(render_op(section))
+        out.write(render_op(section, ctx))
 
     return out.getvalue()

{omdev-0.0.13 → omdev-0.0.14}/omdev/dockerdev/ops.py

@@ -34,6 +34,11 @@ class User(Op):
     user: str
 
 
+@dc.dataclass(frozen=True)
+class Shell(Op):
+    parts: ta.Sequence[str]
+
+
 @dc.dataclass(frozen=True, kw_only=True)
 class Copy(Op):
     src: str

{omdev-0.0.13 → omdev-0.0.14}/omdev/dockerdev/rendering.py

@@ -2,10 +2,12 @@ import collections.abc
 import functools
 import io
 import json
+import re
 import shlex
 import typing as ta
 
 from omlish import check
+from omlish import dataclasses as dc
 
 from .content import Content
 from .content import LazyContent
@@ -20,6 +22,7 @@ from .ops import From
 from .ops import Op
 from .ops import Run
 from .ops import Section
+from .ops import Shell
 from .ops import User
 from .ops import Workdir
 from .ops import Write
@@ -31,27 +34,44 @@ from .ops import Write
 INDENT = ' ' * 2
 
 
+##
+# Context
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class RenderContext:
+    resource_preambles: ta.Sequence[tuple[re.Pattern, ta.Sequence[str]]] | None = None
+
+    write_chmod: str | None = None
+
+
 ##
 # Content
 
 
 @functools.singledispatch
-def render_content(c: Content) -> str:
+def render_content(c: Content, ctx: RenderContext) -> str:
     raise TypeError(c)
 
 
 @render_content.register(str)
-def render_str(c: str) -> str:
+def render_str(c: str, ctx: RenderContext) -> str:
     return c
 
 
 @render_content.register(Resource)
-def render_resource(c: Resource) -> str:
-    return read_resource(c)
+def render_resource(c: Resource, ctx: RenderContext) -> str:
+    s = read_resource(c)
+
+    for pat, lines in ctx.resource_preambles or []:
+        if lines and pat.match(c.path):
+            s = '\n'.join([*lines, '', s])
+
+    return s
 
 
 @render_content.register(WithStaticEnv)
-def render_with_static_env(c: WithStaticEnv) -> str:
+def render_with_static_env(c: WithStaticEnv, ctx: RenderContext) -> str:
     out = io.StringIO()
 
     if c.env:
@@ -72,19 +92,19 @@ def render_with_static_env(c: WithStaticEnv) -> str:
 
         out.write('\\\n')
 
-    out.write(render_content(c.body))
+    out.write(render_content(c.body, ctx))
 
     return out.getvalue()
 
 
 @render_content.register(LazyContent)
-def render_lazy_content(c: LazyContent) -> str:
-    return render_content(c.fn())
+def render_lazy_content(c: LazyContent, ctx: RenderContext) -> str:
+    return render_content(c.fn(), ctx)
 
 
 @render_content.register(collections.abc.Sequence)
-def render_sequence_content(c: ta.Sequence[Content]) -> str:
-    return '\n'.join([render_content(cc) for cc in c])
+def render_sequence_content(c: ta.Sequence[Content], ctx: RenderContext) -> str:
+    return '\n'.join([render_content(cc, ctx) for cc in c])
 
 
 ##
@@ -147,17 +167,17 @@ def render_var_sections(
 
 
 @functools.singledispatch
-def render_op(op: Op) -> str:
+def render_op(op: Op, ctx: RenderContext) -> str:
     raise TypeError(op)
 
 
 @render_op.register(From)
-def render_from(op: From) -> str:
+def render_from(op: From, ctx: RenderContext) -> str:
     return f'FROM {op.spec}'
 
 
 @render_op.register(Section)
-def render_section(op: Section) -> str:
+def render_section(op: Section, ctx: RenderContext) -> str:
     out = io.StringIO()
 
     out.write(f'## {op.header or ""}'.strip())
@@ -167,13 +187,13 @@ def render_section(op: Section) -> str:
         if i:
             out.write('\n')
         out.write('\n')
-        out.write(render_op(c))
+        out.write(render_op(c, ctx))
 
     return out.getvalue()
 
 
 @render_op.register(Env)
-def render_env(op: Env) -> str:
+def render_env(op: Env, ctx: RenderContext) -> str:
     return '\n'.join([
         f'ENV {k}={v}'
         for k, v in op.items
@@ -181,22 +201,27 @@ def render_env(op: Env) -> str:
 
 
 @render_op.register(User)
-def render_user(op: User) -> str:
+def render_user(op: User, ctx: RenderContext) -> str:
     return f'USER {op.user}'
 
 
+@render_op.register(Shell)
+def render_shell(op: Shell, ctx: RenderContext) -> str:
+    return f'SHELL {render_cmd_parts(*op.parts)}'
+
+
 @render_op.register(Copy)
-def render_copy(op: Copy) -> str:
+def render_copy(op: Copy, ctx: RenderContext) -> str:
     return f'COPY {op.src} {op.dst}'
 
 
 @render_op.register(Write)
-def render_write(op: Write) -> str:
+def render_write(op: Write, ctx: RenderContext) -> str:
     out = io.StringIO()
 
     out.write("RUN echo '\\\n")
 
-    c = render_content(op.content)
+    c = render_content(op.content, ctx)
     s = sh_quote(c)[1:-1]
     for l in s.splitlines(keepends=True):
         # l = l.replace('$', '\\$')
@@ -207,13 +232,16 @@ def render_write(op: Write) -> str:
             out.write(l)
             out.write('\\\n')
 
-    out.write(f"' {'>>' if op.append else '>'} {op.path}")
+    last = f"' {'>>' if op.append else '>'} {op.path}"
+    if ctx.write_chmod is not None:
+        last += f' && chmod {ctx.write_chmod} {op.path}'
+    out.write(last)
 
     return out.getvalue()
 
 
 @render_op.register(Run)
-def render_run(op: Run) -> str:
+def render_run(op: Run, ctx: RenderContext) -> str:
     out = io.StringIO()
 
     if op.cache_mounts:
@@ -233,7 +261,7 @@ def render_run(op: Run) -> str:
     else:
         out.write('RUN (\\\n')
 
-    s = render_content(op.body)
+    s = render_content(op.body, ctx)
     for l in s.strip().splitlines():
         out.write(l)
         if not l.rstrip().endswith('\\'):
@@ -246,15 +274,15 @@ def render_run(op: Run) -> str:
 
 
 @render_op.register(Workdir)
-def render_workdir(op: Workdir) -> str:
+def render_workdir(op: Workdir, ctx: RenderContext) -> str:
     return f'WORKDIR {op.path}'
 
 
 @render_op.register(Entrypoint)
-def render_entrypoint(op: Entrypoint) -> str:
+def render_entrypoint(op: Entrypoint, ctx: RenderContext) -> str:
     return f'ENTRYPOINT {render_cmd_parts(*op.parts)}'
 
 
 @render_op.register(Cmd)
-def render_cmd(op: Cmd) -> str:
+def render_cmd(op: Cmd, ctx: RenderContext) -> str:
     return f'CMD {render_cmd_parts(*op.parts)}'

{omdev-0.0.13 → omdev-0.0.14}/omdev/dockerdev/resources/depsets/system.toml

@@ -6,9 +6,13 @@ deps = [
 
   # base system
   'dumb-init',
+  'gosu',
   'lsb-release',
   'sudo',
 
+  # filesystem
+  'bindfs',
+
   # networking & network diagnostics
   'aria2',
   'bmon',

{omdev-0.0.13 → omdev-0.0.14}/omdev/dockerdev/resources/fragments/apt.sh

@@ -1,5 +1,3 @@
-set -ex ;
-
 rm -f /etc/apt/apt.conf.d/docker-clean ;
 rm -f /etc/dpkg/dpkg.cfg.d/excludes ;
 

omdev-0.0.14/omdev/dockerdev/resources/fragments/chgrp.sh

@@ -0,0 +1,3 @@
+for D in ${CHGRP_ROOTS} ; do
+  chgrp -R $(id -g) "$D" && chmod -R g=u "$D" ;
+done ;

{omdev-0.0.13 → omdev-0.0.14}/omdev/dockerdev/resources/fragments/docker.sh

@@ -1,5 +1,3 @@
-set -ex ;
-
 mkdir -p /etc/apt/keyrings ;
 curl -fsSL 'https://download.docker.com/linux/ubuntu/gpg' | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg ;
 echo \

{omdev-0.0.13 → omdev-0.0.14}/omdev/dockerdev/resources/fragments/firefox.sh

@@ -1,5 +1,3 @@
-set -ex ;
-
 sudo add-apt-repository ppa:mozillateam/ppa ;
 
 echo "

{omdev-0.0.13 → omdev-0.0.14}/omdev/dockerdev/resources/fragments/go.sh

@@ -1,5 +1,3 @@
-set -ex ;
-
 GO_VERSION=$(curl -fsSL 'https://go.dev/VERSION?m=text' | head -n1 | sed 's/^go//') ;
 
 curl -fsSL "https://go.dev/dl/go${GO_VERSION}.linux-$(dpkg --print-architecture).tar.gz" | tar -C "$HOME" -xzf - ;

{omdev-0.0.13 → omdev-0.0.14}/omdev/dockerdev/resources/fragments/jdk.sh

@@ -1,5 +1,3 @@
-set -ex ;
-
 sudo apt install gnupg ca-certificates curl ;
 curl -s 'https://repos.azul.com/azul-repo.key' | sudo gpg --dearmor -o /usr/share/keyrings/azul.gpg ;
 echo "deb [signed-by=/usr/share/keyrings/azul.gpg] https://repos.azul.com/zulu/deb stable main" | sudo tee /etc/apt/sources.list.d/zulu.list ;

{omdev-0.0.13 → omdev-0.0.14}/omdev/dockerdev/resources/fragments/man.sh

@@ -1,3 +1 @@
-set -ex ;
-
 yes | sudo unminimize ;

{omdev-0.0.13 → omdev-0.0.14}/omdev/dockerdev/resources/fragments/nvm.sh

@@ -1,5 +1,3 @@
-set -ex ;
-
 NVM_VERSION=$(
   curl -fsSL -o /dev/null -w '%{url_effective}' 'https://github.com/nvm-sh/nvm/releases/latest' |
   sed 's#.*\/tag/##'

{omdev-0.0.13 → omdev-0.0.14}/omdev/dockerdev/resources/fragments/pyenv.sh

@@ -1,5 +1,3 @@
-set -ex ;
-
 git clone 'https://github.com/pyenv/pyenv' ~/.pyenv ;
 
 for V in ${PYENV_VERSIONS} ; do

{omdev-0.0.13 → omdev-0.0.14}/omdev/dockerdev/resources/fragments/rbenv.sh

@@ -1,5 +1,3 @@
-set -ex ;
-
 curl -fsSL 'https://rbenv.org/install.sh' | bash ;
 
 for RV in ${RBENV_VERSIONS}; do

{omdev-0.0.13 → omdev-0.0.14}/omdev/dockerdev/resources/fragments/rust.sh

@@ -1,5 +1,3 @@
-set -ex ;
-
 curl --proto '=https' --tlsv1.2 -sSf 'https://sh.rustup.rs' | sh -s -- -y ;
 
 $HOME/.cargo/bin/cargo install \

{omdev-0.0.13 → omdev-0.0.14}/omdev/dockerdev/resources/fragments/sshd.sh

@@ -1,5 +1,3 @@
-set -ex ;
-
 sudo sed -i 's/^#*PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config ;
 sudo sed -i 's/^#X11UseLocalhost yes/X11UseLocalhost no/' /etc/ssh/sshd_config ;
 sudo sed -i 's/^# Ciphers and keying/Ciphers chacha20-poly1305@openssh.com/' /etc/ssh/sshd_config ;

omdev-0.0.14/omdev/dockerdev/resources/fragments/user.sh

@@ -0,0 +1,14 @@
+if id -u ubuntu >/dev/null 2>&1; then
+    userdel ubuntu ;
+fi ;
+if getent group ubuntu >/dev/null 2>&1; then
+    groupdel ubuntu ;
+fi ;
+rm -rf /home/ubuntu ;
+
+groupadd --gid ${NEW_GID} ${NEW_USER} ;
+useradd --uid ${NEW_UID} --gid ${NEW_GID} -m -s /bin/bash -d /${NEW_USER} ${NEW_USER} ;
+
+echo "${NEW_USER} ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/${NEW_USER} ;
+
+chmod 0440 /etc/sudoers.d/${NEW_USER} ;

{omdev-0.0.13 → omdev-0.0.14}/omdev/dockerdev/resources/fragments/uv.sh

@@ -1,5 +1,3 @@
-set -ex ;
-
 curl -LsSf 'https://astral.sh/uv/install.sh' | sh ;
 
 for PV in ${UV_PYTHON_VERSIONS} ; do

{omdev-0.0.13 → omdev-0.0.14}/omdev/dockerdev/resources/fragments/vcpkg.sh

@@ -1,5 +1,3 @@
-set -ex ;
-
 git clone 'https://github.com/microsoft/vcpkg' ~/.vcpkg_root ;
 (cd ~/.vcpkg_root && ./bootstrap-vcpkg.sh) ;
 

omdev-0.0.14/omdev/dockerdev/resources/fragments/workdir.sh

@@ -0,0 +1,3 @@
+sudo mkdir -p "$WORKDIR" ;
+sudo chown -R $(id -un) "$WORKDIR" ;
+sudo chgrp -R $(id -gn) "$WORKDIR" ;

{omdev-0.0.13 → omdev-0.0.14}/omdev/dockerdev/resources/fragments/zig.sh

@@ -1,5 +1,3 @@
-set -ex ;
-
 ZIG_VERSION=$(
   curl -fsSL 'https://ziglang.org/download/index.json' |
   jq -r 'to_entries | map(select(.key != "master")) | map(.value) | sort_by(.version) | last | .version'

{omdev-0.0.13 → omdev-0.0.14}/omdev/tui/textual/__init__.py

@@ -81,6 +81,8 @@ with _lang.auto_proxy_init(globals()):
     from textual.content import ContentType  # noqa
     from textual.content import EMPTY_CONTENT  # noqa
     from textual.content import Span  # noqa
+    from textual.css.query import NoMatches  # noqa
+    from textual.css.query import WrongType  # noqa
     from textual.document._document import Document  # noqa
     from textual.document._document import Location  # noqa
     from textual.document._document import Selection  # noqa

{omdev-0.0.13 → omdev-0.0.14/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.13
+Version: 0.0.14
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,10 +14,10 @@ Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.13
+Requires-Dist: omlish==0.0.14
 Provides-Extra: all
-Requires-Dist: ominfra==0.0.13; extra == "all"
-Requires-Dist: ommlds==0.0.13; extra == "all"
+Requires-Dist: ominfra==0.0.14; extra == "all"
+Requires-Dist: ommlds==0.0.14; extra == "all"
 Requires-Dist: black~=26.3; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"
 Requires-Dist: pcpp~=1.30; extra == "all"
@@ -33,9 +33,9 @@ Requires-Dist: textual~=8.2; extra == "all"
 Requires-Dist: textual-dev~=1.8; extra == "all"
 Requires-Dist: textual-speedups~=0.2; extra == "all"
 Provides-Extra: ominfra
-Requires-Dist: ominfra==0.0.13; extra == "ominfra"
+Requires-Dist: ominfra==0.0.14; extra == "ominfra"
 Provides-Extra: ommlds
-Requires-Dist: ommlds==0.0.13; extra == "ommlds"
+Requires-Dist: ommlds==0.0.14; extra == "ommlds"
 Provides-Extra: black
 Requires-Dist: black~=26.3; extra == "black"
 Provides-Extra: c

{omdev-0.0.13 → omdev-0.0.14}/omdev.egg-info/SOURCES.txt

@@ -181,6 +181,7 @@ omdev/dockerdev/resources/depsets/python.toml
 omdev/dockerdev/resources/depsets/system.toml
 omdev/dockerdev/resources/depsets/x11.toml
 omdev/dockerdev/resources/fragments/apt.sh
+omdev/dockerdev/resources/fragments/chgrp.sh
 omdev/dockerdev/resources/fragments/docker.sh
 omdev/dockerdev/resources/fragments/firefox.sh
 omdev/dockerdev/resources/fragments/go.sh
@@ -194,6 +195,7 @@ omdev/dockerdev/resources/fragments/sshd.sh
 omdev/dockerdev/resources/fragments/user.sh
 omdev/dockerdev/resources/fragments/uv.sh
 omdev/dockerdev/resources/fragments/vcpkg.sh
+omdev/dockerdev/resources/fragments/workdir.sh
 omdev/dockerdev/resources/fragments/zig.sh
 omdev/dockerdev/resources/scripts/install-claude
 omdev/dockerdev/resources/scripts/install-codex

{omdev-0.0.13 → omdev-0.0.14}/omdev.egg-info/requires.txt

@@ -1,8 +1,8 @@
-omlish==0.0.13
+omlish==0.0.14
 
 [all]
-ominfra==0.0.13
-ommlds==0.0.13
+ominfra==0.0.14
+ommlds==0.0.14
 black~=26.3
 pycparser~=3.0
 pcpp~=1.30
@@ -35,10 +35,10 @@ pygments~=2.20
 mypy~=1.20
 
 [ominfra]
-ominfra==0.0.13
+ominfra==0.0.14
 
 [ommlds]
-ommlds==0.0.13
+ommlds==0.0.14
 
 [prof]
 gprof2dot~=2025.4

{omdev-0.0.13 → omdev-0.0.14}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.14'
-version = '0.0.13'
+version = '0.0.14'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,13 +24,13 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.13',
+    'omlish == 0.0.14',
 ]
 
 [project.optional-dependencies]
 all = [
-    'ominfra == 0.0.13',
-    'ommlds == 0.0.13',
+    'ominfra == 0.0.14',
+    'ommlds == 0.0.14',
     'black ~= 26.3',
     'pycparser ~= 3.0',
     'pcpp ~= 1.30',
@@ -47,10 +47,10 @@ all = [
     'textual-speedups ~= 0.2',
 ]
 ominfra = [
-    'ominfra == 0.0.13',
+    'ominfra == 0.0.14',
 ]
 ommlds = [
-    'ommlds == 0.0.13',
+    'ommlds == 0.0.14',
 ]
 black = [
     'black ~= 26.3',

omdev-0.0.13/omdev/dockerdev/resources/fragments/user.sh

@@ -1,6 +0,0 @@
-set -ex ;
-
-groupadd --gid ${NEWGID} ${NEWUSER} ;
-useradd --uid ${NEWUID} --gid ${NEWGID} -m -s /bin/bash -d /${NEWUSER} ${NEWUSER} ;
-echo "${NEWUSER} ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/${NEWUSER} ;
-chmod 0440 /etc/sudoers.d/${NEWUSER} ;