omdev 0.0.0.dev543__tar.gz → 0.0.0.dev545__tar.gz

{omdev-0.0.0.dev543/omdev.egg-info → omdev-0.0.0.dev545}/PKG-INFO

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

{omdev-0.0.0.dev543 → omdev-0.0.0.dev545}/omdev/.omlish-manifests.json

@@ -536,7 +536,7 @@
     "module": ".tools.shadow",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/shadow.py",
-    "line": 68,
+    "line": 99,
     "value": {
       "!.cli.types.CliModule": {
         "name": "shadow",

{omdev-0.0.0.dev543 → omdev-0.0.0.dev545}/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='d0fd2e52b4227fe590add3c567328c3c4cf5f199'),
+            dict(path='../../omlish/lite/check.py', sha1='b3408fe9ba7756d6dc681e3c3a1ef622991380cd'),
             dict(path='../../omlish/lite/json.py', sha1='57eeddc4d23a17931e00284ffa5cb6e3ce089486'),
             dict(path='../../omlish/lite/objects.py', sha1='9566bbf3530fd71fcc56321485216b592fae21e9'),
             dict(path='../../omlish/lite/reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
@@ -783,6 +783,16 @@ class Checks:
                 render_fmt='%s',
             )
 
+    def inline(self, v: T, c: bool, msg: CheckMessage = None, /) -> T:
+        if not c:
+            self._raise(
+                RuntimeError,
+                'State condition not met',
+                msg,
+                render_fmt='%s',
+            )
+        return v
+
 
 check = Checks()
 

{omdev-0.0.0.dev543 → omdev-0.0.0.dev545}/omdev/dockerdev/cli.py

@@ -9,7 +9,12 @@ TODO:
  - all of the below stuff
  - launch / manage compose services
  - more cache dirs
- - --mount=type=bind,src=/host/dir,dst=/container/dir,readonly (git)
+ - --mount=type=bind,src="$(pwd)",dst=/omlish/pwd
+   - --mount=type=bind,src=/host/dir,dst=/container/dir,readonly (git)
+ - build --no-cache / cache bust
+   - build args
+ - auto go/zig vers
+ - `run --pull=never`, `build --pull=false`
 
 ====
 
@@ -124,8 +129,10 @@ class Cli(ap.Cli):
     @ap.cmd(
         ap.arg('-v', '--verbose', action='store_true'),
 
+        ap.arg('--mount', action='append'),
         ap.arg('-C', '--mount-caches', action='store_true'),
         ap.arg('-D', '--mount-docker-sock', action='store_true'),
+
         ap.arg('-P', '--privileged', action='store_true'),
 
         ap.arg('--no-host-platform', action='store_true'),
@@ -160,6 +167,9 @@ class Cli(ap.Cli):
         if self.args.privileged:
             run_args.append('--privileged')
 
+        if self.args.mount:
+            run_args.extend([f'--mount={m}' for m in self.args.mount])
+
         if self.args.mount_docker_sock:
             run_args.append('--mount=type=bind,src=/var/run/docker.sock,dst=/var/run/docker.sock')
 

{omdev-0.0.0.dev543 → omdev-0.0.0.dev545}/omdev/dockerdev/config.py

@@ -24,6 +24,8 @@ class Config:
 
     nvm_versions: ta.Sequence[str] | None = None
 
+    rbenv_versions: ta.Sequence[str] | None = None
+
     uv_python_versions: ta.Sequence[str] | None = None
 
     pyenv_version_keys: ta.Sequence[str] | None = None

{omdev-0.0.0.dev543 → omdev-0.0.0.dev545}/omdev/dockerdev/config.toml

@@ -21,6 +21,10 @@ nvm_versions = [
     '25',
 ]
 
+rbenv_versions = [
+    '3.4',
+]
+
 uv_python_versions = [
     '3.13',
     '3.14',

{omdev-0.0.0.dev543 → omdev-0.0.0.dev545}/omdev/dockerdev/gen.py

@@ -94,6 +94,12 @@ def gen_ops(cfg: Config) -> ta.Sequence[Op]:
             static_env={'NVM_VERSIONS': cfg.nvm_versions},
         ))
 
+    if cfg.rbenv_versions:
+        ops.append(fragment_section(
+            'rbenv',
+            static_env={'RBENV_VERSIONS': cfg.rbenv_versions},
+        ))
+
     ops.append(fragment_section(
         'uv',
         static_env={'UV_PYTHON_VERSIONS': cfg.uv_python_versions or []},

{omdev-0.0.0.dev543 → omdev-0.0.0.dev545}/omdev/dockerdev/resources/depsets/system.toml

@@ -26,6 +26,7 @@ deps = [
   'wget',
 
   # build essentials & compilers
+  'autoconf',
   'build-essential',
   'clang',
   'cmake',
@@ -61,9 +62,11 @@ deps = [
 
   # data formats
   'jq',
+  'libyaml-dev',
 
   # databases
   'libdb-dev',
+  'libgdbm6',
   'libpq-dev',
   'postgresql-client',
 

omdev-0.0.0.dev545/omdev/dockerdev/resources/fragments/rbenv.sh

@@ -0,0 +1,7 @@
+set -ex ;
+
+curl -fsSL https://rbenv.org/install.sh | bash ;
+
+for RV in ${RBENV_VERSIONS}; do
+  bash -c 'eval "$(~/.rbenv/bin/rbenv init - --no-rehash bash)" && rbenv install -L | grep -F "$1." | grep -E "^[0-9]+\.[0-9]+\.[0-9]+$" | sort -V | tail -n1 | xargs rbenv install' bash "$RV" ;
+done ;

{omdev-0.0.0.dev543 → omdev-0.0.0.dev545}/omdev/home/paths.py

@@ -36,25 +36,35 @@ class HomePaths:
     def home_dir(self) -> str:
         return self._home_dir
 
+    config_subdir: ta.Final = 'config'
+
     @property
     def config_dir(self) -> str:
-        return os.path.join(self._home_dir, 'config')
+        return os.path.join(self._home_dir, self.config_subdir)
+
+    log_subdir: ta.Final = 'log'
 
     @property
     def log_dir(self) -> str:
-        return os.path.join(self._home_dir, 'log')
+        return os.path.join(self._home_dir, self.log_subdir)
+
+    run_subdir: ta.Final = 'run'
 
     @property
     def run_dir(self) -> str:
-        return os.path.join(self._home_dir, 'run')
+        return os.path.join(self._home_dir, self.run_subdir)
+
+    shadow_subdir: ta.Final = 'shadow'
 
     @property
     def shadow_dir(self) -> str:
-        return os.path.join(self._home_dir, 'shadow')
+        return os.path.join(self._home_dir, self.shadow_subdir)
+
+    state_subdir: ta.Final = 'state'
 
     @property
     def state_dir(self) -> str:
-        return os.path.join(self._home_dir, 'state')
+        return os.path.join(self._home_dir, self.state_subdir)
 
 
 def get_home_paths() -> HomePaths:

omdev-0.0.0.dev545/omdev/home/shadow.py

@@ -0,0 +1,28 @@
+"""
+TODO:
+ - <hostname>/ subdir?
+"""
+from omlish.configs.shadow import FileShadowConfigs
+from omlish.configs.shadow import FileShadowConfigsImpl
+from omlish.configs.shadow import ShadowConfigs
+from omlish.lite.check import check
+from omlish.os.shadow import ManglingShadowPaths
+from omlish.os.shadow import ShadowPaths
+
+from .paths import HomePaths
+from .paths import get_home_paths
+
+
+##
+
+
+def get_shadow_paths() -> ShadowPaths:
+    return ManglingShadowPaths(get_home_paths().shadow_dir)
+
+
+def get_shadow_configs() -> ShadowConfigs:
+    return FileShadowConfigsImpl(get_shadow_paths(), HomePaths.config_subdir)
+
+
+def get_file_shadow_configs() -> FileShadowConfigs:
+    return check.isinstance(get_shadow_configs(), FileShadowConfigs)

{omdev-0.0.0.dev543 → omdev-0.0.0.dev545}/omdev/manifests/_dumping.py

@@ -39,7 +39,7 @@ def __omlish_amalg__():  # noqa
         src_files=[
             dict(path='../../omlish/lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
             dict(path='../../omlish/lite/cached.py', sha1='0c33cf961ac8f0727284303c7a30c5ea98f714f2'),
-            dict(path='../../omlish/lite/check.py', sha1='d0fd2e52b4227fe590add3c567328c3c4cf5f199'),
+            dict(path='../../omlish/lite/check.py', sha1='b3408fe9ba7756d6dc681e3c3a1ef622991380cd'),
             dict(path='../../omlish/lite/objects.py', sha1='9566bbf3530fd71fcc56321485216b592fae21e9'),
             dict(path='../../omlish/lite/reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
             dict(path='../../omlish/lite/strings.py', sha1='89831ecbc34ad80e118a865eceb390ed399dc4d6'),
@@ -899,6 +899,16 @@ class Checks:
                 render_fmt='%s',
             )
 
+    def inline(self, v: T, c: bool, msg: CheckMessage = None, /) -> T:
+        if not c:
+            self._raise(
+                RuntimeError,
+                'State condition not met',
+                msg,
+                render_fmt='%s',
+            )
+        return v
+
 
 check = Checks()
 

{omdev-0.0.0.dev543 → omdev-0.0.0.dev545}/omdev/scripts/ci.py

@@ -95,13 +95,13 @@ def __omlish_amalg__():  # noqa
             dict(path='../oci/compression.py', sha1='7d165bc51a77db13ff45927daecc42839cfd75ea'),
             dict(path='../../omlish/asyncs/asyncio/utils.py', sha1='a093aa6b49e25b3206f59b703b281d569c386838'),
             dict(path='../../omlish/docker/ports.py', sha1='a3202c69b85bc4f1034479df3400fddc86130e5c'),
+            dict(path='../../omlish/http/coro/_pushback.py', sha1='783fe8a40fa9f2febf035f4553c53c73b9bd58e1'),
             dict(path='../../omlish/http/urllib.py', sha1='25431c5bdc7dd5cbecfcb8c0bdffaabf8c1691b9'),
             dict(path='../../omlish/http/versions.py', sha1='5b1659b81eb197c6880fbe78684a1348595ec804'),
-            dict(path='../../omlish/io/pushback.py', sha1='783fe8a40fa9f2febf035f4553c53c73b9bd58e1'),
             dict(path='../../omlish/lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
             dict(path='../../omlish/lite/asyncs.py', sha1='b3f2251c56617ce548abf9c333ac996b63edb23e'),
             dict(path='../../omlish/lite/cached.py', sha1='0c33cf961ac8f0727284303c7a30c5ea98f714f2'),
-            dict(path='../../omlish/lite/check.py', sha1='d0fd2e52b4227fe590add3c567328c3c4cf5f199'),
+            dict(path='../../omlish/lite/check.py', sha1='b3408fe9ba7756d6dc681e3c3a1ef622991380cd'),
             dict(path='../../omlish/lite/contextmanagers.py', sha1='993f5ed96d3410f739a20363f55670d5e5267fa3'),
             dict(path='../../omlish/lite/dataclasses.py', sha1='8b144d1d9474d96cf2a35f4db5cb224c30f538d6'),
             dict(path='../../omlish/lite/json.py', sha1='57eeddc4d23a17931e00284ffa5cb6e3ce089486'),
@@ -173,7 +173,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../oci/building.py', sha1='b4fea06c03ba02d3ecfc6d10d955dc76f263846a'),
             dict(path='../oci/loading.py', sha1='64d806ffad8d24087ccc29f759f672e6d795bee2'),
             dict(path='../../omlish/formats/yaml/goyaml/parsing.py', sha1='c92e4772e2d50f080bc1ca8a317d0c7aea5b710a'),
-            dict(path='../../omlish/http/coro/server/sockets.py', sha1='512e6fdd4ad9a533b81a584e45c7d7e9b0188c15'),
+            dict(path='../../omlish/http/coro/server/sockets.py', sha1='bb0915b307622067c5460387ed0014f954167eb5'),
             dict(path='../../omlish/logs/asyncs.py', sha1='8376df395029a9d0957e2338adede895a9364215'),
             dict(path='../../omlish/logs/std/loggers.py', sha1='dbdfc66188e6accb75d03454e43221d3fba0f011'),
             dict(path='../../omlish/subprocesses/asyncs.py', sha1='bba44d524c24c6ac73168aee6343488414e5bf48'),
@@ -636,128 +636,7 @@ class DockerPortRelay:
 
 
 ########################################
-# ../../../omlish/http/urllib.py
-
-
-##
-
-
-class NonRaisingUrllibErrorProcessor(urllib.request.HTTPErrorProcessor):
-    """
-    https://stackoverflow.com/a/74844056
-
-    Usage:
-
-        opener = urllib.request.build_opener(NonRaisingUrllibErrorProcessor)
-        with opener.open(req) as resp:
-            ...
-    """
-
-    def http_response(self, request, response):
-        return response
-
-    def https_response(self, request, response):
-        return response
-
-
-########################################
-# ../../../omlish/http/versions.py
-
-
-##
-
-
-class UnknownHttpVersionError(Exception):
-    pass
-
-
-@ta.final
-@functools.total_ordering
-class HttpVersion:
-    def __init__(self, major: int, minor: int) -> None:
-        self._major = major
-        self._minor = minor
-
-        self._parts = parts = (major, minor)
-
-        self._hash = hash(parts)
-
-        self._str = f'HTTP/{major}.{minor}'
-        self._short_str = f'{major}.{minor}'
-
-    def __repr__(self) -> str:
-        return f'{self.__class__.__name__}({self.major}, {self.minor})'
-
-    def __hash__(self) -> int:
-        return self._hash
-
-    def __eq__(self, other: object) -> ta.Any:
-        if not isinstance(other, HttpVersion):
-            return NotImplemented
-        return self._parts == other._parts
-
-    def __lt__(self, other: object) -> ta.Any:
-        if not isinstance(other, HttpVersion):
-            return NotImplemented
-        return self._parts < other._parts
-
-    @property
-    def major(self) -> int:
-        return self._major
-
-    @property
-    def minor(self) -> int:
-        return self._minor
-
-    def __str__(self) -> str:
-        return self._str
-
-    @property
-    def short_str(self) -> str:
-        return self._short_str
-
-    def __iter__(self) -> ta.Iterator[int]:
-        return iter(self._parts)
-
-
-@ta.final
-class HttpVersions:
-    def __new__(cls, *args, **kwargs):  # noqa
-        raise TypeError
-
-    HTTP_0_9 = HttpVersion(0, 9)
-    HTTP_1_0 = HttpVersion(1, 0)
-    HTTP_1_1 = HttpVersion(1, 1)
-    HTTP_2_0 = HttpVersion(2, 0)
-
-    _FROM_STR: ta.ClassVar[ta.Mapping[str, HttpVersion]] = {
-        str(v): v for v in [
-            HTTP_0_9,
-            HTTP_1_0,
-            HTTP_1_1,
-            HTTP_2_0,
-        ]
-    }
-
-    @classmethod
-    def from_str(cls, s: str) -> HttpVersion:
-        try:
-            return cls._FROM_STR[s]
-        except KeyError:
-            raise UnknownHttpVersionError(s) from None
-
-    @classmethod
-    def of(cls, o: ta.Union[HttpVersion, str]) -> HttpVersion:
-        if isinstance(o, HttpVersion):
-            return o
-        elif isinstance(o, str):
-            return cls.from_str(o)
-        else:
-            raise TypeError(o)
-
-
-########################################
-# ../../../omlish/io/pushback.py
+# ../../../omlish/http/coro/_pushback.py
 
 
 ##
@@ -897,6 +776,127 @@ class PushbackReader:
             buf += chunk
 
 
+########################################
+# ../../../omlish/http/urllib.py
+
+
+##
+
+
+class NonRaisingUrllibErrorProcessor(urllib.request.HTTPErrorProcessor):
+    """
+    https://stackoverflow.com/a/74844056
+
+    Usage:
+
+        opener = urllib.request.build_opener(NonRaisingUrllibErrorProcessor)
+        with opener.open(req) as resp:
+            ...
+    """
+
+    def http_response(self, request, response):
+        return response
+
+    def https_response(self, request, response):
+        return response
+
+
+########################################
+# ../../../omlish/http/versions.py
+
+
+##
+
+
+class UnknownHttpVersionError(Exception):
+    pass
+
+
+@ta.final
+@functools.total_ordering
+class HttpVersion:
+    def __init__(self, major: int, minor: int) -> None:
+        self._major = major
+        self._minor = minor
+
+        self._parts = parts = (major, minor)
+
+        self._hash = hash(parts)
+
+        self._str = f'HTTP/{major}.{minor}'
+        self._short_str = f'{major}.{minor}'
+
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}({self.major}, {self.minor})'
+
+    def __hash__(self) -> int:
+        return self._hash
+
+    def __eq__(self, other: object) -> ta.Any:
+        if not isinstance(other, HttpVersion):
+            return NotImplemented
+        return self._parts == other._parts
+
+    def __lt__(self, other: object) -> ta.Any:
+        if not isinstance(other, HttpVersion):
+            return NotImplemented
+        return self._parts < other._parts
+
+    @property
+    def major(self) -> int:
+        return self._major
+
+    @property
+    def minor(self) -> int:
+        return self._minor
+
+    def __str__(self) -> str:
+        return self._str
+
+    @property
+    def short_str(self) -> str:
+        return self._short_str
+
+    def __iter__(self) -> ta.Iterator[int]:
+        return iter(self._parts)
+
+
+@ta.final
+class HttpVersions:
+    def __new__(cls, *args, **kwargs):  # noqa
+        raise TypeError
+
+    HTTP_0_9 = HttpVersion(0, 9)
+    HTTP_1_0 = HttpVersion(1, 0)
+    HTTP_1_1 = HttpVersion(1, 1)
+    HTTP_2_0 = HttpVersion(2, 0)
+
+    _FROM_STR: ta.ClassVar[ta.Mapping[str, HttpVersion]] = {
+        str(v): v for v in [
+            HTTP_0_9,
+            HTTP_1_0,
+            HTTP_1_1,
+            HTTP_2_0,
+        ]
+    }
+
+    @classmethod
+    def from_str(cls, s: str) -> HttpVersion:
+        try:
+            return cls._FROM_STR[s]
+        except KeyError:
+            raise UnknownHttpVersionError(s) from None
+
+    @classmethod
+    def of(cls, o: ta.Union[HttpVersion, str]) -> HttpVersion:
+        if isinstance(o, HttpVersion):
+            return o
+        elif isinstance(o, str):
+            return cls.from_str(o)
+        else:
+            raise TypeError(o)
+
+
 ########################################
 # ../../../omlish/lite/abstract.py
 
@@ -1873,6 +1873,16 @@ class Checks:
                 render_fmt='%s',
             )
 
+    def inline(self, v: T, c: bool, msg: CheckMessage = None, /) -> T:
+        if not c:
+            self._raise(
+                RuntimeError,
+                'State condition not met',
+                msg,
+                render_fmt='%s',
+            )
+        return v
+
 
 check = Checks()
 

{omdev-0.0.0.dev543 → omdev-0.0.0.dev545}/omdev/scripts/interp.py

@@ -56,7 +56,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../packaging/versions.py', sha1='71627ad600b3529b829b0e227b0952f2c63c7271'),
             dict(path='../../omlish/lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
             dict(path='../../omlish/lite/cached.py', sha1='0c33cf961ac8f0727284303c7a30c5ea98f714f2'),
-            dict(path='../../omlish/lite/check.py', sha1='d0fd2e52b4227fe590add3c567328c3c4cf5f199'),
+            dict(path='../../omlish/lite/check.py', sha1='b3408fe9ba7756d6dc681e3c3a1ef622991380cd'),
             dict(path='../../omlish/lite/json.py', sha1='57eeddc4d23a17931e00284ffa5cb6e3ce089486'),
             dict(path='../../omlish/lite/reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
             dict(path='../../omlish/lite/strings.py', sha1='89831ecbc34ad80e118a865eceb390ed399dc4d6'),
@@ -1398,6 +1398,16 @@ class Checks:
                 render_fmt='%s',
             )
 
+    def inline(self, v: T, c: bool, msg: CheckMessage = None, /) -> T:
+        if not c:
+            self._raise(
+                RuntimeError,
+                'State condition not met',
+                msg,
+                render_fmt='%s',
+            )
+        return v
+
 
 check = Checks()
 

{omdev-0.0.0.dev543 → omdev-0.0.0.dev545}/omdev/scripts/lib/formats/goyaml.py

@@ -35,7 +35,7 @@ def __omlish_amalg__():  # noqa
     return dict(
         src_files=[
             dict(path='../../../lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
-            dict(path='../../../lite/check.py', sha1='d0fd2e52b4227fe590add3c567328c3c4cf5f199'),
+            dict(path='../../../lite/check.py', sha1='b3408fe9ba7756d6dc681e3c3a1ef622991380cd'),
             dict(path='../../../lite/dataclasses.py', sha1='8b144d1d9474d96cf2a35f4db5cb224c30f538d6'),
             dict(path='errors.py', sha1='8fa73c90292f56f8faaedebb2f478ff6a3b95460'),
             dict(path='tokens.py', sha1='d52876a2a525bc99eb554fe28c3d27e7e01f43a9'),
@@ -785,6 +785,16 @@ class Checks:
                 render_fmt='%s',
             )
 
+    def inline(self, v: T, c: bool, msg: CheckMessage = None, /) -> T:
+        if not c:
+            self._raise(
+                RuntimeError,
+                'State condition not met',
+                msg,
+                render_fmt='%s',
+            )
+        return v
+
 
 check = Checks()
 

{omdev-0.0.0.dev543 → omdev-0.0.0.dev545}/omdev/scripts/lib/inject.py

@@ -32,7 +32,7 @@ def __omlish_amalg__():  # noqa
     return dict(
         src_files=[
             dict(path='abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
-            dict(path='check.py', sha1='d0fd2e52b4227fe590add3c567328c3c4cf5f199'),
+            dict(path='check.py', sha1='b3408fe9ba7756d6dc681e3c3a1ef622991380cd'),
             dict(path='reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
             dict(path='maybes.py', sha1='04d2fcbea17028a5e6b8e7a7fb742375495ed233'),
             dict(path='inject.py', sha1='6f097e3170019a34ff6834d36fcc9cbeed3a7ab4'),
@@ -783,6 +783,16 @@ class Checks:
                 render_fmt='%s',
             )
 
+    def inline(self, v: T, c: bool, msg: CheckMessage = None, /) -> T:
+        if not c:
+            self._raise(
+                RuntimeError,
+                'State condition not met',
+                msg,
+                render_fmt='%s',
+            )
+        return v
+
 
 check = Checks()