omdev 0.0.0.dev526__tar.gz → 0.0.0.dev527__tar.gz

{omdev-0.0.0.dev526/omdev.egg-info → omdev-0.0.0.dev527}/PKG-INFO

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

omdev-0.0.0.dev527/omdev/dockerdev/config.toml

@@ -0,0 +1,36 @@
+base_image = 'ubuntu:24.04'
+
+dep_sets = [
+    'system',
+    'python',
+    'x11',
+]
+
+jdks = [
+    'zulu21-ca-jdk',
+    'zulu25-ca-jdk',
+]
+
+go_version = '1.26.0'
+
+zig_version = '0.15.2'
+
+nvm_versions = [
+    '20',
+    '22',
+    '25',
+]
+
+pyenv_version_keys = [
+    '8',
+    '13',
+    '14',
+]
+
+config_files = [
+    '.gdbinit',
+    '.tmux.conf',
+    '.vimrc',
+]
+
+workdir = '/omlish'

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

@@ -0,0 +1,186 @@
+"""
+FIXME:
+ - zipsafe / resourcey, but still hard refs .versions file in repo root lol
+
+TODO:
+ - per-feature config, obv
+
+====
+
+docker run --rm -it "$(docker build -q -f x/dockerdev/Dockerfile .)" bash
+"""
+import io
+import tomllib
+import typing as ta
+
+from omlish import dataclasses as dc
+from omlish import lang
+from omlish import marshal as msh
+
+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_dep_sets
+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
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class Config:
+    base_image: str
+
+    workdir: str | None = None
+
+    _: dc.KW_ONLY
+
+    dep_sets: ta.Sequence[str] | None = None
+
+    jdks: ta.Sequence[str] | None = None
+
+    go_version: str | None = None
+
+    zig_version: str | None = None
+
+    nvm_versions: ta.Sequence[str] | None = None
+
+    pyenv_version_keys: ta.Sequence[str] | None = None
+
+    config_files: ta.Sequence[str] | None = None
+
+
+##
+
+
+def gen_ops(cfg: Config) -> ta.Sequence[Op]:
+    ops: list[Op] = [
+        From(cfg.base_image),
+    ]
+
+    # ops.append(Section('timestamp', [
+    #     Copy(src='docker/.timestamp', dst='/'),
+    # ]))
+
+    ops.append(Section('locale', [
+        Env([
+            ('LANG', 'en_US.UTF-8'),
+            ('LANGUAGE', 'en_US:en'),
+            ('LC_ALL', 'en_US.UTF-8'),
+        ]),
+    ]))
+
+    ops.append(Section('deps', [
+        Run(
+            [
+                Resource('fragments/apt.sh'),
+                LazyContent(lambda: render_apt_install_dep_sets(*(cfg.dep_sets or []))),
+            ],
+            cache_mounts=APT_CACHE_MOUNTS,
+        ),
+    ]))
+
+    ops.append(fragment_section(
+        'firefox',
+        cache_mounts=APT_CACHE_MOUNTS,
+    ))
+
+    ops.append(fragment_section(
+        'docker',
+        cache_mounts=APT_CACHE_MOUNTS,
+    ))
+
+    if cfg.jdks:
+        ops.append(fragment_section(
+            'jdk',
+            static_env={'JDKS': cfg.jdks},
+            cache_mounts=APT_CACHE_MOUNTS,
+        ))
+
+    ops.append(fragment_section('rust'))
+
+    if cfg.go_version is not None:
+        ops.append(fragment_section(
+            'go',
+            static_env={'GO_VERSION': cfg.go_version},
+        ))
+
+    if cfg.zig_version is not None:
+        ops.append(fragment_section(
+            'zig',
+            static_env={'ZIG_VERSION': cfg.zig_version},
+        ))
+
+    ops.append(fragment_section('vcpkg'))
+
+    if cfg.nvm_versions:
+        ops.append(fragment_section(
+            'nvm',
+            static_env={'NVM_VERSIONS': cfg.nvm_versions},
+        ))
+
+    if cfg.pyenv_version_keys:
+        ops.append(fragment_section(
+            'pyenv',
+            static_env=lambda: {
+                'PYENV_VERSIONS': list(read_versions_file_versions(*[
+                    f'PYTHON_{k}' for k in cfg.pyenv_version_keys
+                ]).values()),
+            },
+            cache_mounts=['/root/.pyenv_cache'],
+        ))
+
+    ops.append(fragment_section('sshd'))
+
+    # ops.append(Section('x11', [
+    #     Run('touch /root/.Xauthority'),
+    #     Write('/root/xu', Resource('xu')),
+    # ]))
+
+    if cfg.config_files:
+        ops.append(Section('configs', [
+            Write(f'/root/{n}', Resource(f'configs/{n}'))
+            for n in cfg.config_files
+        ]))
+
+    ops.append(Section('entrypoint', [
+        *([Workdir(cfg.workdir)] if cfg.workdir is not None else []),
+        Entrypoint(['dumb-init', '--']),
+        Cmd(['sh', '-c', 'echo "Ready" && sleep infinity']),
+    ]))
+
+    return ops
+
+
+##
+
+
+def _main() -> None:
+    cfg_src = lang.get_relative_resources(globals=globals())['config.toml'].read_text()
+    cfg_dct = tomllib.loads(cfg_src)
+    cfg = msh.unmarshal(cfg_dct, Config)
+
+    ops = gen_ops(cfg)
+
+    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.dev526/omdev/dockerdev/resources/fragments/rustup.sh → omdev-0.0.0.dev527/omdev/dockerdev/resources/fragments/rust.sh

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

