ominfra 0.0.0.dev148__tar.gz → 0.0.0.dev149__tar.gz

{ominfra-0.0.0.dev148/ominfra.egg-info → ominfra-0.0.0.dev149}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev148
+Version: 0.0.0.dev149
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev148
-Requires-Dist: omlish==0.0.0.dev148
+Requires-Dist: omdev==0.0.0.dev149
+Requires-Dist: omlish==0.0.0.dev149
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.18; extra == "all"

{ominfra-0.0.0.dev148 → ominfra-0.0.0.dev149}/ominfra/clouds/aws/cli.py

@@ -1,4 +1,4 @@
-from omlish import argparse as ap
+from omlish.argparse import all as ap
 from omlish.formats import json
 
 from . import metadata

{ominfra-0.0.0.dev148 → ominfra-0.0.0.dev149}/ominfra/journald/messages.py

@@ -4,8 +4,8 @@ import dataclasses as dc
 import json
 import typing as ta
 
+from omlish.io.buffers import DelimitingBuffer
 from omlish.lite.check import check_isinstance
-from omlish.lite.io import DelimitingBuffer
 from omlish.lite.logs import log
 
 

{ominfra-0.0.0.dev148 → ominfra-0.0.0.dev149}/ominfra/manage/deploy/paths.py

@@ -37,8 +37,8 @@ import os.path
 import typing as ta
 
 from omlish.lite.check import check_equal
-from omlish.lite.check import check_non_empty
 from omlish.lite.check import check_non_empty_str
+from omlish.lite.check import check_not_empty
 from omlish.lite.check import check_not_in
 
 
@@ -151,7 +151,7 @@ class DeployPath:
     parts: ta.Sequence[DeployPathPart]
 
     def __post_init__(self) -> None:
-        check_non_empty(self.parts)
+        check_not_empty(self.parts)
         for p in self.parts[:-1]:
             check_equal(p.kind, 'dir')
 

{ominfra-0.0.0.dev148 → ominfra-0.0.0.dev149}/ominfra/scripts/journald2aws.py

@@ -989,6 +989,11 @@ def check_non_empty_str(v: ta.Optional[str]) -> str:
     return v
 
 
+def check_arg(v: bool, msg: str = 'Illegal argument') -> None:
+    if not v:
+        raise ValueError(msg)
+
+
 def check_state(v: bool, msg: str = 'Illegal state') -> None:
     if not v:
         raise ValueError(msg)
@@ -1041,7 +1046,7 @@ def check_empty(v: SizedT) -> SizedT:
     return v
 
 
-def check_non_empty(v: SizedT) -> SizedT:
+def check_not_empty(v: SizedT) -> SizedT:
     if not len(v):
         raise ValueError(v)
     return v
@@ -1630,65 +1635,7 @@ class AwsDataclassMeta:
 
 
 ########################################
-# ../../../../../omlish/lite/contextmanagers.py
-
-
-##
-
-
-class ExitStacked:
-    _exit_stack: ta.Optional[contextlib.ExitStack] = None
-
-    def __enter__(self: ExitStackedT) -> ExitStackedT:
-        check_state(self._exit_stack is None)
-        es = self._exit_stack = contextlib.ExitStack()
-        es.__enter__()
-        return self
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        if (es := self._exit_stack) is None:
-            return None
-        self._exit_contexts()
-        return es.__exit__(exc_type, exc_val, exc_tb)
-
-    def _exit_contexts(self) -> None:
-        pass
-
-    def _enter_context(self, cm: ta.ContextManager[T]) -> T:
-        es = check_not_none(self._exit_stack)
-        return es.enter_context(cm)
-
-
-##
-
-
-@contextlib.contextmanager
-def defer(fn: ta.Callable) -> ta.Generator[ta.Callable, None, None]:
-    try:
-        yield fn
-    finally:
-        fn()
-
-
-@contextlib.contextmanager
-def attr_setting(obj, attr, val, *, default=None):  # noqa
-    not_set = object()
-    orig = getattr(obj, attr, not_set)
-    try:
-        setattr(obj, attr, val)
-        if orig is not not_set:
-            yield orig
-        else:
-            yield default
-    finally:
-        if orig is not_set:
-            delattr(obj, attr)
-        else:
-            setattr(obj, attr, orig)
-
-
-########################################
-# ../../../../../omlish/lite/io.py
+# ../../../../../omlish/io/buffers.py
 
 
 class DelimitingBuffer:
@@ -1875,7 +1822,7 @@ class IncrementalWriteBuffer:
     ) -> None:
         super().__init__()
 
-        check_non_empty(data)
+        check_not_empty(data)
         self._len = len(data)
         self._write_size = write_size
 
@@ -1890,11 +1837,11 @@ class IncrementalWriteBuffer:
         return self._len - self._pos
 
     def write(self, fn: ta.Callable[[bytes], int]) -> int:
-        lst = check_non_empty(self._lst)
+        lst = check_not_empty(self._lst)
 
         t = 0
         for i, d in enumerate(lst):  # noqa
-            n = fn(check_non_empty(d))
+            n = fn(check_not_empty(d))
             if not n:
                 break
             t += n
@@ -1909,6 +1856,64 @@ class IncrementalWriteBuffer:
         return t
 
 
+########################################
+# ../../../../../omlish/lite/contextmanagers.py
+
+
+##
+
+
+class ExitStacked:
+    _exit_stack: ta.Optional[contextlib.ExitStack] = None
+
+    def __enter__(self: ExitStackedT) -> ExitStackedT:
+        check_state(self._exit_stack is None)
+        es = self._exit_stack = contextlib.ExitStack()
+        es.__enter__()
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        if (es := self._exit_stack) is None:
+            return None
+        self._exit_contexts()
+        return es.__exit__(exc_type, exc_val, exc_tb)
+
+    def _exit_contexts(self) -> None:
+        pass
+
+    def _enter_context(self, cm: ta.ContextManager[T]) -> T:
+        es = check_not_none(self._exit_stack)
+        return es.enter_context(cm)
+
+
+##
+
+
+@contextlib.contextmanager
+def defer(fn: ta.Callable) -> ta.Generator[ta.Callable, None, None]:
+    try:
+        yield fn
+    finally:
+        fn()
+
+
+@contextlib.contextmanager
+def attr_setting(obj, attr, val, *, default=None):  # noqa
+    not_set = object()
+    orig = getattr(obj, attr, not_set)
+    try:
+        setattr(obj, attr, val)
+        if orig is not not_set:
+            yield orig
+        else:
+            yield default
+    finally:
+        if orig is not_set:
+            delattr(obj, attr)
+        else:
+            setattr(obj, attr, orig)
+
+
 ########################################
 # ../../../../../omlish/lite/logs.py
 """

{ominfra-0.0.0.dev148 → ominfra-0.0.0.dev149}/ominfra/scripts/manage.py

@@ -1189,6 +1189,11 @@ def check_non_empty_str(v: ta.Optional[str]) -> str:
     return v
 
 
+def check_arg(v: bool, msg: str = 'Illegal argument') -> None:
+    if not v:
+        raise ValueError(msg)
+
+
 def check_state(v: bool, msg: str = 'Illegal state') -> None:
     if not v:
         raise ValueError(msg)
@@ -1241,7 +1246,7 @@ def check_empty(v: SizedT) -> SizedT:
     return v
 
 
-def check_non_empty(v: SizedT) -> SizedT:
+def check_not_empty(v: SizedT) -> SizedT:
     if not len(v):
         raise ValueError(v)
     return v