omdev 0.0.0.dev291__py3-none-any.whl → 0.0.0.dev292__py3-none-any.whl

omdev/.manifests.json

@@ -39,7 +39,7 @@
     "module": ".cli.clicli",
     "attr": "_CLI_MODULE",
     "file": "omdev/cli/clicli.py",
-    "line": 168,
+    "line": 173,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "cli",

omdev/ci/compose.py

@@ -155,7 +155,7 @@ class DockerComposeRun(AsyncExitStacked):
 
         async with contextlib.AsyncExitStack() as es:
             if not (self._cfg.no_dependencies or self._cfg.no_dependency_cleanup):
-                await es.enter_async_context(adefer(self._cleanup_dependencies))  # noqa
+                await es.enter_async_context(adefer(self._cleanup_dependencies()))  # noqa
 
             sh_cmd = ' '.join([
                 'docker',

omdev/cli/clicli.py

@@ -1,5 +1,6 @@
 import inspect
 import os
+import shlex
 import subprocess
 import sys
 import typing as ta
@@ -76,6 +77,7 @@ class CliCli(ap.Cli):
         ap.arg('--url', default=DEFAULT_REINSTALL_URL),
         ap.arg('--local', action='store_true'),
         ap.arg('--no-deps', action='store_true'),
+        ap.arg('--dry-run', action='store_true'),
         ap.arg('extra_deps', nargs='*'),
     )
     def reinstall(self) -> None:
@@ -147,7 +149,7 @@ class CliCli(ap.Cli):
 
             reco_cmd = ' '.join([
                 'curl -LsSf',
-                url,
+                f"'{url}'" if (qu := shlex.quote(url)) == url else qu,
                 '| python3 -',
                 *deps,
             ])
@@ -156,6 +158,9 @@ class CliCli(ap.Cli):
             with urllib.request.urlopen(urllib.request.Request(url)) as resp:  # noqa
                 install_src = resp.read().decode('utf-8')
 
+        if self.args.dry_run:
+            return
+
         os.execl(
             sys.executable,
             sys.executable,

omdev/scripts/ci.py

@@ -3331,7 +3331,9 @@ class AsyncExitStacked:
 
 
 @contextlib.contextmanager
-def defer(fn: ta.Callable) -> ta.Generator[ta.Callable, None, None]:
+def defer(fn: ta.Callable, *args: ta.Any, **kwargs: ta.Any) -> ta.Generator[ta.Callable, None, None]:
+    if args or kwargs:
+        fn = functools.partial(fn, *args, **kwargs)
     try:
         yield fn
     finally:
@@ -3339,11 +3341,11 @@ def defer(fn: ta.Callable) -> ta.Generator[ta.Callable, None, None]:
 
 
 @contextlib.asynccontextmanager
-async def adefer(fn: ta.Callable) -> ta.AsyncGenerator[ta.Callable, None]:
+async def adefer(fn: ta.Awaitable) -> ta.AsyncGenerator[ta.Awaitable, None]:
     try:
         yield fn
     finally:
-        await fn()
+        await fn
 
 
 ##
@@ -11702,7 +11704,7 @@ class DockerComposeRun(AsyncExitStacked):
 
         async with contextlib.AsyncExitStack() as es:
             if not (self._cfg.no_dependencies or self._cfg.no_dependency_cleanup):
-                await es.enter_async_context(adefer(self._cleanup_dependencies))  # noqa
+                await es.enter_async_context(adefer(self._cleanup_dependencies()))  # noqa
 
             sh_cmd = ' '.join([
                 'docker',

{omdev-0.0.0.dev291.dist-info → omdev-0.0.0.dev292.dist-info}/METADATA

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

{omdev-0.0.0.dev291.dist-info → omdev-0.0.0.dev292.dist-info}/RECORD

@@ -1,4 +1,4 @@
-omdev/.manifests.json,sha256=zmYuVLzazV03KggE8ZqY0MlVvpEwChvCWh_wfCSEn3w,10394
+omdev/.manifests.json,sha256=NMpBMsMXhfagy-iPTPxxWagDgrBIE5CTXHmLhl8_FOU,10394
 omdev/__about__.py,sha256=OgO_8azOzKriF2qPeDWRLcRe9p1XW5kYdJCq5vewff0,1171
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cmake.py,sha256=9rfSvFHPmKDj9ngvfDB2vK8O-xO_ZwUm7hMKLWA-yOw,4578
@@ -68,7 +68,7 @@ omdev/ci/__main__.py,sha256=Jsrv3P7LX2Cg08W7ByZfZ1JQT4lgLDPW1qNAmShFuMk,75
 omdev/ci/cache.py,sha256=MMPx3BMKVGnF2yASEjikvao8H2lRrUdik4eYU8xcFnQ,8352
 omdev/ci/ci.py,sha256=w08Bmdm0dO_ew4ohaKH2mUnRSaJGNS57pbecAlI5X-A,7917
 omdev/ci/cli.py,sha256=jpgdmZS8qLrY9YGC29sizyo6ue3uR5yXf0lSzNFuRiw,7183
-omdev/ci/compose.py,sha256=LX2QKB8DP3ADjJA1-8G_cncZqXnhD_7fQSM5aAo93Zw,4510
+omdev/ci/compose.py,sha256=QgN6H66nItcJniivFiw7nL4tgUARHqap8QzxEdcbwDc,4512
 omdev/ci/consts.py,sha256=HkSYz-_hHilcHPBvRs-SwcUxW7vMNlHXZ8OyIKnVQbQ,21
 omdev/ci/inject.py,sha256=-rEXOxGNZQLz-CUEen3w8p21xMVkbrcKi8FRNOP_p9k,1924
 omdev/ci/requirements.py,sha256=UKN6avU5V96YmmJL8XYvMPxzzOagrKpGTYadaxI2z9U,2105
@@ -105,7 +105,7 @@ omdev/ci/github/api/v2/client.py,sha256=scY_Nmzt6wKjFt_YjTq0CjBHArV8DnLQeLlxlpSh
 omdev/cli/__init__.py,sha256=V_l6VP1SZMlJbO-8CJwSuO9TThOy2S_oaPepNYgIrbE,37
 omdev/cli/__main__.py,sha256=mOJpgc07o0r5luQ1DlX4tk2PqZkgmbwPbdzJ3KmtjgQ,138
 omdev/cli/_pathhack.py,sha256=kxqb2kHap68Lkh8b211rDbcgj06hidBiAKA3f9posyc,2119
-omdev/cli/clicli.py,sha256=b3ZuzsgTIq3-OR90a2R8eI2vNYHr_S53NdLkcttPkxc,4313
+omdev/cli/clicli.py,sha256=KWDQl1tsJctk-3AOWOf7IP2b4khoUhb0kyfrj3Df5VU,4476
 omdev/cli/install.py,sha256=C-W171YlIHt4Cfok-nWSMbHwWhqF_PFqq2HixFttYx8,4460
 omdev/cli/main.py,sha256=dxZFyzKuwRykHHhoKKUA0fUa9QsY0dgdvLHbXNuIPCY,6694
 omdev/cli/managers.py,sha256=BV98_n30Jj63OJrFgRoVZRfICxMLXEZKoEn4rMj9LV4,1160
@@ -226,7 +226,7 @@ omdev/pyproject/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 omdev/pyproject/resources/docker-dev.sh,sha256=DHkz5D18jok_oDolfg2mqrvGRWFoCe9GQo04dR1czcc,838
 omdev/pyproject/resources/python.sh,sha256=rFaN4SiJ9hdLDXXsDTwugI6zsw6EPkgYMmtacZeTbvw,749
 omdev/scripts/__init__.py,sha256=MKCvUAEQwsIvwLixwtPlpBqmkMXLCnjjXyAXvVpDwVk,91
-omdev/scripts/ci.py,sha256=POmSM31nJ9DK-3WXJUPMotOGuN7_0ciJCOYB1mGm8MA,353131
+omdev/scripts/ci.py,sha256=el2XV4fefwP3qMavQ6vDDAXOfEAyTepzpkIt9R5WyWw,353241
 omdev/scripts/interp.py,sha256=xIPlK_zF_6qqyZev8hsCrx5YQYMAPkYpa1i61ouOyEc,151774
 omdev/scripts/pyproject.py,sha256=S_u1a-97woo7twmaTNN8yHNaVGP2Lye1OPocIc1A57M,260925
 omdev/scripts/slowcat.py,sha256=lssv4yrgJHiWfOiHkUut2p8E8Tq32zB-ujXESQxFFHY,2728
@@ -265,9 +265,9 @@ omdev/tools/json/rendering.py,sha256=tMcjOW5edfozcMSTxxvF7WVTsbYLoe9bCKFh50qyaGw
 omdev/tools/pawk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/pawk/__main__.py,sha256=VCqeRVnqT1RPEoIrqHFSu4PXVMg4YEgF4qCQm90-eRI,66
 omdev/tools/pawk/pawk.py,sha256=zsEkfQX0jF5bn712uqPAyBSdJt2dno1LH2oeSMNfXQI,11424
-omdev-0.0.0.dev291.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev291.dist-info/METADATA,sha256=w8Wkb4mWgtDfnrOR24J-FjznCubjmqWkXutMBJYwIZs,1478
-omdev-0.0.0.dev291.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-omdev-0.0.0.dev291.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev291.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev291.dist-info/RECORD,,
+omdev-0.0.0.dev292.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev292.dist-info/METADATA,sha256=TuMFUm1uQeAWitZoLBEf1yrCGF8CKcWzdNVp1SN7AIw,1478
+omdev-0.0.0.dev292.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+omdev-0.0.0.dev292.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev292.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev292.dist-info/RECORD,,