{omdev-0.0.0.dev526 → omdev-0.0.0.dev527}/omdev/pyproject/pkg.py

@@ -166,10 +166,10 @@ class BasePyprojectPackageGenerator(Abstract):
                 for l in src.splitlines():
                     if not (l := l.strip()):
                         continue
-                    if l.startswith('!'):
-                        exc.append(os.path.join(rp, l[1:]))
-                    else:
-                        inc.append(os.path.join(rp, l))
+                    if (bang := l.startswith('!')):
+                        l = l[1:]
+                    rlp = os.path.join(rp, l) if rp != '.' else l
+                    (exc if bang else inc).append(rlp)
 
         return self._PkgData(inc, exc)
 

{omdev-0.0.0.dev526 → omdev-0.0.0.dev527}/omdev/scripts/lib/io/streams.py

@@ -30,7 +30,7 @@ def __omlish_amalg__():  # noqa
             dict(path='base.py', sha1='67ae88ffabae21210b5452fe49c9a3e01ca164c5'),
             dict(path='framing.py', sha1='dc2d7f638b042619fd3d95789c71532a29fd5fe4'),
             dict(path='reading.py', sha1='7631635c46ab4b40bcaeb7c506cf15cb2d529a40'),
-            dict(path='utils.py', sha1='620360799f1282f8374d2cdbfe8c058e4a04d0d5'),
+            dict(path='utils.py', sha1='476363dfce81e3177a66f066892ed3fcf773ead8'),
             dict(path='direct.py', sha1='83c33460e9490a77a00ae66251617ba98128b56b'),
             dict(path='scanning.py', sha1='4c0323e0b11cd506f7b6b4cf28ea4d7c6064b9d3'),
             dict(path='adapters.py', sha1='865338413829b97be23883f713d50eb7cb62617a'),
@@ -1039,6 +1039,15 @@ class ByteStreamBufferReader:
 
 
 class ByteStreamBuffers(NamespaceClass):
+    @staticmethod
+    def memoryview_to_bytes(mv: memoryview, /) -> bytes:
+        if (((ot := type(obj := mv.obj)) is bytes or ot is bytearray or isinstance(obj, (bytes, bytearray))) and len(mv) == len(obj)):  # type: ignore[arg-type]  # noqa
+            return obj  # type: ignore[return-value]
+
+        return mv.tobytes()
+
+    ##
+
     _CAN_CONVERT_TYPES: ta.ClassVar[ta.Tuple[type, ...]] = (
         bytes,
         bytearray,
@@ -1046,23 +1055,26 @@ class ByteStreamBuffers(NamespaceClass):
         ByteStreamBufferLike,
     )
 
-    @staticmethod
-    def can_bytes(obj: ta.Any) -> bool:
-        return type(obj) in (cts := ByteStreamBuffers._CAN_CONVERT_TYPES) or isinstance(obj, cts)
+    @classmethod
+    def can_bytes(cls, obj: ta.Any, /) -> bool:
+        return type(obj) in (cts := cls._CAN_CONVERT_TYPES) or isinstance(obj, cts)
 
     #
 
