omdev 0.0.0.dev79__tar.gz → 0.0.0.dev81__tar.gz

{omdev-0.0.0.dev79/omdev.egg-info → omdev-0.0.0.dev81}/PKG-INFO

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

{omdev-0.0.0.dev79 → omdev-0.0.0.dev81}/omdev/.manifests.json

@@ -11,6 +11,18 @@
       }
     }
   },
+  {
+    "module": ".bracepy",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/bracepy.py",
+    "line": 88,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "bracepy",
+        "mod_name": "omdev.bracepy"
+      }
+    }
+  },
   {
     "module": ".cexts.cmake",
     "attr": "_CLI_MODULE",
@@ -47,6 +59,30 @@
       }
     }
   },
+  {
+    "module": ".findimports",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/findimports.py",
+    "line": 81,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "py/findimports",
+        "mod_name": "omdev.findimports"
+      }
+    }
+  },
+  {
+    "module": ".findmagic",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/findmagic.py",
+    "line": 65,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "py/findmagic",
+        "mod_name": "omdev.findmagic"
+      }
+    }
+  },
   {
     "module": ".imgur",
     "attr": "_FOO_CLI_MODULE",

{omdev-0.0.0.dev79 → omdev-0.0.0.dev81}/omdev/amalg/amalg.py

@@ -24,6 +24,7 @@ Targets:
  - supervisor?
 """
 import argparse
+import ast
 import dataclasses as dc
 import io
 import logging
@@ -297,7 +298,11 @@ def make_src_file(
     tys: list[Typing] = []
     ctls: list[Tokens] = []
 
-    for line in cls:
+    i = 0
+    while i < len(cls):
+        line = cls[i]
+        i += 1
+
         if (imp := make_import(
                 line,
                 src_path=path,
@@ -311,6 +316,31 @@ def make_src_file(
         )) is not None:
             tys.append(ty)
 
+        elif (
+                line and
+                (ft := line[0]).name == 'COMMENT' and
+                ft.src.startswith('# @omlish-manifest')
+        ):
+            mls = [line]
+            while True:
+                mls.append(cls[i])
+                i += 1
+
+                msrc = tks.join_lines(mls).strip()
+                try:
+                    node = ast.parse(msrc)
+                except SyntaxError:
+                    continue
+
+                mmod = check.isinstance(node, ast.Module)
+                check.isinstance(check.single(mmod.body), ast.Assign)
+                break
+
+            ctls.extend([
+                [trt.Token('COMMENT', '# ' + tks.join_toks(ml))]
+                for ml in mls
+            ])
+
         else:
             ctls.append(line)
 

{omdev-0.0.0.dev79 → omdev-0.0.0.dev81}/omdev/bracepy.py

@@ -85,6 +85,13 @@ def translate_brace_python(
     return ret.getvalue()
 
 
+# @omlish-manifest
+_CLI_MODULE = {'$omdev.cli.types.CliModule': {
+    'cmd_name': 'bracepy',
+    'mod_name': __name__,
+}}
+
+
 if __name__ == '__main__':
     def _main(argv=None) -> None:
         import argparse

omdev-0.0.0.dev81/omdev/clipboard/clipboard.py

@@ -0,0 +1,23 @@
+"""
+https://askubuntu.com/questions/11925/a-command-line-clipboard-copy-and-paste-utility
+"""
+import abc
+import subprocess
+
+
+class Clipboard(abc.ABC):
+    @abc.abstractmethod
+    def get(self) -> str:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def put(self, s: str) -> None:
+        raise NotImplementedError
+
+
+class DarwinClipboard(Clipboard):
+    def get(self) -> str:
+        return subprocess.check_output(['pbpaste']).decode('utf-8')
+
+    def put(self, s: str) -> None:
+        subprocess.run(['pbcopy'], input=s.encode('utf-8'), check=True)

omdev-0.0.0.dev81/omdev/clipboard/darwin.py

@@ -0,0 +1,229 @@
+# ruff: noqa: N802 N816
+import ctypes as ct
+import ctypes.util
+import dataclasses as dc
+import sys
+import typing as ta
+
+from omlish import check
+
+
+##
+
+
+if getattr(sys, 'platform') != 'darwin':
+    raise OSError(sys.platform)
+
+
+##
+# CoreFoundation
+
+cf = ct.cdll.LoadLibrary(check.not_none(ct.util.find_library('CoreFoundation')))
+
+#
+
+CFArrayRef = ct.c_void_p
+CFDataRef = ct.c_void_p
+CFIndex = ct.c_long
+CFStringEncoding = ct.c_uint32
+CFStringRef = ct.c_void_p
+CFTypeID = ct.c_ulong
+
+#
+
+cf.CFArrayGetCount.argtypes = [CFArrayRef]
+cf.CFArrayGetCount.restype = CFIndex
+
+cf.CFArrayGetValueAtIndex.argtypes = [CFArrayRef, CFIndex]
+cf.CFArrayGetValueAtIndex.restype = CFStringRef
+
+cf.CFDataGetBytePtr.argtypes = [CFDataRef]
+cf.CFDataGetBytePtr.restype = ct.POINTER(ct.c_uint8)
+
+cf.CFDataGetLength.argtypes = [CFDataRef]
+cf.CFDataGetLength.restype = CFIndex
+
+cf.CFGetTypeID.argtypes = [ct.c_void_p]
+cf.CFGetTypeID.restype = CFTypeID
+
+cf.CFRelease.argtypes = [ct.c_void_p]
+cf.CFRelease.restype = None
+
+cf.CFStringCreateWithCString.argtypes = [ct.c_void_p, ct.c_char_p, ct.c_int32]
+cf.CFStringCreateWithCString.restype = CFStringRef
+
+cf.CFStringGetCString.argtypes = [CFStringRef, ct.c_char_p, ct.c_long, ct.c_uint32]
+cf.CFStringGetCString.restype = ct.c_bool
+
+cf.CFStringGetLength.argtypes = [CFStringRef]
+cf.CFStringGetLength.restype = CFIndex
+
+cf.CFStringGetMaximumSizeForEncoding.argtypes = [CFIndex, CFStringEncoding]
+cf.CFStringGetMaximumSizeForEncoding.restype = CFIndex
+
+cf.CFStringGetTypeID.argtypes = []
+cf.CFStringGetTypeID.restype = CFTypeID
+
+
+##
+# ApplicationServices
+
+aps = ct.cdll.LoadLibrary(check.not_none(ct.util.find_library('ApplicationServices')))
+
+#
+
+OSStatus = ct.c_int32
+
+PasteboardItemID = ct.c_ulong
+PasteboardRef = ct.c_void_p
+
+#
+
+aps.PasteboardCopyItemFlavorData.argtypes = [PasteboardRef, PasteboardItemID, CFStringRef, ct.POINTER(CFDataRef)]
+aps.PasteboardCopyItemFlavorData.restype = OSStatus
+
+aps.PasteboardCopyItemFlavors.argtypes = [PasteboardRef, PasteboardItemID, ct.POINTER(CFArrayRef)]
+aps.PasteboardCopyItemFlavors.restype = OSStatus
+
+aps.PasteboardCreate.argtypes = [CFStringRef, ct.POINTER(PasteboardRef)]
+aps.PasteboardCreate.restype = OSStatus
+
+aps.PasteboardGetItemCount.argtypes = [PasteboardRef, ct.POINTER(ct.c_ulong)]
+aps.PasteboardGetItemCount.restype = OSStatus
+
+aps.PasteboardGetItemIdentifier.argtypes = [PasteboardRef, ct.c_ulong, ct.POINTER(PasteboardItemID)]
+aps.PasteboardGetItemIdentifier.restype = OSStatus
+
+
+##
+
+
+def CFSTR(string):
+    return cf.CFStringCreateWithCString(None, string.encode('utf-8'), 0)
+
+
+kCFStringEncodingUTF8 = 0x08000100
+kPasteboardClipboard = CFSTR('com.apple.pasteboard.clipboard')
+
+
+def cfstring_to_string(cf_string: CFStringRef) -> str:
+    if not cf_string:
+        return ''
+
+    length = cf.CFStringGetLength(cf_string)
+    max_size = cf.CFStringGetMaximumSizeForEncoding(length, kCFStringEncodingUTF8) + 1
+    buffer = ct.create_string_buffer(max_size)
+
+    if success := cf.CFStringGetCString(cf_string, buffer, max_size, kCFStringEncodingUTF8):  # noqa
+        return ''
+
+    return buffer.value.decode('utf-8')
+
+
+##
+
+
+class OsxClipboardError(Exception):
+    pass
+
+
+@dc.dataclass(frozen=True)
+class StatusOsxClipboardError(OsxClipboardError):
+    fn: str
+    status: int
+
+
+@dc.dataclass(frozen=True)
+class OsxClipboardItem:
+    type: str | None
+    data: bytes | None
+
+
+def get_osx_clipboard_data(
+        *,
+        types: ta.Container[str | None] | None = None,
+        strict: bool = False,
+        types_only: bool = False,
+) -> list[OsxClipboardItem]:
+    lst: list[OsxClipboardItem] = []
+
+    pasteboard = PasteboardRef()
+    if status := aps.PasteboardCreate(kPasteboardClipboard, ct.byref(pasteboard)):
+        raise StatusOsxClipboardError('PasteboardCreate', status)
+
+    try:
+        item_count = ct.c_ulong(0)
+        if status := aps.PasteboardGetItemCount(pasteboard, ct.byref(item_count)):
+            raise StatusOsxClipboardError('PasteboardGetItemCount', status)
+
+        for i in range(1, item_count.value + 1):
+            item_id = PasteboardItemID()
+            if status := aps.PasteboardGetItemIdentifier(pasteboard, i, ct.byref(item_id)):
+                raise StatusOsxClipboardError('PasteboardGetItemIdentifier', status)
+
+            data_types = CFArrayRef()
+            if status := aps.PasteboardCopyItemFlavors(pasteboard, item_id, ct.byref(data_types)):
+                raise StatusOsxClipboardError('PasteboardCopyItemFlavors', status)
+            if not data_types:
+                continue
+
+            try:
+                type_count = cf.CFArrayGetCount(data_types)
+                for j in range(type_count):
+                    data_type = cf.CFArrayGetValueAtIndex(data_types, j)
+
+                    if cf.CFGetTypeID(data_type) == cf.CFStringGetTypeID():
+                        data_type_str = cfstring_to_string(data_type)
+                    else:
+                        data_type_str = None
+
+                    if types is not None and data_type_str not in types:
+                        continue
+
+                    if types_only:
+                        lst.append(OsxClipboardItem(
+                            type=data_type_str,
+                            data=None,
+                        ))
+                        continue
+
+                    data = CFDataRef()
+                    if status := aps.PasteboardCopyItemFlavorData(pasteboard, item_id, data_type, ct.byref(data)):
+                        if not strict:
+                            continue
+                        raise StatusOsxClipboardError('PasteboardCopyItemFlavorData', status)
+                    if not data:
+                        continue
+
+                    try:
+                        data_size = cf.CFDataGetLength(data)
+                        data_ptr = cf.CFDataGetBytePtr(data)
+                        data_bytes = ct.string_at(data_ptr, data_size)
+
+                        lst.append(OsxClipboardItem(
+                            type=data_type_str,
+                            data=data_bytes,
+                        ))
+
+                    finally:
+                        cf.CFRelease(data)
+
+            finally:
+                cf.CFRelease(data_types)
+
+    finally:
+        cf.CFRelease(pasteboard)
+
+    return lst
+
+
+##
+
+
+def _main() -> None:
+    for i in get_osx_clipboard_data():
+        print(i)
+
+
+if __name__ == '__main__':
+    _main()

{omdev-0.0.0.dev79 → omdev-0.0.0.dev81}/omdev/findimports.py

@@ -78,11 +78,17 @@ def get_import_deps(imps: set[str]) -> set[str]:
     return {i for i in eimps if whichmod(i) != 'builtin'}
 
 
-def _main() -> None:
-    imps = find_imports(*sys.argv[1:])
-    deps = get_import_deps(imps)
-    print(chr(10).join(sorted(deps)))
+# @omlish-manifest
+_CLI_MODULE = {'$omdev.cli.types.CliModule': {
+    'cmd_name': 'py/findimports',
+    'mod_name': __name__,
+}}
 
 
 if __name__ == '__main__':
+    def _main() -> None:
+        imps = find_imports(*sys.argv[1:])
+        deps = get_import_deps(imps)
+        print(chr(10).join(sorted(deps)))
+
     _main()

{omdev-0.0.0.dev79 → omdev-0.0.0.dev81}/omdev/findmagic.py

@@ -62,6 +62,13 @@ def find_magic(
                 yield out
 
 
+# @omlish-manifest
+_CLI_MODULE = {'$omdev.cli.types.CliModule': {
+    'cmd_name': 'py/findmagic',
+    'mod_name': __name__,
+}}
+
+
 if __name__ == '__main__':
     def _main(argv=None) -> None:
         import argparse

{omdev-0.0.0.dev79 → omdev-0.0.0.dev81}/omdev/manifests/build.py

@@ -1,7 +1,7 @@
 """
 TODO:
  - separate build from cli
- - parallelize & sort
+ - verify classes instantiate
 
 See (entry_points):
  - https://github.com/pytest-dev/pluggy/blob/main/src/pluggy/_manager.py#L405

{omdev-0.0.0.dev79 → omdev-0.0.0.dev81}/omdev/precheck/__main__.py

@@ -6,6 +6,6 @@ _CLI_MODULE = CliModule('precheck', __name__)
 
 
 if __name__ == '__main__':
-    from .precheck import _main
+    from .main import _main
 
     _main()

{omdev-0.0.0.dev79 → omdev-0.0.0.dev81}/omdev/precheck/lite.py

@@ -10,6 +10,7 @@ import typing as ta
 
 from omdev import findmagic
 from omlish import cached
+from omlish.lite.subprocesses import subprocess_maybe_shell_wrap_exec
 
 from .base import Precheck
 from .base import PrecheckContext
@@ -69,10 +70,12 @@ class LitePython8Precheck(Precheck['LitePython8Precheck.Config']):
         vs: list[Precheck.Violation] = []
 
         proc = await asyncio.create_subprocess_exec(
-            '.venvs/8/bin/python',
-            '-c',
-            self._load_file_module_payload(),
-            fp,
+            *subprocess_maybe_shell_wrap_exec(
+                '.venvs/8/bin/python',
+                '-c',
+                self._load_file_module_payload(),
+                fp,
+            ),
             stderr=subprocess.PIPE,
         )
 
@@ -90,9 +93,11 @@ class LitePython8Precheck(Precheck['LitePython8Precheck.Config']):
         log.debug('%s: loading module %s', self.__class__.__name__, mod)
 
         proc = await asyncio.create_subprocess_exec(
-            '.venvs/8/bin/python',
-            '-c',
-            f'import {mod}',
+            *subprocess_maybe_shell_wrap_exec(
+                '.venvs/8/bin/python',
+                '-c',
+                f'import {mod}',
+            ),
             stderr=subprocess.PIPE,
         )
 

omdev-0.0.0.dev79/omdev/precheck/precheck.py → omdev-0.0.0.dev81/omdev/precheck/main.py

@@ -2,7 +2,7 @@
 Tiny pre-commit
 
 TODO:
- - ! manifests
+ - define new prechecks with manifests
  - global config
  - global analyses - FilesWithShebang
  - shebang files have no relative imports
@@ -31,6 +31,7 @@ from .base import Precheck
 from .base import PrecheckContext
 from .git import GitBlacklistPrecheck
 from .lite import LitePython8Precheck
+from .manifests import ManifestsPrecheck
 from .scripts import ScriptDepsPrecheck
 
 
@@ -52,6 +53,7 @@ def _check_cmd(args) -> None:
         GitBlacklistPrecheck(ctx),
         ScriptDepsPrecheck(ctx),
         LitePython8Precheck(ctx),
+        ManifestsPrecheck(ctx),
     ]
 
     async def run() -> list[Precheck.Violation]:
