omdev 0.0.0.dev145__tar.gz → 0.0.0.dev146__tar.gz

{omdev-0.0.0.dev145/omdev.egg-info → omdev-0.0.0.dev146}/PKG-INFO

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

{omdev-0.0.0.dev145 → omdev-0.0.0.dev146}/omdev/.manifests.json

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

{omdev-0.0.0.dev145 → omdev-0.0.0.dev146}/omdev/amalg/amalg.py

@@ -25,8 +25,10 @@ Targets:
 """
 import argparse
 import ast
+import base64
 import dataclasses as dc
 import io
+import itertools
 import logging
 import os.path
 import re
@@ -286,6 +288,37 @@ def is_root_level_if_type_checking_block(lts: Tokens) -> bool:
 ##
 
 
+class RootLevelResourcesRead(ta.NamedTuple):
+    variable: str
+    kind: ta.Literal['binary', 'text']
+    resource: str
+
+
+def is_root_level_resources_read(lts: Tokens) -> RootLevelResourcesRead | None:
+    wts = list(tks.ignore_ws(lts, keep=['INDENT']))
+
+    if not tks.match_toks(wts, [
+        ('NAME', None),
+        ('OP', '='),
+        ('NAME', ('read_package_resource_binary', 'read_package_resource_text')),
+        ('OP', '('),
+        ('NAME', '__package__'),
+        ('OP', ','),
+        ('STRING', None),
+        ('OP', ')'),
+    ]):
+        return None
+
+    return RootLevelResourcesRead(
+        wts[0].src,
+        'binary' if wts[2].src == 'read_package_resource_binary' else 'text',
+        ast.literal_eval(wts[6].src),
+    )
+
+
+##
+
+
 @dc.dataclass(frozen=True, kw_only=True)
 class SrcFile:
     path: str
@@ -301,6 +334,8 @@ class SrcFile:
 
     ruff_noqa: ta.AbstractSet[str] = dc.field(repr=False)
 
+    has_binary_resources: bool = False
+
 
 def make_src_file(
         path: str,
@@ -322,6 +357,8 @@ def make_src_file(
     tys: list[Typing] = []
     ctls: list[Tokens] = []
 
+    has_binary_resources = False
+
     i = 0
     while i < len(cls):
         line = cls[i]
@@ -383,6 +420,57 @@ def make_src_file(
                 i += 1
                 skip_block()
 
+        elif (rsrc := is_root_level_resources_read(line)) is not None:
+            rf = os.path.join(os.path.dirname(path), rsrc.resource)
+
+            if rsrc.kind == 'binary':
+                with open(rf, 'rb') as bf:
+                    rb = bf.read()  # noqa
+
+                ctls.append([
+                    trt.Token(name='NAME', src=rsrc.variable),
+                    trt.Token(name='UNIMPORTANT_WS', src=' '),
+                    trt.Token(name='OP', src='='),
+                    trt.Token(name='UNIMPORTANT_WS', src=' '),
+                    trt.Token(name='NAME', src='base64'),
+                    trt.Token(name='OP', src='.'),
+                    trt.Token(name='NAME', src='b64decode'),
+                    trt.Token(name='OP', src='('),
+                    trt.Token(name='NL', src='\n'),
+                ])
+
+                rb64 = base64.b64encode(rb).decode('ascii')
+                for chunk in itertools.batched(rb64, 96):
+                    ctls.append([
+                        trt.Token(name='UNIMPORTANT_WS', src='    '),
+                        trt.Token(name='STRING', src=f"'{''.join(chunk)}'"),
+                        trt.Token(name='NL', src='\n'),
+                    ])
+
+                ctls.append([
+                    trt.Token(name='OP', src=')'),
+                    trt.Token(name='NEWLINE', src='\n'),
+                ])
+
+                has_binary_resources = True
+
+            elif rsrc.kind == 'text':
+                with open(rf) as tf:
+                    rt = tf.read()  # noqa
+                rt = rt.replace('\\', '\\\\')  # Escape backslashes
+                rt = rt.replace('"""', r'\"\"\"')
+                ctls.append([
+                    trt.Token(name='NAME', src=rsrc.variable),
+                    trt.Token(name='UNIMPORTANT_WS', src=' '),
+                    trt.Token(name='OP', src='='),
+                    trt.Token(name='UNIMPORTANT_WS', src=' '),
+                    trt.Token(name='STRING', src=f'"""\\\n{rt}"""\n'),
+                    trt.Token(name='NEWLINE', src=''),
+                ])
+
+            else:
+                raise ValueError(rsrc.kind)
+
         else:
             ctls.append(line)
 
