omdev 0.0.0.dev61__tar.gz → 0.0.0.dev63__tar.gz

{omdev-0.0.0.dev61/omdev.egg-info → omdev-0.0.0.dev63}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev61
+Version: 0.0.0.dev63
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: ~=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev61
+Requires-Dist: omlish==0.0.0.dev63
 Provides-Extra: all
 Requires-Dist: pycparser~=2.22; extra == "all"
 Requires-Dist: cffi~=1.17; extra == "all"

{omdev-0.0.0.dev61 → omdev-0.0.0.dev63}/omdev/.manifests.json

@@ -123,7 +123,7 @@
     "module": ".tools.dockertools",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/dockertools.py",
-    "line": 183,
+    "line": 236,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "docker",

{omdev-0.0.0.dev61 → omdev-0.0.0.dev63}/omdev/cli/main.py

@@ -41,6 +41,7 @@ _CLI_FUNCS: ta.Sequence[CliFunc] = [
 def _build_arg_parser() -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser()
     parser.add_argument('--cli-pkg-root', action='append')
+    parser.add_argument('--cli-debug', action='store_true')
     parser.add_argument('cmd', nargs='?')
     parser.add_argument('args', nargs=argparse.REMAINDER)
     return parser
@@ -132,23 +133,34 @@ def _select_cmd(args: ta.Any, cmds: ta.Mapping[str, CliCmd]) -> CliCmd | int:
 def _main() -> ta.Any:
     parser = _build_arg_parser()
     args = parser.parse_args()
-    cmds = _build_cmd_dct(args)
-    sel = _select_cmd(args, cmds)
 
-    match sel:
-        case int():
-            return sel
+    def inner():
+        cmds = _build_cmd_dct(args)
+        sel = _select_cmd(args, cmds)
 
-        case CliModule() as cm:
-            sys.argv = [args.cmd, *(args.args or ())]
-            runpy._run_module_as_main(cm.mod_name)  # type: ignore  # noqa
-            return 0
+        match sel:
+            case int():
+                return sel
 
-        case CliFunc() as cf:
-            return cf.fn(*(args.args or ()))
+            case CliModule() as cm:
+                sys.argv = [args.cmd, *(args.args or ())]
+                runpy._run_module_as_main(cm.mod_name)  # type: ignore  # noqa
+                return 0
 
-        case _:
-            raise TypeError(sel)
+            case CliFunc() as cf:
+                return cf.fn(*(args.args or ()))
+
+            case _:
+                raise TypeError(sel)
+
+    if args.cli_debug:
+        from omlish.diag.debug import debugging_on_exception
+
+        with debugging_on_exception():
+            return inner()
+
+    else:
+        return inner()
 
 
 if __name__ == '__main__':

{omdev-0.0.0.dev61 → omdev-0.0.0.dev63}/omdev/scripts/pyproject.py

@@ -3033,29 +3033,30 @@ def register_opj_marshaler(ty: ta.Any, m: ObjMarshaler) -> None:
 
 
 def _make_obj_marshaler(ty: ta.Any) -> ObjMarshaler:
-    if isinstance(ty, type) and abc.ABC in ty.__bases__:
-        impls = [  # type: ignore
-            PolymorphicObjMarshaler.Impl(
-                ity,
-                ity.__qualname__,
-                get_obj_marshaler(ity),
+    if isinstance(ty, type):
+        if abc.ABC in ty.__bases__:
+            impls = [  # type: ignore
+                PolymorphicObjMarshaler.Impl(
+                    ity,
+                    ity.__qualname__,
+                    get_obj_marshaler(ity),
+                )
+                for ity in deep_subclasses(ty)
+                if abc.ABC not in ity.__bases__
+            ]
+            return PolymorphicObjMarshaler(
+                {i.ty: i for i in impls},
+                {i.tag: i for i in impls},
             )
-            for ity in deep_subclasses(ty)
-            if abc.ABC not in ity.__bases__
-        ]
-        return PolymorphicObjMarshaler(
-            {i.ty: i for i in impls},
-            {i.tag: i for i in impls},
-        )
 
-    if isinstance(ty, type) and issubclass(ty, enum.Enum):
-        return EnumObjMarshaler(ty)
+        if issubclass(ty, enum.Enum):
+            return EnumObjMarshaler(ty)
 
-    if dc.is_dataclass(ty):
-        return DataclassObjMarshaler(
-            ty,
-            {f.name: get_obj_marshaler(f.type) for f in dc.fields(ty)},
-        )
+        if dc.is_dataclass(ty):
+            return DataclassObjMarshaler(
+                ty,
+                {f.name: get_obj_marshaler(f.type) for f in dc.fields(ty)},
+            )
 
     if is_generic_alias(ty):
         try:

{omdev-0.0.0.dev61 → omdev-0.0.0.dev63}/omdev/tools/dockertools.py

@@ -10,8 +10,11 @@ import typing as ta
 
 from omlish import argparse as ap
 from omlish import check
+from omlish import docker as dck
 from omlish import lang
 from omlish import logs
+from omlish import marshal as msh
+from omlish.formats import json
 from omlish.formats import yaml
 
 from ..cli import CliModule
@@ -179,6 +182,56 @@ class Cli(ap.Cli):
             with open(yml_file, 'w') as f:
                 f.write(new_src)
 
+    @ap.command(
+        ap.arg('repo'),
+        ap.arg('tags', nargs='*'),
+    )
+    def repo_info(self) -> int:
+        if (info := dck.get_hub_repo_info(self.args.repo, tags=self.args.tags or None)) is None:
+            return 1
+        print(json.dumps_pretty(msh.marshal(info)))
+        return 0
+
+    @ap.command(
+        ap.arg('image'),
+    )
+    def repo_latest_image(self) -> int:
+        if ':' in self.args.image:
+            repo, _, base = self.args.image.partition(':')
+        else:
+            repo, base = self.args.image, None
+        if (info := dck.get_hub_repo_info(repo)) is None:
+            return 1
+        print(dck.select_latest_tag(info.tags, base=base))
+        return 0
+
+    @ap.command(
+        ap.arg('-f', '--file'),
+    )
+    def compose_image_updates(self) -> None:
+        if self.args.file:
+            yml_file = self.args.file
+        else:
+            yml_file = os.path.join('docker', 'compose.yml')
+
+        with open(yml_file) as f:
+            yml_src = f.read()
+
+        cfg_dct = yaml.safe_load(yml_src)
+        for svc_name, svc_dct in cfg_dct.get('services', {}).items():
+            if not (img := svc_dct.get('image')):
+                continue
+
+            repo, _, base = img.partition(':')
+            if (info := dck.get_hub_repo_info(repo)) is None:
+                continue
+
+            lt = dck.select_latest_tag(info.tags, base=base)
+            if f'{repo}:{lt}' == img:
+                continue
+
+            print(f'{svc_name}: {lt}')
+
 
 # @omlish-manifest
 _CLI_MODULE = CliModule('docker', __name__)
@@ -186,4 +239,4 @@ _CLI_MODULE = CliModule('docker', __name__)
 
 if __name__ == '__main__':
     logs.configure_standard_logging('INFO')
-    Cli()()
+    Cli().call_and_exit()

{omdev-0.0.0.dev61 → omdev-0.0.0.dev63/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev61
+Version: 0.0.0.dev63
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: ~=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev61
+Requires-Dist: omlish==0.0.0.dev63
 Provides-Extra: all
 Requires-Dist: pycparser~=2.22; extra == "all"
 Requires-Dist: cffi~=1.17; extra == "all"

{omdev-0.0.0.dev61 → omdev-0.0.0.dev63}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev61
+omlish==0.0.0.dev63
 
 [all]
 pycparser~=2.22

{omdev-0.0.0.dev61 → omdev-0.0.0.dev63}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '~=3.12'
-version = '0.0.0.dev61'
+version = '0.0.0.dev63'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev61',
+    'omlish == 0.0.0.dev63',
 ]
 
 [project.optional-dependencies]