@@ -81,16 +83,18 @@ def _build_parser() -> argparse.ArgumentParser:
 
     parser_check = subparsers.add_parser('check')
     parser_check.add_argument('roots', nargs='+')
+    parser_check.add_argument('-v', '--verbose', action='store_true')
     parser_check.set_defaults(func=_check_cmd)
 
     return parser
 
 
 def _main(argv: ta.Sequence[str] | None = None) -> None:
-    logs.configure_standard_logging('INFO')
-
     parser = _build_parser()
     args = parser.parse_args(argv)
+
+    logs.configure_standard_logging('DEBUG' if args.verbose else 'INFO')
+
     if not getattr(args, 'func', None):
         parser.print_help()
     else:

omdev-0.0.0.dev81/omdev/precheck/manifests.py

@@ -0,0 +1,26 @@
+import dataclasses as dc
+import typing as ta
+
+from ..manifests.load import ManifestLoader
+from .base import Precheck
+from .base import PrecheckContext
+
+
+##
+
+
+class ManifestsPrecheck(Precheck['ManifestsPrecheck.Config']):
+    @dc.dataclass(frozen=True)
+    class Config(Precheck.Config):
+        pass
+
+    def __init__(self, context: PrecheckContext, config: Config = Config()) -> None:
+        super().__init__(context, config)
+
+    async def run(self) -> ta.AsyncGenerator[Precheck.Violation, None]:
+        for src_root in self._context.src_roots:
+            ml = ManifestLoader()
+            try:
+                ml.load(src_root)
+            except Exception as e:  # noqa
+                yield Precheck.Violation(self, f'Error loading manifest for {src_root}: {e!r}')