@@ -399,6 +487,8 @@ def make_src_file(
         content_lines=ctls,
 
         ruff_noqa=set(lang.flatten(tks.join_toks(l).strip().split()[3:] for l in rnls)),  # noqa
+
+        has_binary_resources=has_binary_resources,
     )
 
 
@@ -488,6 +578,8 @@ def gen_amalg(
     dct: dict = {
         ('sys', None, None): ['import sys\n'],
     }
+    if any(sf.has_binary_resources for sf in src_files.values()):
+        dct[('base64', None, None)] = ['import base64\n']
     for imp in gl_imps:
         dct.setdefault((imp.mod, imp.item, imp.as_), []).append(imp)
     for _, l in sorted(dct.items()):

{omdev-0.0.0.dev145 → omdev-0.0.0.dev146}/omdev/interp/resolvers.py

@@ -35,7 +35,7 @@ class InterpResolver:
             if spec.contains(si)
         ]
 
-        slst = sorted(lst, key=lambda t: (-t[0], t[1]))
+        slst = sorted(lst, key=lambda t: (-t[0], t[1].version))
         if not slst:
             return None
 

{omdev-0.0.0.dev145 → omdev-0.0.0.dev146}/omdev/scripts/interp.py

@@ -2530,7 +2530,7 @@ class InterpResolver:
             if spec.contains(si)
         ]
 
-        slst = sorted(lst, key=lambda t: (-t[0], t[1]))
+        slst = sorted(lst, key=lambda t: (-t[0], t[1].version))
         if not slst:
             return None
 

{omdev-0.0.0.dev145 → omdev-0.0.0.dev146}/omdev/scripts/pyproject.py

@@ -5748,7 +5748,7 @@ class InterpResolver:
             if spec.contains(si)
         ]
 
-        slst = sorted(lst, key=lambda t: (-t[0], t[1]))
+        slst = sorted(lst, key=lambda t: (-t[0], t[1].version))
         if not slst:
             return None
 

{omdev-0.0.0.dev145 → omdev-0.0.0.dev146}/omdev/tokens.py

@@ -61,7 +61,7 @@ def join_lines(ls: ta.Iterable[Tokens]) -> str:
 
 def match_toks(
         ts: ta.Iterable['trt.Token'],
-        pat: ta.Sequence[tuple[str | None, str | None]],
+        pat: ta.Sequence[tuple[str | None, str | tuple[str, ...] | None]],
 ) -> bool:
     it = iter(ts)
     for pn, ps in pat:
@@ -71,6 +71,13 @@ def match_toks(
             return False
         if pn is not None and t.name != pn:
             return False
-        if ps is not None and t.src != ps:
-            return False
+        if ps is not None:
+            if isinstance(ps, str):
+                if t.src != ps:
+                    return False
+            elif isinstance(ps, tuple):
+                if t.src not in ps:
+                    return False
+            else:
+                raise TypeError(ps)
     return True

{omdev-0.0.0.dev145 → omdev-0.0.0.dev146}/omdev/tools/docker.py

@@ -1,6 +1,6 @@
 """
 TODO:
- - check for updates
+ - https://github.com/zeromake/docker-debug
 """
 import os
 import re
@@ -232,6 +232,19 @@ 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',
+            'lirantal/dockly',
+        )
+
 
 # @omlish-manifest
 _CLI_MODULE = CliModule('docker', __name__)

{omdev-0.0.0.dev145 → omdev-0.0.0.dev146}/omdev/tools/git.py

@@ -1,3 +1,7 @@
+"""
+TODO:
+ - https://github.com/vegardit/bash-funk/blob/main/docs/git.md
+"""
 import os
 import re
 import subprocess

{omdev-0.0.0.dev145 → omdev-0.0.0.dev146/omdev.egg-info}/PKG-INFO

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

{omdev-0.0.0.dev145 → omdev-0.0.0.dev146}/omdev.egg-info/requires.txt

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

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