ominfra 0.0.0.dev188__tar.gz → 0.0.0.dev189__tar.gz

{ominfra-0.0.0.dev188/ominfra.egg-info → ominfra-0.0.0.dev189}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev188
+Version: 0.0.0.dev189
 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.dev188
-Requires-Dist: omlish==0.0.0.dev188
+Requires-Dist: omdev==0.0.0.dev189
+Requires-Dist: omlish==0.0.0.dev189
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.18; extra == "all"

{ominfra-0.0.0.dev188 → ominfra-0.0.0.dev189}/ominfra/scripts/journald2aws.py

@@ -2344,10 +2344,15 @@ class DelimitingBuffer:
 
 
 class ReadableListBuffer:
+    # FIXME: merge with PrependableGeneratorReader
+
     def __init__(self) -> None:
         super().__init__()
         self._lst: list[bytes] = []
 
+    def __len__(self) -> int:
+        return sum(map(len, self._lst))
+
     def feed(self, d: bytes) -> None:
         if d:
             self._lst.append(d)
@@ -2386,6 +2391,12 @@ class ReadableListBuffer:
 
         return None
 
+    def read_exact(self, sz: int) -> bytes:
+        d = self.read(sz)
+        if d is None or len(d) != sz:
+            raise EOFError(f'ReadableListBuffer got {"no" if d is None else len(d)}, expected {sz}')
+        return d
+
     def read_until(self, delim: bytes = b'\n') -> ta.Optional[bytes]:
         if not (lst := self._lst):
             return None

{ominfra-0.0.0.dev188 → ominfra-0.0.0.dev189}/ominfra/scripts/supervisor.py

@@ -3652,10 +3652,15 @@ class DelimitingBuffer:
 
 
 class ReadableListBuffer:
+    # FIXME: merge with PrependableGeneratorReader
+
     def __init__(self) -> None:
         super().__init__()
         self._lst: list[bytes] = []
 
+    def __len__(self) -> int:
+        return sum(map(len, self._lst))
+
     def feed(self, d: bytes) -> None:
         if d:
             self._lst.append(d)
@@ -3694,6 +3699,12 @@ class ReadableListBuffer:
 
         return None
 
+    def read_exact(self, sz: int) -> bytes:
+        d = self.read(sz)
+        if d is None or len(d) != sz:
+            raise EOFError(f'ReadableListBuffer got {"no" if d is None else len(d)}, expected {sz}')
+        return d
+
     def read_until(self, delim: bytes = b'\n') -> ta.Optional[bytes]:
         if not (lst := self._lst):
             return None

{ominfra-0.0.0.dev188 → ominfra-0.0.0.dev189/ominfra.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ominfra
-Version: 0.0.0.dev188
+Version: 0.0.0.dev189
 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.dev188
-Requires-Dist: omlish==0.0.0.dev188
+Requires-Dist: omdev==0.0.0.dev189
+Requires-Dist: omlish==0.0.0.dev189
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.18; extra == "all"

{ominfra-0.0.0.dev188 → ominfra-0.0.0.dev189}/ominfra.egg-info/requires.txt

@@ -1,5 +1,5 @@
-omdev==0.0.0.dev188
-omlish==0.0.0.dev188
+omdev==0.0.0.dev189
+omlish==0.0.0.dev189
 
 [all]
 paramiko~=3.5

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