omdev 0.0.0.dev153__tar.gz → 0.0.0.dev155__tar.gz

{omdev-0.0.0.dev153/omdev.egg-info → omdev-0.0.0.dev155}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev153
+Version: 0.0.0.dev155
 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.dev153
+Requires-Dist: omlish==0.0.0.dev155
 Provides-Extra: all
 Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev153 → omdev-0.0.0.dev155}/omdev/.manifests.json

@@ -255,7 +255,7 @@
     "module": ".tools.docker",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/docker.py",
-    "line": 249,
+    "line": 258,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "docker",

{omdev-0.0.0.dev153 → omdev-0.0.0.dev155}/omdev/manifests/build.py

@@ -1,5 +1,4 @@
 # ruff: noqa: UP006 UP007
-# @omlish-lite
 """
 TODO:
  - verify classes instantiate

{omdev-0.0.0.dev153 → omdev-0.0.0.dev155}/omdev/manifests/main.py

@@ -1,3 +1,4 @@
+# ruff: noqa: UP006 UP007
 import argparse
 import asyncio
 import dataclasses as dc

{omdev-0.0.0.dev153 → omdev-0.0.0.dev155}/omdev/scripts/interp.py

@@ -560,8 +560,6 @@ def async_cached_nullary(fn):  # ta.Callable[..., T]) -> ta.Callable[..., T]:
 """
 TODO:
  - def maybe(v: lang.Maybe[T])
- - patch / override lite.check ?
-  - checker interface?
 """
 
 
@@ -2408,6 +2406,13 @@ async def asyncio_subprocess_communicate(
     return await AsyncioProcessCommunicator(proc).communicate(input, timeout)  # noqa
 
 
+@dc.dataclass(frozen=True)
+class AsyncioSubprocessOutput:
+    proc: asyncio.subprocess.Process
+    stdout: ta.Optional[bytes]
+    stderr: ta.Optional[bytes]
+
+
 async def asyncio_subprocess_run(
         *args: str,
         input: ta.Any = None,  # noqa
@@ -2415,7 +2420,7 @@ async def asyncio_subprocess_run(
         check: bool = False,  # noqa
         capture_output: ta.Optional[bool] = None,
         **kwargs: ta.Any,
-) -> ta.Tuple[ta.Optional[bytes], ta.Optional[bytes]]:
+) -> AsyncioSubprocessOutput:
     if capture_output:
         kwargs.setdefault('stdout', subprocess.PIPE)
         kwargs.setdefault('stderr', subprocess.PIPE)
@@ -2434,7 +2439,11 @@ async def asyncio_subprocess_run(
             stderr=stderr,
         )
 
-    return stdout, stderr
+    return AsyncioSubprocessOutput(
+        proc,
+        stdout,
+        stderr,
+    )
 
 
 ##
@@ -2447,7 +2456,7 @@ async def asyncio_subprocess_check_call(
         timeout: ta.Optional[float] = None,
         **kwargs: ta.Any,
 ) -> None:
-    _, _ = await asyncio_subprocess_run(
+    await asyncio_subprocess_run(
         *args,
         stdout=stdout,
         input=input,
@@ -2463,7 +2472,7 @@ async def asyncio_subprocess_check_output(
         timeout: ta.Optional[float] = None,
         **kwargs: ta.Any,
 ) -> bytes:
-    stdout, stderr = await asyncio_subprocess_run(
+    out = await asyncio_subprocess_run(
         *args,
         stdout=asyncio.subprocess.PIPE,
         input=input,
@@ -2472,7 +2481,7 @@ async def asyncio_subprocess_check_output(
         **kwargs,
     )
 
-    return check.not_none(stdout)
+    return check.not_none(out.stdout)
 
 
 async def asyncio_subprocess_check_output_str(*args: str, **kwargs: ta.Any) -> str:

{omdev-0.0.0.dev153 → omdev-0.0.0.dev155}/omdev/scripts/pyproject.py

@@ -1852,8 +1852,6 @@ def async_cached_nullary(fn):  # ta.Callable[..., T]) -> ta.Callable[..., T]:
 """
 TODO:
  - def maybe(v: lang.Maybe[T])
- - patch / override lite.check ?
-  - checker interface?
 """
 
 
@@ -3756,7 +3754,8 @@ def configure_standard_logging(
 """
 TODO:
  - pickle stdlib objs? have to pin to 3.8 pickle protocol, will be cross-version