-    @staticmethod
-    def memoryview_to_bytes(mv: memoryview) -> bytes:
-        if (((ot := type(obj := mv.obj)) is bytes or ot is bytearray or isinstance(obj, (bytes, bytearray))) and len(mv) == len(obj)):  # type: ignore[arg-type]  # noqa
-            return obj  # type: ignore[return-value]
+    @classmethod
+    @ta.overload
+    def buffer_to_bytes(cls, obj: ta.Any, or_none: ta.Literal[True], /) -> ta.Optional[bytes]:
+        ...
 
-        return mv.tobytes()
+    @classmethod
+    @ta.overload
+    def buffer_to_bytes(cls, obj: ta.Any, or_none: ta.Literal[False] = False, /) -> bytes:
+        ...
 
-    @staticmethod
-    def buffer_to_bytes(obj: ta.Any) -> bytes:
+    @classmethod
+    def buffer_to_bytes(cls, obj, or_none=False, /):
         if type(obj) is memoryview or isinstance(obj, memoryview):
-            return ByteStreamBuffers.memoryview_to_bytes(obj)
+            return cls.memoryview_to_bytes(obj)
 
         elif isinstance(obj, ByteStreamBufferView):
             return obj.tobytes()
@@ -1070,11 +1082,26 @@ class ByteStreamBuffers(NamespaceClass):
         elif isinstance(obj, ByteStreamBufferLike):
             return b''.join(bytes(mv) for mv in obj.segments())
 
+        elif or_none:
+            return None
+
         else:
             raise TypeError(obj)
 
-    @staticmethod
-    def any_to_bytes(obj: ta.Any) -> bytes:
+    #
+
+    @classmethod
+    @ta.overload
+    def any_to_bytes(cls, obj: ta.Any, or_none: ta.Literal[True], /) -> ta.Optional[bytes]:
+        ...
+
+    @classmethod
+    @ta.overload
+    def any_to_bytes(cls, obj: ta.Any, or_none: ta.Literal[False] = False, /) -> bytes:
+        ...
+
+    @classmethod
+    def any_to_bytes(cls, obj, or_none=False, /):
         if (ot := type(obj)) is bytes:
             return obj
         elif ot is bytearray:
@@ -1086,31 +1113,55 @@ class ByteStreamBuffers(NamespaceClass):
             return bytes(obj)
 
         else:
-            return ByteStreamBuffers.buffer_to_bytes(obj)
+            return cls.buffer_to_bytes(obj, or_none)  # noqa
 
-    @staticmethod
-    def any_to_bytes_or_bytearray(obj: ta.Any) -> ta.Union[bytes, bytearray]:
+    #
+
+    @classmethod
+    @ta.overload
+    def any_to_bytes_or_bytearray(cls, obj: ta.Any, or_none: ta.Literal[True], /) -> ta.Union[bytes, bytearray, None]:
+        ...
+
+    @classmethod
+    @ta.overload
+    def any_to_bytes_or_bytearray(cls, obj: ta.Any, or_none: ta.Literal[False] = False, /) -> ta.Union[bytes, bytearray]:  # noqa
+        ...
+
+    @classmethod
+    def any_to_bytes_or_bytearray(cls, obj, or_none=False, /):
         if (ot := type(obj)) is bytes or ot is bytearray or isinstance(obj, (bytes, bytearray)):
             return obj
 
         else:
-            return ByteStreamBuffers.buffer_to_bytes(obj)
+            return cls.buffer_to_bytes(obj, or_none)  # noqa
 
     #
 
-    @staticmethod
-    def bytes_len(obj: ta.Any) -> int:
-        if ByteStreamBuffers.can_bytes(obj):
+    @classmethod
+    @ta.overload
+    def bytes_len(cls, obj: ta.Any, or_none: ta.Literal[True], /) -> ta.Optional[int]:
+        ...
+
+    @classmethod
+    @ta.overload
+    def bytes_len(cls, obj: ta.Any, or_none: ta.Literal[False] = False, /) -> int:
+        ...
+
+    @classmethod
+    def bytes_len(cls, obj, or_none=False):
+        if cls.can_bytes(obj):
             return len(obj)
 
+        elif or_none:
+            return None
+
         else:
-            # Not bytes-like
-            return 0
+            raise TypeError(obj)
 
-    #
+    ##
 
     @staticmethod
-    def iter_segments(obj: ta.Any) -> ta.Iterator[memoryview]:
+    def iter_segments(obj: ta.Any, /) -> ta.Iterator[memoryview]:
         if (ot := type(obj)) is memoryview:
             yield obj
         elif ot is bytes or ot is bytearray:
@@ -1127,10 +1178,8 @@ class ByteStreamBuffers(NamespaceClass):
         else:
             raise TypeError(obj)
 
-    #
-
     @staticmethod
-    def split(buf: ByteStreamBuffer, sep: bytes, *, final: bool = False) -> ta.List[ByteStreamBufferView]:
+    def split(buf: ByteStreamBuffer, sep: bytes, /, *, final: bool = False) -> ta.List[ByteStreamBufferView]:
         out: ta.List[ByteStreamBufferView] = []
         while (i := buf.find(sep)) >= 0:
             out.append(buf.split_to(i + 1))

{omdev-0.0.0.dev526 → omdev-0.0.0.dev527}/omdev/scripts/pyproject.py

@@ -148,7 +148,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../interp/providers/system.py', sha1='9638a154475ca98775159d27739563ac7fb2eb16'),
             dict(path='../interp/pyenv/install.py', sha1='4a10a19717364b4ba9f3b8bf1d12621cf21ba8b8'),
             dict(path='../interp/uv/provider.py', sha1='3c3980878ad2b9fd2cd02172f9424954759c7f06'),
-            dict(path='pkg.py', sha1='e2acb40b17d75b6deb78056e6726d114a7aef2e4'),
+            dict(path='pkg.py', sha1='fd158f4026f2e0e672f147612b46d8552f262eb3'),
             dict(path='../interp/providers/inject.py', sha1='7cc9ebf58cf2ec09545321456bd9da9f9a3a79fb'),
             dict(path='../interp/pyenv/provider.py', sha1='377542ce01a35849e2a5b4a4dbafedc26882f983'),
             dict(path='../interp/uv/inject.py', sha1='e95d058c2340baa5a3155ec3440f311d1daa10a8'),
@@ -11817,10 +11817,10 @@ class BasePyprojectPackageGenerator(Abstract):
                 for l in src.splitlines():
                     if not (l := l.strip()):
                         continue
-                    if l.startswith('!'):
-                        exc.append(os.path.join(rp, l[1:]))
-                    else:
-                        inc.append(os.path.join(rp, l))
+                    if (bang := l.startswith('!')):
+                        l = l[1:]
+                    rlp = os.path.join(rp, l) if rp != '.' else l
+                    (exc if bang else inc).append(rlp)
 
         return self._PkgData(inc, exc)
 

{omdev-0.0.0.dev526 → omdev-0.0.0.dev527/omdev.egg-info}/PKG-INFO

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

{omdev-0.0.0.dev526 → omdev-0.0.0.dev527}/omdev.egg-info/SOURCES.txt

@@ -157,6 +157,7 @@ omdev/dataserver/routes.py
 omdev/dataserver/server.py
 omdev/dataserver/targets.py
 omdev/dockerdev/__init__.py
+omdev/dockerdev/config.toml
 omdev/dockerdev/content.py
 omdev/dockerdev/gen.py
 omdev/dockerdev/helpers.py
@@ -177,7 +178,7 @@ omdev/dockerdev/resources/fragments/go.sh
 omdev/dockerdev/resources/fragments/jdk.sh
 omdev/dockerdev/resources/fragments/nvm.sh
 omdev/dockerdev/resources/fragments/pyenv.sh
-omdev/dockerdev/resources/fragments/rustup.sh
+omdev/dockerdev/resources/fragments/rust.sh
 omdev/dockerdev/resources/fragments/sshd.sh
 omdev/dockerdev/resources/fragments/vcpkg.sh
 omdev/dockerdev/resources/fragments/zig.sh

{omdev-0.0.0.dev526 → omdev-0.0.0.dev527}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev526
+omlish==0.0.0.dev527
 
 [all]
 black~=26.1

{omdev-0.0.0.dev526 → omdev-0.0.0.dev527}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.13'
-version = '0.0.0.dev526'
+version = '0.0.0.dev527'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,7 +24,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev526',
+    'omlish == 0.0.0.dev527',
 ]
 
 [project.optional-dependencies]
@@ -104,6 +104,7 @@ exclude = [
     'AUTHORS',
     'DESIGN.md',
     'cc/cdeps.toml',
+    'dockerdev/config.toml',
     'dockerdev/resources/*',
     'dockerdev/resources/configs/*',
     'dockerdev/resources/depsets/*',