omdev 0.0.0.dev549__tar.gz → 0.0.0.dev550__tar.gz

{omdev-0.0.0.dev549/omdev.egg-info → omdev-0.0.0.dev550}/PKG-INFO

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

{omdev-0.0.0.dev549 → omdev-0.0.0.dev550}/omdev/dockerdev/cli.py

@@ -20,6 +20,16 @@ TODO:
 
 if [ -t 1 ] ; then TTY_ENV_ARGS="-e LINES=$(tput lines) -e COLUMNS=$(tput cols)" ; fi
 --detach-keys 'ctrl-o,ctrl-d' \
+
+====
+
+tag = f'omlish-dockerdev--{time.time_ns()}--{os.getpid()}'
+subprocess.check_call(['docker', 'tag', obi, tag])
+try:
+    cfg = dc.replace(cfg, base_image=tag)  # noqa
+    ...
+finally:
+    subprocess.check_call(['docker', 'image', 'rm', tag], stdout=subprocess.DEVNULL)
 """
 import json
 import os.path
@@ -29,12 +39,10 @@ import shutil
 import subprocess
 import sys
 import tempfile
-import time
 import tomllib
 import typing as ta
 
 from omlish import check
-from omlish import dataclasses as dc
 from omlish import lang
 from omlish import marshal as msh
 from omlish.argparse import all as ap
@@ -103,8 +111,8 @@ class Cli(ap.Cli):
             bim = bim.split(sep, maxsplit=1)[0]
 
         def run_insp() -> str:
-            return subprocess.check_output([  # type: ignore
-                'docker', 'image', 'inspect', cfg.base_image],  # type: ignore[union-attr]
+            return subprocess.check_output(  # type: ignore
+                ['docker', 'image', 'inspect', cfg.base_image],
                 **(dict(stderr=subprocess.DEVNULL) if not verbose else {}),
             ).decode()
 
@@ -119,50 +127,41 @@ class Cli(ap.Cli):
         insp_out_obj = json.loads(insp_out)
         insp_out_dct = check.not_empty(insp_out_obj)[0]
 
-        obi = check.non_empty_str(insp_out_dct['Id'])
-
-        tag = f'omlish-dockerdev--{time.time_ns()}--{os.getpid()}'
-
-        subprocess.check_call(['docker', 'tag', obi, tag])
-
-        try:
-            cfg = dc.replace(cfg, base_image=tag)  # noqa
+        # TODO: really want to rewrite Dockerfile on the fly to directly use this local image as a base to avoid any
+        #       network hit, but docker is *really hostile* to that idea
+        #  cfg = dc.replace(cfg, base_image=tag)
+        obi = check.non_empty_str(insp_out_dct['Id'])  # noqa
 
-            #
+        src = gen_src(cfg)
 
-            src = gen_src(cfg)
+        tmp_dir = tempfile.mkdtemp()
+        df = os.path.join(tmp_dir, 'Dockerfile')
+        with open(df, 'w') as f:
+            f.write(src)
 
-            tmp_dir = tempfile.mkdtemp()
-            df = os.path.join(tmp_dir, 'Dockerfile')
-            with open(df, 'w') as f:
-                f.write(src)
+        build_args = [
+            '-f',
+            df,
+        ]
 
-            build_args = [
-                '-f',
-                df,
-            ]
+        if offline:
+            build_args.append('--pull=false')
 
-            if offline:
-                build_args.append('--pull=false')
+        build_args.append('.')
 
-            build_args.append('.')
+        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")
 
-            if not verbose:
-                out = subprocess.check_output(['docker', 'build', '-q', *build_args]).decode()
-                if (m := SHA_PAT.search(out)) is not None:
+        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")
-
-            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")
-
-        finally:
-            subprocess.check_call(['docker', 'image', 'rm', tag], stdout=subprocess.DEVNULL)
+            raise RuntimeError("Can't find sha256 in output")
 
     @ap.cmd(
         ap.arg('-v', '--verbose', action='store_true'),

{omdev-0.0.0.dev549 → omdev-0.0.0.dev550}/omdev/dockerdev/resources/fragments/go.sh

@@ -1,6 +1,6 @@
 set -ex ;
 
-GO_VERSION=$(curl -fsSL https://go.dev/VERSION?m=text | head -n1 | sed 's/^go//') ;
+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 - ;
 mv "$HOME/go" "$HOME/.go" ;

omdev-0.0.0.dev550/omdev/dockerdev/resources/fragments/nvm.sh

@@ -0,0 +1,15 @@
+set -ex ;
+
+NVM_VERSION=$(
+  curl -fsSL -o /dev/null -w '%{url_effective}' 'https://github.com/nvm-sh/nvm/releases/latest' |
+  sed 's#.*\/tag/##'
+) ;
+
+curl -o- "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" | bash ;
+
+export NVM_DIR="$HOME/.nvm" ;
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" ;
+
+for NV in ${NVM_VERSIONS} ; do
+  nvm install "$NV" ;
+done ;

{omdev-0.0.0.dev549 → omdev-0.0.0.dev550}/omdev/dockerdev/resources/fragments/rbenv.sh

@@ -1,6 +1,6 @@
 set -ex ;
 
-curl -fsSL https://rbenv.org/install.sh | bash ;
+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" ;

omdev-0.0.0.dev550/omdev/dockerdev/resources/scripts/install-claude

@@ -0,0 +1,4 @@
+#!/bin/bash
+set -ex
+
+curl -fsSL 'https://claude.ai/install.sh' | bash

{omdev-0.0.0.dev549 → omdev-0.0.0.dev550}/omdev/tools/json/processing.py

@@ -53,7 +53,6 @@ class Processor:
 
     def _marshal(self, v: ta.Any) -> ta.Any:
         return msh.MarshalContext(
-            configs=msh.global_config_registry(),
             marshal_factory_context=msh.MarshalFactoryContext(
                 configs=msh.global_config_registry(),
                 marshaler_factory=self._marshaler_factory(),

{omdev-0.0.0.dev549 → omdev-0.0.0.dev550/omdev.egg-info}/PKG-INFO

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

{omdev-0.0.0.dev549 → omdev-0.0.0.dev550}/omdev.egg-info/SOURCES.txt

@@ -194,7 +194,7 @@ omdev/dockerdev/resources/fragments/user.sh
 omdev/dockerdev/resources/fragments/uv.sh
 omdev/dockerdev/resources/fragments/vcpkg.sh
 omdev/dockerdev/resources/fragments/zig.sh
-omdev/dockerdev/resources/scripts/install-claude-code
+omdev/dockerdev/resources/scripts/install-claude
 omdev/dockerdev/resources/scripts/run-dbus
 omdev/git/__init__.py
 omdev/git/magic.py

{omdev-0.0.0.dev549 → omdev-0.0.0.dev550}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev549
+omlish==0.0.0.dev550
 
 [all]
 black~=26.3

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

omdev-0.0.0.dev549/omdev/dockerdev/resources/fragments/nvm.sh

@@ -1,10 +0,0 @@
-set -ex ;
-
-curl -o- 'https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.4/install.sh' | bash ;
-
-export NVM_DIR="$HOME/.nvm" ;
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" ;
-
-for NV in ${NVM_VERSIONS} ; do
-  nvm install "$NV" ;
-done ;

omdev-0.0.0.dev549/omdev/dockerdev/resources/scripts/install-claude-code

@@ -1,4 +0,0 @@
-#!/bin/bash
-set -ex
-
-curl -fsSL https://claude.ai/install.sh | bash