{omdev-0.0.0.dev79 → omdev-0.0.0.dev81}/omdev/scripts/pyproject.py

@@ -170,6 +170,13 @@ def find_magic(
                 yield out
 
 
+# # @omlish-manifest
+# _CLI_MODULE = {'$omdev.cli.types.CliModule': {
+#     'cmd_name': 'py/findmagic',
+#     'mod_name': __name__,
+# }}
+
+
 ########################################
 # ../../git.py
 

{omdev-0.0.0.dev79 → omdev-0.0.0.dev81/omdev.egg-info}/PKG-INFO

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

{omdev-0.0.0.dev79 → omdev-0.0.0.dev81}/omdev.egg-info/SOURCES.txt

@@ -76,6 +76,9 @@ omdev/cli/install.py
 omdev/cli/main.py
 omdev/cli/managers.py
 omdev/cli/types.py
+omdev/clipboard/__init__.py
+omdev/clipboard/clipboard.py
+omdev/clipboard/darwin.py
 omdev/interp/__init__.py
 omdev/interp/__main__.py
 omdev/interp/cli.py
@@ -102,7 +105,8 @@ omdev/precheck/__main__.py
 omdev/precheck/base.py
 omdev/precheck/git.py
 omdev/precheck/lite.py
-omdev/precheck/precheck.py
+omdev/precheck/main.py
+omdev/precheck/manifests.py
 omdev/precheck/scripts.py
 omdev/pyproject/__init__.py
 omdev/pyproject/__main__.py

{omdev-0.0.0.dev79 → omdev-0.0.0.dev81}/omdev.egg-info/requires.txt

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

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