omdev 0.0.0.dev532__tar.gz → 0.0.0.dev533__tar.gz

{omdev-0.0.0.dev532/omdev.egg-info → omdev-0.0.0.dev533}/PKG-INFO

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

{omdev-0.0.0.dev532 → omdev-0.0.0.dev533}/omdev/.omlish-manifests.json

@@ -71,6 +71,18 @@
       }
     }
   },
+  {
+    "module": ".dockerdev.__main__",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/dockerdev/__main__.py",
+    "line": 4,
+    "value": {
+      "!.cli.types.CliModule": {
+        "name": "dockerdev",
+        "module": "omdev.dockerdev.__main__"
+      }
+    }
+  },
   {
     "module": ".imgur",
     "attr": "_CLI_MODULE",

omdev-0.0.0.dev533/omdev/dockerdev/__main__.py

@@ -0,0 +1,11 @@
+from ..cli import CliModule
+
+
+# @omlish-manifest
+_CLI_MODULE = CliModule('dockerdev', __name__)
+
+
+if __name__ == '__main__':
+    from .cli import _main  # noqa
+
+    _main()

omdev-0.0.0.dev533/omdev/dockerdev/cli.py

@@ -0,0 +1,136 @@
+import os.path
+import re
+import shutil
+import subprocess
+import sys
+import tempfile
+import tomllib
+import typing as ta
+
+from omlish import check
+from omlish import lang
+from omlish import marshal as msh
+from omlish.argparse import all as ap
+
+from .gen import Config
+from .gen import gen_src
+
+
+##
+
+
+SHA_PAT = re.compile(r'sha256:[0-9a-f]{64}')
+
+
+def run_and_tee(cmd: ta.Sequence[str]) -> tuple[subprocess.Popen, str]:
+    proc = subprocess.Popen(
+        cmd,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.STDOUT,  # merge stderr into stdout
+        bufsize=1,
+        text=True,  # decode to str
+    )
+
+    captured = []
+
+    for line in check.not_none(proc.stdout):
+        sys.stdout.write(line)
+        sys.stdout.flush()
+        captured.append(line)
+
+    proc.wait()
+
+    return proc, ''.join(captured)
+
+
+class Cli(ap.Cli):
+    def _load_config(self) -> Config:
+        cfg_src = lang.get_relative_resources(globals=globals())['config.toml'].read_text()
+        cfg_dct = tomllib.loads(cfg_src)
+        return msh.unmarshal(cfg_dct, Config)
+
+    @ap.cmd()
+    def gen(self) -> None:
+        cfg = self._load_config()
+        src = gen_src(cfg)
+        print(src)
+
+    #
+
+    def _build(
+            self,
+            cfg: Config | None = None,
+            *,
+            verbose: bool = False,
+    ) -> str:
+        if cfg is None:
+            cfg = self._load_config()
+
+        src = gen_src(cfg)
+
+        tmp_dir = tempfile.mkdtemp()
+        df = os.path.join(tmp_dir, 'Dockerfile')
+        with open(df, 'w') as f:
+            f.write(src)
+
+        build_args = ['-f', df, '.']
+
+        if not verbose:
+            out = subprocess.check_output(['docker', 'build', '-q', *build_args]).decode()
+            if (m := SHA_PAT.search(out)) is not None:
+                return m.group(0)
+            raise RuntimeError('Can\'t find sha256 in output')
+
+        else:
+            proc, out = run_and_tee(['docker', 'build', *build_args])
+            check.state(proc.returncode == 0)
+            for line in reversed(out.splitlines()):
+                if (m := SHA_PAT.search(line)) is not None:
+                    return m.group(0)
+            raise RuntimeError('Can\'t find sha256 in output')
+
+    @ap.cmd(
+        ap.arg('-v', '--verbose', action='store_true'),
+        ap.arg('args', nargs=ap.REMAINDER),
+    )
+    def build(self) -> None:
+        sha = self._build(
+            verbose=self.args.verbose,
+        )
+
+        print(sha)
+
+    @ap.cmd(
+        ap.arg('-v', '--verbose', action='store_true'),
+        ap.arg('args', nargs=ap.REMAINDER),
+        accepts_unknown=True,
+    )
+    def run(self) -> None:
+        check.not_empty(self.args.args)
+
+        sha = self._build(
+            verbose=self.args.verbose,
+        )
+
+        os.execl(
+            docker := check.not_none(shutil.which('docker')),
+            docker,
+            'run',
+            *(
+                self.unknown_args or
+                [
+                    '--rm',
+                    '-it',
+                ]
+            ),
+            sha,
+            *self.args.args,
+        )
+
+
+def _main() -> None:
+    Cli().cli_run_and_exit()
+
+
+if __name__ == '__main__':
+    _main()

{omdev-0.0.0.dev532 → omdev-0.0.0.dev533}/omdev/dockerdev/gen.py

@@ -1,18 +1,11 @@
 """
 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
@@ -164,14 +157,7 @@ def gen_ops(cfg: Config) -> ta.Sequence[Op]:
     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)
-
+def gen_src(cfg: Config) -> str:
     ops = gen_ops(cfg)
 
     out = io.StringIO()
@@ -180,8 +166,4 @@ def _main() -> None:
             out.write('\n\n\n')
         out.write(render_op(section))
 
-    print(out.getvalue())
-
-
-if __name__ == '__main__':
-    _main()
+    return out.getvalue()

{omdev-0.0.0.dev532 → omdev-0.0.0.dev533}/omdev/dockerdev/resources/.python-versions.json

@@ -9,7 +9,9 @@
   "13t": "3.13.12t",
   "13dt": "3.13.12dt",
   "14": "3.14.3",
+  "14d": "3.14.3d",
   "14t": "3.14.3t",
+  "14dt": "3.14.3dt",
   "15": "3.15.0a6",
   "15t": "3.15.0a6t"
 }

{omdev-0.0.0.dev532 → omdev-0.0.0.dev533}/omdev/dockerdev/resources/depsets/system.toml

@@ -39,8 +39,6 @@ deps = [
 
   # language toolchains & runtimes
   'maven',
-  'nodejs',
-  'npm',
   'perl',
   'ruby',
 

{omdev-0.0.0.dev532 → omdev-0.0.0.dev533}/omdev/dockerdev/resources/fragments/nvm.sh

@@ -7,4 +7,4 @@ export NVM_DIR="$HOME/.nvm" ;
 
 for NV in ${NVM_VERSIONS} ; do
   nvm install "$NV" ;
-done
+done ;

{omdev-0.0.0.dev532 → omdev-0.0.0.dev533}/omdev/dockerdev/resources/fragments/pyenv.sh

@@ -4,4 +4,4 @@ git clone 'https://github.com/pyenv/pyenv' /root/.pyenv ;
 
 for V in ${PYENV_VERSIONS} ; do
   PYTHON_BUILD_CACHE_PATH=/root/.pyenv_cache /root/.pyenv/bin/pyenv install -s "$V" ;
-done
+done ;

{omdev-0.0.0.dev532 → omdev-0.0.0.dev533}/omdev/dockerdev/resources/fragments/rust.sh

@@ -7,4 +7,4 @@ $HOME/.cargo/bin/cargo install \
   cargo-edit \
   rust-script \
 \
-;
+;

{omdev-0.0.0.dev532 → omdev-0.0.0.dev533}/omdev/scripts/ci.py

@@ -181,7 +181,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../dataserver/http.py', sha1='f85ca91015bac434281326ef7885babd9d6d834c'),
             dict(path='../oci/dataserver.py', sha1='dd147b56282b054cef264556a0ff3b3d1719bcee'),
             dict(path='../../omlish/asyncs/asyncio/subprocesses.py', sha1='b6b5f9ae3fd0b9c83593bad2e04a08f726e5904d'),
-            dict(path='../../omlish/formats/yaml/goyaml/decoding.py', sha1='c4bc1a750345f55e5f6d5a0f4569be0bfce5b5be'),
+            dict(path='../../omlish/formats/yaml/goyaml/decoding.py', sha1='03e29317ab0a76549db8e6938dfe83596dfe48df'),
             dict(path='../../omlish/http/coro/server/simple.py', sha1='27bb1e958ef2e53adf98d4e01cc5868e8b4af72c'),
             dict(path='../../omlish/logs/modules.py', sha1='dd7d5f8e63fe8829dfb49460f3929ab64b68ee14'),
             dict(path='cache.py', sha1='9353e5c3b73bed47258680fd15ac49417113f0ca'),

{omdev-0.0.0.dev532 → omdev-0.0.0.dev533}/omdev/scripts/lib/formats/goyaml.py

@@ -42,7 +42,7 @@ def __omlish_amalg__():  # noqa
             dict(path='ast.py', sha1='811593bad2d89bfecc4a688a8d5e92e66c026073'),
             dict(path='scanning.py', sha1='fe21556a59a30e12a110e85ef2b201a5d81f14d0'),
             dict(path='parsing.py', sha1='a7faf2bf497eec7087b2ee803b088af08d4b6cd0'),
-            dict(path='decoding.py', sha1='c4bc1a750345f55e5f6d5a0f4569be0bfce5b5be'),
+            dict(path='decoding.py', sha1='03e29317ab0a76549db8e6938dfe83596dfe48df'),
             dict(path='_amalg.py', sha1='85989224f581528c4a189dca142cb3ec086ecd3c'),
         ],
     )

{omdev-0.0.0.dev532 → omdev-0.0.0.dev533/omdev.egg-info}/PKG-INFO

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

{omdev-0.0.0.dev532 → omdev-0.0.0.dev533}/omdev.egg-info/SOURCES.txt

@@ -157,6 +157,8 @@ omdev/dataserver/routes.py
 omdev/dataserver/server.py
 omdev/dataserver/targets.py
 omdev/dockerdev/__init__.py
+omdev/dockerdev/__main__.py
+omdev/dockerdev/cli.py
 omdev/dockerdev/config.toml
 omdev/dockerdev/content.py
 omdev/dockerdev/gen.py

{omdev-0.0.0.dev532 → omdev-0.0.0.dev533}/omdev.egg-info/requires.txt

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

{omdev-0.0.0.dev532 → omdev-0.0.0.dev533}/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.dev532'
+version = '0.0.0.dev533'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,7 +24,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev532',
+    'omlish == 0.0.0.dev533',
 ]
 
 [project.optional-dependencies]