omdev 0.0.0.dev546__tar.gz → 0.0.0.dev548__tar.gz

{omdev-0.0.0.dev546/omdev.egg-info → omdev-0.0.0.dev548}/PKG-INFO

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

{omdev-0.0.0.dev546 → omdev-0.0.0.dev548}/omdev/cexts/_boilerplate.cc

@@ -14,7 +14,7 @@
 typedef struct boilerplate_state {
 } boilerplate_state;
 
-static inline boilerplate_state * get_boilerplate_state(PyObject *module)
+static boilerplate_state * get_boilerplate_state(PyObject *module)
 {
     void *state = PyModule_GetState(module);
     assert(state != NULL);

{omdev-0.0.0.dev546 → omdev-0.0.0.dev548}/omdev/ci/docker/dataserver.py

@@ -15,7 +15,7 @@ from omlish.lite.check import check
 from omlish.lite.contextmanagers import AsyncExitStacked
 from omlish.logs.protocols import LoggerLike
 from omlish.secrets.tempssl import generate_temp_localhost_ssl_cert
-from omlish.sockets.server.server import SocketServer
+from omlish.sockets.handlers.server import SocketServer
 
 from ...dataserver.http import DataServerHttpHandler
 from ...dataserver.server import DataServer

{omdev-0.0.0.dev546 → omdev-0.0.0.dev548}/omdev/dockerdev/cli.py

@@ -21,6 +21,7 @@ TODO:
 if [ -t 1 ] ; then TTY_ENV_ARGS="-e LINES=$(tput lines) -e COLUMNS=$(tput cols)" ; fi
 --detach-keys 'ctrl-o,ctrl-d' \
 """
+import json
 import os.path
 import platform
 import re
@@ -32,6 +33,7 @@ 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
@@ -87,11 +89,40 @@ class Cli(ap.Cli):
             self,
             cfg: Config | None = None,
             *,
+            offline: bool = False,
             verbose: bool = False,
     ) -> str:
         if cfg is None:
             cfg = self._load_config()
 
+        #
+
+        bim = cfg.base_image
+        for sep in ':@':
+            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]
+                **(dict(stderr=subprocess.DEVNULL) if not verbose else {}),
+            ).decode()
+
+        try:
+            insp_out = run_insp()
+        except subprocess.CalledProcessError:
+            if offline:
+                raise
+            subprocess.check_output(['docker', 'pull', '-q', cfg.base_image])
+            insp_out = run_insp()
+
+        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['RepoDigests'][0])
+        cfg = dc.replace(cfg, base_image=obi)
+
+        #
+
         src = gen_src(cfg)
 
         tmp_dir = tempfile.mkdtemp()
@@ -99,7 +130,15 @@ class Cli(ap.Cli):
         with open(df, 'w') as f:
             f.write(src)
 
-        build_args = ['-f', df, '.']
+        build_args = [
+            '-f',
+            df,
+        ]
+
+        if offline:
+            build_args.append('--pull=false')
+
+        build_args.append('.')
 
         if not verbose:
             out = subprocess.check_output(['docker', 'build', '-q', *build_args]).decode()
@@ -135,6 +174,8 @@ class Cli(ap.Cli):
 
         ap.arg('-P', '--privileged', action='store_true'),
 
+        ap.arg('-O', '--offline', action='store_true'),
+
         ap.arg('--no-host-platform', action='store_true'),
 
         ap.arg('-x', '--autoexec', action='append'),
@@ -149,6 +190,7 @@ class Cli(ap.Cli):
 
         sha = self._build(
             cfg,
+            offline=self.args.offline,
             verbose=self.args.verbose,
         )
 
@@ -167,6 +209,9 @@ class Cli(ap.Cli):
         if self.args.privileged:
             run_args.append('--privileged')
 
+        if self.args.offline:
+            run_args.append('--pull=never')
+
         if self.args.mount:
             run_args.extend([f'--mount={m}' for m in self.args.mount])
 
@@ -182,7 +227,7 @@ class Cli(ap.Cli):
                 run_args.append(f'--mount=type=bind,src={cld},dst={cr}')
 
         if not self.args.no_host_platform:
-            run_args.extend(['-e', f'DOCKER_HOST_PLATFORM={platform.system().lower()}'])
+            run_args.extend([f'--env=DOCKER_HOST_PLATFORM={platform.system().lower()}'])
 
         if self.args.autoexec:
             tmp_dir = tempfile.mkdtemp()
@@ -203,7 +248,7 @@ class Cli(ap.Cli):
         run_args.append(sha)
 
         if self.args.args:
-            check.not_empty(self.args.args)
+            run_args.extend(check.not_empty(self.args.args))
         else:
             run_args.append('bash')
 

{omdev-0.0.0.dev546 → omdev-0.0.0.dev548}/omdev/dockerdev/config.toml

@@ -9,6 +9,7 @@ dep_sets = [
 jdks = [
     'zulu21-ca-jdk',
     'zulu25-ca-jdk',
+    'zulu26-ca-jdk',
 ]
 
 go_version = '1.26.1'
@@ -23,6 +24,7 @@ nvm_versions = [
 
 rbenv_versions = [
     '3.4',
+    '4.0',
 ]
 
 uv_python_versions = [

{omdev-0.0.0.dev546 → omdev-0.0.0.dev548}/omdev/dockerdev/resources/.python-versions.json

@@ -12,6 +12,6 @@
   "14d": "3.14.3d",
   "14t": "3.14.3t",
   "14dt": "3.14.3dt",
-  "15": "3.15.0a6",
-  "15t": "3.15.0a6t"
+  "15": "3.15.0a7",
+  "15t": "3.15.0a7t"
 }

{omdev-0.0.0.dev546 → omdev-0.0.0.dev548}/omdev/java/cli.py

@@ -1,6 +1,7 @@
 """
 TODO:
  - JAVA_HOME
+ - pomgen colon-sep dep type/scope
 
 See:
  - https://github.com/jbangdev/jbang
@@ -19,6 +20,7 @@ from omlish.argparse import all as ap
 from .. import intellij as ij
 from .. import magic
 from . import pomgen as pg
+from .utils import insert_before_first_non_header_line
 
 
 ##
@@ -70,7 +72,7 @@ def build_maven_project(
         if require_symlink:
             raise ValueError(f'Cannot symlink source file, no package specified.')
         group_id = DEFAULT_PROJECT_GROUP_ID
-        src = f'package {group_id};\n\n{src}'
+        src = insert_before_first_non_header_line(src, f'package {group_id};\n')
         can_symlink = False
 
     check.non_empty_str(group_id)

omdev-0.0.0.dev548/omdev/java/utils.py

@@ -0,0 +1,61 @@
+import re
+
+
+##
+
+
+_LINE_RE = re.compile(r'.*?(?:\r\n|\n|\r|$)')
+
+
+def insert_before_first_non_header_line(java_src: str, new_line: str) -> str:
+    """
+    Insert `new_line` as its own line immediately before the first non-header line in `java_src`.
+
+    A "header" line is:
+      - blank / whitespace-only
+      - a `// ...` line (optionally indented)
+      - a `/* ... */` block-comment line, including multi-line block comments (optionally indented)
+
+    Assumptions:
+      - `java_src` contains valid Java source.
+      - If a line ends a block comment, it does not also contain code after `*/`.
+      - `new_line` is a single logical line; any trailing newline chars are ignored.
+    """
+
+    # Pick a newline style to use for the inserted line.
+    m = re.search(r'\r\n|\n|\r', java_src)
+    nl = m.group(0) if m else '\n'
+
+    in_block_comment = False
+
+    for m in _LINE_RE.finditer(java_src):
+        line = m.group(0)
+        if line == '':
+            break
+
+        stripped = line.lstrip()
+
+        if in_block_comment:
+            if '*/' in stripped:
+                in_block_comment = False
+            continue
+
+        if stripped == '' or stripped in ('\n', '\r', '\r\n'):
+            continue
+
+        if stripped.startswith('//'):
+            continue
+
+        if stripped.startswith('/*'):
+            if '*/' not in stripped:
+                in_block_comment = True
+            continue
+
+        # First non-header line.
+        return java_src[:m.start()] + new_line + nl + java_src[m.start():]
+
+    # File contains only header lines, or is empty: append at the end.
+    if not java_src:
+        return new_line + nl
+
+    return java_src + ('' if java_src.endswith(('\r\n', '\n', '\r')) else nl) + new_line + nl

{omdev-0.0.0.dev546 → omdev-0.0.0.dev548}/omdev/precheck/unicode.py

@@ -14,6 +14,9 @@ from .caches import HeadersCache
 ##
 
 
+ALLOW_ANY_UNICODE_HEADER = '# @omlish-precheck-allow-any-unicode'
+
+
 class UnicodePrecheck(Precheck['UnicodePrecheck.Config']):
     @dc.dataclass(frozen=True)
     class Config(Precheck.Config):
@@ -86,7 +89,7 @@ class UnicodePrecheck(Precheck['UnicodePrecheck.Config']):
     async def _run_py_file(self, py_file: str) -> ta.AsyncGenerator[Precheck.Violation]:
         if isinstance(header_lines := self._headers_cache.get_file_headers(py_file), Exception):
             return
-        if any(hl.src.strip() == '# @omlish-precheck-allow-any-unicode' for hl in header_lines):
+        if any(hl.src.strip() == ALLOW_ANY_UNICODE_HEADER for hl in header_lines):
             return
 
         async for v in self._run_file(py_file):