- - nonstrict toggle
+ - namedtuple
+ - literals
 """
 
 
@@ -4046,14 +4045,18 @@ class ObjMarshalerManager:
     ) -> ObjMarshaler:
         if isinstance(ty, type):
             if abc.ABC in ty.__bases__:
-                return PolymorphicObjMarshaler.of([  # type: ignore
+                impls = [ity for ity in deep_subclasses(ty) if abc.ABC not in ity.__bases__]  # type: ignore
+                if all(ity.__qualname__.endswith(ty.__name__) for ity in impls):
+                    ins = {ity: snake_case(ity.__qualname__[:-len(ty.__name__)]) for ity in impls}
+                else:
+                    ins = {ity: ity.__qualname__ for ity in impls}
+                return PolymorphicObjMarshaler.of([
                     PolymorphicObjMarshaler.Impl(
                         ity,
-                        ity.__qualname__,
+                        itn,
                         rec(ity),
                     )
-                    for ity in deep_subclasses(ty)
-                    if abc.ABC not in ity.__bases__
+                    for ity, itn in ins.items()
                 ])
 
             if issubclass(ty, enum.Enum):
@@ -5222,6 +5225,13 @@ async def asyncio_subprocess_communicate(
     return await AsyncioProcessCommunicator(proc).communicate(input, timeout)  # noqa
 
 
+@dc.dataclass(frozen=True)
+class AsyncioSubprocessOutput:
+    proc: asyncio.subprocess.Process
+    stdout: ta.Optional[bytes]
+    stderr: ta.Optional[bytes]
+
+
 async def asyncio_subprocess_run(
         *args: str,
         input: ta.Any = None,  # noqa
@@ -5229,7 +5239,7 @@ async def asyncio_subprocess_run(
         check: bool = False,  # noqa
         capture_output: ta.Optional[bool] = None,
         **kwargs: ta.Any,
-) -> ta.Tuple[ta.Optional[bytes], ta.Optional[bytes]]:
+) -> AsyncioSubprocessOutput:
     if capture_output:
         kwargs.setdefault('stdout', subprocess.PIPE)
         kwargs.setdefault('stderr', subprocess.PIPE)
@@ -5248,7 +5258,11 @@ async def asyncio_subprocess_run(
             stderr=stderr,
         )
 
-    return stdout, stderr
+    return AsyncioSubprocessOutput(
+        proc,
+        stdout,
+        stderr,
+    )
 
 
 ##
@@ -5261,7 +5275,7 @@ async def asyncio_subprocess_check_call(
         timeout: ta.Optional[float] = None,
         **kwargs: ta.Any,
 ) -> None:
-    _, _ = await asyncio_subprocess_run(
+    await asyncio_subprocess_run(
         *args,
         stdout=stdout,
         input=input,
@@ -5277,7 +5291,7 @@ async def asyncio_subprocess_check_output(
         timeout: ta.Optional[float] = None,
         **kwargs: ta.Any,
 ) -> bytes:
-    stdout, stderr = await asyncio_subprocess_run(
+    out = await asyncio_subprocess_run(
         *args,
         stdout=asyncio.subprocess.PIPE,
         input=input,
@@ -5286,7 +5300,7 @@ async def asyncio_subprocess_check_output(
         **kwargs,
     )
 
-    return check.not_none(stdout)
+    return check.not_none(out.stdout)
 
 
 async def asyncio_subprocess_check_output_str(*args: str, **kwargs: ta.Any) -> str:

omdev-0.0.0.dev155/omdev/toml/__init__.py

@@ -0,0 +1 @@
+# @omlish-lite

{omdev-0.0.0.dev153 → omdev-0.0.0.dev155}/omdev/tools/docker.py

@@ -232,19 +232,28 @@ class Cli(ap.Cli):
 
             print(f'{svc_name}: {lt}')
 
+    #
+
     @ap.command()
     def dockly(self) -> None:
         os.execl(
             exe := docker_exe(),
             exe,
-            'run',
-            '-it',
-            '--rm',
-            '-v',
-            '/var/run/docker.sock:/var/run/docker.sock',
+            'run', '-it', '--rm',
+            '-v', '/var/run/docker.sock:/var/run/docker.sock',
             'lirantal/dockly',
         )
 
+    @ap.command()
+    def lazy(self) -> None:
+        os.execl(
+            exe := docker_exe(),
+            exe,
+            'run', '-it', '--rm',
+            '-v', '/var/run/docker.sock:/var/run/docker.sock',
+            'lazyteam/lazydocker',
+        )
+
 
 # @omlish-manifest
 _CLI_MODULE = CliModule('docker', __name__)

{omdev-0.0.0.dev153 → omdev-0.0.0.dev155}/omdev/tools/git.py

@@ -119,10 +119,10 @@ class Cli(ap.Cli):
         day_rev = check.not_none(get_first_commit_of_day(rev))
         base_rev = rev_parse(f'{day_rev}~1')
 
-        if self.args.diff or self.args.diff_stat:
-            os.execvp('git', ['git', 'diff', *(['--stat'] if self.args.diff_stat else []), base_rev, rev])
+        if self.args.diff or self.args.stat:
+            os.execvp('git', ['git', 'diff', *(['--stat'] if self.args.stat else []), base_rev, rev])
 
-        elif self.args.github:
+        elif self.args.github or self.args.open:
             rm_url = subprocess.check_output(['git', 'remote', 'get-url', 'origin']).decode('utf-8').strip()
 
             if rm_url.startswith(git_pfx := 'git@github.com:'):

{omdev-0.0.0.dev153 → omdev-0.0.0.dev155/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev153
+Version: 0.0.0.dev155
 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.dev153
+Requires-Dist: omlish==0.0.0.dev155
 Provides-Extra: all
 Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev153 → omdev-0.0.0.dev155}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev153
+omlish==0.0.0.dev155
 
 [all]
 black~=24.10

{omdev-0.0.0.dev153 → omdev-0.0.0.dev155}/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.dev153'
+version = '0.0.0.dev155'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev153',
+    'omlish == 0.0.0.dev155',
 ]
 
 [project.optional-dependencies]