omdev 0.0.0.dev140__tar.gz → 0.0.0.dev142__tar.gz

{omdev-0.0.0.dev140/omdev.egg-info → omdev-0.0.0.dev142}/PKG-INFO

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

{omdev-0.0.0.dev140 → omdev-0.0.0.dev142}/omdev/.manifests.json

@@ -95,21 +95,6 @@
       }
     }
   },
-  {
-    "module": ".json.__main__",
-    "attr": "_CLI_MODULE",
-    "file": "omdev/json/__main__.py",
-    "line": 4,
-    "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": [
-          "json",
-          "j"
-        ],
-        "mod_name": "omdev.json.__main__"
-      }
-    }
-  },
   {
     "module": ".magic.find",
     "attr": "_CLI_MODULE",
@@ -230,6 +215,18 @@
       }
     }
   },
+  {
+    "module": ".tools.cloc",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/tools/cloc.py",
+    "line": 144,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "cloc",
+        "mod_name": "omdev.tools.cloc"
+      }
+    }
+  },
   {
     "module": ".tools.doc",
     "attr": "_CLI_MODULE",
@@ -278,6 +275,21 @@
       }
     }
   },
+  {
+    "module": ".tools.json.__main__",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/tools/json/__main__.py",
+    "line": 4,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": [
+          "json",
+          "j"
+        ],
+        "mod_name": "omdev.tools.json.__main__"
+      }
+    }
+  },
   {
     "module": ".tools.mkrelimp",
     "attr": "_CLI_MODULE",

{omdev-0.0.0.dev140 → omdev-0.0.0.dev142}/omdev/scripts/interp.py

@@ -63,6 +63,9 @@ UnparsedVersion = ta.Union['Version', str]
 UnparsedVersionVar = ta.TypeVar('UnparsedVersionVar', bound=UnparsedVersion)
 CallableVersionOperator = ta.Callable[['Version', str], bool]
 
+# ../../omlish/lite/subprocesses.py
+SubprocessChannelOption = ta.Literal['pipe', 'stdout', 'devnull']
+
 
 ########################################
 # ../../packaging/versions.py
@@ -1659,6 +1662,16 @@ class Interp:
 ##
 
 
+SUBPROCESS_CHANNEL_OPTION_VALUES: ta.Mapping[SubprocessChannelOption, int] = {
+    'pipe': subprocess.PIPE,
+    'stdout': subprocess.STDOUT,
+    'devnull': subprocess.DEVNULL,
+}
+
+
+##
+
+
 _SUBPROCESS_SHELL_WRAP_EXECS = False
 
 

{omdev-0.0.0.dev140 → omdev-0.0.0.dev142}/omdev/scripts/pyproject.py

@@ -101,6 +101,9 @@ UnparsedVersion = ta.Union['Version', str]
 UnparsedVersionVar = ta.TypeVar('UnparsedVersionVar', bound=UnparsedVersion)
 CallableVersionOperator = ta.Callable[['Version', str], bool]
 
+# ../../omlish/lite/subprocesses.py
+SubprocessChannelOption = ta.Literal['pipe', 'stdout', 'devnull']
+
 
 ########################################
 # ../../magic/magic.py
@@ -3300,120 +3303,144 @@ _OBJ_MARSHALER_GENERIC_ITERABLE_TYPES: ta.Dict[ta.Any, type] = {
 }
 
 
-def _make_obj_marshaler(
-        ty: ta.Any,
-        rec: ta.Callable[[ta.Any], ObjMarshaler],
-        *,
-        nonstrict_dataclasses: bool = False,
-) -> ObjMarshaler:
-    if isinstance(ty, type):
-        if abc.ABC in ty.__bases__:
-            return PolymorphicObjMarshaler.of([  # type: ignore
-                PolymorphicObjMarshaler.Impl(
-                    ity,
-                    ity.__qualname__,
-                    rec(ity),
-                )
-                for ity in deep_subclasses(ty)
-                if abc.ABC not in ity.__bases__
-            ])
-
-        if issubclass(ty, enum.Enum):
-            return EnumObjMarshaler(ty)
-
-        if dc.is_dataclass(ty):
-            return DataclassObjMarshaler(
-                ty,
-                {f.name: rec(f.type) for f in dc.fields(ty)},
-                nonstrict=nonstrict_dataclasses,
-            )
+##
 
-    if is_generic_alias(ty):
-        try:
-            mt = _OBJ_MARSHALER_GENERIC_MAPPING_TYPES[ta.get_origin(ty)]
-        except KeyError:
-            pass
-        else:
-            k, v = ta.get_args(ty)
-            return MappingObjMarshaler(mt, rec(k), rec(v))
 
-        try:
-            st = _OBJ_MARSHALER_GENERIC_ITERABLE_TYPES[ta.get_origin(ty)]
-        except KeyError:
-            pass
-        else:
-            [e] = ta.get_args(ty)
-            return IterableObjMarshaler(st, rec(e))
+class ObjMarshalerManager:
+    def __init__(
+            self,
+            *,
+            default_obj_marshalers: ta.Dict[ta.Any, ObjMarshaler] = _DEFAULT_OBJ_MARSHALERS,  # noqa
+            generic_mapping_types: ta.Dict[ta.Any, type] = _OBJ_MARSHALER_GENERIC_MAPPING_TYPES,  # noqa
+            generic_iterable_types: ta.Dict[ta.Any, type] = _OBJ_MARSHALER_GENERIC_ITERABLE_TYPES,  # noqa
+    ) -> None:
+        super().__init__()
 
-        if is_union_alias(ty):
-            return OptionalObjMarshaler(rec(get_optional_alias_arg(ty)))
+        self._obj_marshalers = dict(default_obj_marshalers)
+        self._generic_mapping_types = generic_mapping_types
+        self._generic_iterable_types = generic_iterable_types
 
-    raise TypeError(ty)
+        self._lock = threading.RLock()
+        self._marshalers: ta.Dict[ta.Any, ObjMarshaler] = dict(_DEFAULT_OBJ_MARSHALERS)
+        self._proxies: ta.Dict[ta.Any, ProxyObjMarshaler] = {}
 
+    #
 
-##
+    def make_obj_marshaler(
+            self,
+            ty: ta.Any,
+            rec: ta.Callable[[ta.Any], ObjMarshaler],
+            *,
+            nonstrict_dataclasses: bool = False,
+    ) -> ObjMarshaler:
+        if isinstance(ty, type):
+            if abc.ABC in ty.__bases__:
+                return PolymorphicObjMarshaler.of([  # type: ignore
+                    PolymorphicObjMarshaler.Impl(
+                        ity,
+                        ity.__qualname__,
+                        rec(ity),
+                    )
+                    for ity in deep_subclasses(ty)
+                    if abc.ABC not in ity.__bases__
+                ])
+
+            if issubclass(ty, enum.Enum):
+                return EnumObjMarshaler(ty)
+
+            if dc.is_dataclass(ty):
+                return DataclassObjMarshaler(
+                    ty,
+                    {f.name: rec(f.type) for f in dc.fields(ty)},
+                    nonstrict=nonstrict_dataclasses,
+                )
 
+        if is_generic_alias(ty):
+            try:
+                mt = self._generic_mapping_types[ta.get_origin(ty)]
+            except KeyError:
+                pass
+            else:
+                k, v = ta.get_args(ty)
+                return MappingObjMarshaler(mt, rec(k), rec(v))
 
-_OBJ_MARSHALERS_LOCK = threading.RLock()
+            try:
+                st = self._generic_iterable_types[ta.get_origin(ty)]
+            except KeyError:
+                pass
+            else:
+                [e] = ta.get_args(ty)
+                return IterableObjMarshaler(st, rec(e))
 
-_OBJ_MARSHALERS: ta.Dict[ta.Any, ObjMarshaler] = dict(_DEFAULT_OBJ_MARSHALERS)
+            if is_union_alias(ty):
+                return OptionalObjMarshaler(rec(get_optional_alias_arg(ty)))
 
-_OBJ_MARSHALER_PROXIES: ta.Dict[ta.Any, ProxyObjMarshaler] = {}
+        raise TypeError(ty)
 
+    #
 
-def register_opj_marshaler(ty: ta.Any, m: ObjMarshaler) -> None:
-    with _OBJ_MARSHALERS_LOCK:
-        if ty in _OBJ_MARSHALERS:
-            raise KeyError(ty)
-        _OBJ_MARSHALERS[ty] = m
+    def register_opj_marshaler(self, ty: ta.Any, m: ObjMarshaler) -> None:
+        with self._lock:
+            if ty in self._obj_marshalers:
+                raise KeyError(ty)
+            self._obj_marshalers[ty] = m
 
+    def get_obj_marshaler(
+            self,
+            ty: ta.Any,
+            *,
+            no_cache: bool = False,
+            **kwargs: ta.Any,
+    ) -> ObjMarshaler:
+        with self._lock:
+            if not no_cache:
+                try:
+                    return self._obj_marshalers[ty]
+                except KeyError:
+                    pass
 
-def get_obj_marshaler(
-        ty: ta.Any,
-        *,
-        no_cache: bool = False,
-        **kwargs: ta.Any,
-) -> ObjMarshaler:
-    with _OBJ_MARSHALERS_LOCK:
-        if not no_cache:
             try:
-                return _OBJ_MARSHALERS[ty]
+                return self._proxies[ty]
             except KeyError:
                 pass
 
-        try:
-            return _OBJ_MARSHALER_PROXIES[ty]
-        except KeyError:
-            pass
+            rec = functools.partial(
+                self.get_obj_marshaler,
+                no_cache=no_cache,
+                **kwargs,
+            )
 
-        rec = functools.partial(
-            get_obj_marshaler,
-            no_cache=no_cache,
-            **kwargs,
-        )
+            p = ProxyObjMarshaler()
+            self._proxies[ty] = p
+            try:
+                m = self.make_obj_marshaler(ty, rec, **kwargs)
+            finally:
+                del self._proxies[ty]
+            p.m = m
 
-        p = ProxyObjMarshaler()
-        _OBJ_MARSHALER_PROXIES[ty] = p
-        try:
-            m = _make_obj_marshaler(ty, rec, **kwargs)
-        finally:
-            del _OBJ_MARSHALER_PROXIES[ty]
-        p.m = m
+            if not no_cache:
+                self._obj_marshalers[ty] = m
+            return m
+
+    #
 
-        if not no_cache:
-            _OBJ_MARSHALERS[ty] = m
-        return m
+    def marshal_obj(self, o: ta.Any, ty: ta.Any = None) -> ta.Any:
+        return self.get_obj_marshaler(ty if ty is not None else type(o)).marshal(o)
+
+    def unmarshal_obj(self, o: ta.Any, ty: ta.Union[ta.Type[T], ta.Any]) -> T:
+        return self.get_obj_marshaler(ty).unmarshal(o)
 
 
 ##
 
 
-def marshal_obj(o: ta.Any, ty: ta.Any = None) -> ta.Any:
-    return get_obj_marshaler(ty if ty is not None else type(o)).marshal(o)
+OBJ_MARSHALER_MANAGER = ObjMarshalerManager()
 
+register_opj_marshaler = OBJ_MARSHALER_MANAGER.register_opj_marshaler
+get_obj_marshaler = OBJ_MARSHALER_MANAGER.get_obj_marshaler
 
-def unmarshal_obj(o: ta.Any, ty: ta.Union[ta.Type[T], ta.Any]) -> T:
-    return get_obj_marshaler(ty).unmarshal(o)
+marshal_obj = OBJ_MARSHALER_MANAGER.marshal_obj
+unmarshal_obj = OBJ_MARSHALER_MANAGER.unmarshal_obj
 
 
 ########################################
@@ -3706,6 +3733,16 @@ class RequirementsRewriter:
 ##
 
 
+SUBPROCESS_CHANNEL_OPTION_VALUES: ta.Mapping[SubprocessChannelOption, int] = {
+    'pipe': subprocess.PIPE,
+    'stdout': subprocess.STDOUT,
+    'devnull': subprocess.DEVNULL,
+}
+
+
+##
+
+
 _SUBPROCESS_SHELL_WRAP_EXECS = False
 
 

omdev-0.0.0.dev142/omdev/tools/cloc.py

@@ -0,0 +1,149 @@
+import dataclasses as dc
+import os
+import re
+import typing as ta
+
+from ..cli import CliModule
+
+
+SUPPORTED_EXTENSIONS: ta.Mapping[str, str] = {
+    '.c': 'c',
+    '.cpp': 'c',
+    '.h': 'c',
+    '.hpp': 'c',
+    '.py': 'python',
+    '.js': 'javascript',
+}
+
+
+COMMENT_PATTERNS: ta.Mapping[str, tuple[str, str | None, str | None]] = {
+    'c': (r'//', r'/\*', r'\*/'),
+    'python': (r'#', None, None),
+    'javascript': (r'//', r'/\*', r'\*/'),
+}
+
+
+@dc.dataclass(frozen=True)
+class FileLineCount:
+    loc: int
+    blanks: int
+    comments: int
+
+
+def count_lines(file_path: str, language: str) -> FileLineCount:
+    single_line_comment, block_comment_start, block_comment_end = COMMENT_PATTERNS[language]
+
+    in_block_comment = False
+
+    loc = 0
+    blank_lines = 0
+    comment_lines = 0
+
+    with open(file_path, encoding='utf-8') as file:
+        for line in file:
+            stripped = line.strip()
+            if not stripped:
+                blank_lines += 1
+                continue
+
+            if in_block_comment:
+                comment_lines += 1
+                if block_comment_end and re.search(block_comment_end, stripped):
+                    in_block_comment = False
+                continue
+
+            if block_comment_start and re.search(block_comment_start, stripped):
+                comment_lines += 1
+                if block_comment_end and not re.search(block_comment_end, stripped):
+                    in_block_comment = True
+                continue
+
+            if single_line_comment and stripped.startswith(single_line_comment):
+                comment_lines += 1
+                continue
+
+            loc += 1
+
+    return FileLineCount(
+        loc=loc,
+        blanks=blank_lines,
+        comments=comment_lines,
+    )
+
+
+def count_lines_in_directory(directory: str) -> ta.Mapping[str, FileLineCount]:
+    results: dict[str, FileLineCount] = {}
+    for root, _, files in os.walk(directory):
+        for file in files:
+            ext = os.path.splitext(file)[1]
+            if ext in SUPPORTED_EXTENSIONS:
+                language = SUPPORTED_EXTENSIONS[ext]
+                file_path = os.path.join(root, file)
+                results[file_path] = count_lines(file_path, language)
+    return results
+
+
+def display_results(results: ta.Mapping[str, FileLineCount]) -> None:
+    total_loc = total_blanks = total_comments = 0
+    file_width = max(map(len, results))
+    dash_width = 41 + file_width
+
+    print(
+        f"{'File'.ljust(file_width)} "
+        f"{'LOC':<10} "
+        f"{'Blank Lines':<15} "
+        f"{'Comment Lines':<15}",
+    )
+
+    print('-' * dash_width)
+
+    for file, counts in sorted(results.items()):
+        loc, blanks, comments = counts.loc, counts.blanks, counts.comments
+        total_loc += loc
+        total_blanks += blanks
+        total_comments += comments
+        print(
+            f'{file.ljust(file_width)} '
+            f'{loc:<10} '
+            f'{blanks:<15} '
+            f'{comments:<15}',
+        )
+
+    print('-' * dash_width)
+
+    print(
+        f"{' ' * file_width} "
+        f"{'LOC':<10} "
+        f"{'Blank Lines':<15} "
+        f"{'Comment Lines':<15}",
+    )
+
+    print('-' * dash_width)
+
+    print(
+        f"{'Total'.ljust(file_width)} "
+        f"{total_loc:<10} "
+        f"{total_blanks:<15} "
+        f"{total_comments:<15}",
+    )
+
+
+def _main() -> None:
+    import argparse
+
+    parser = argparse.ArgumentParser(description='Count lines of code in source files.')
+    parser.add_argument('directory', help='The directory to analyze.', nargs='+')
+    args = parser.parse_args()
+
+    for directory in args.directory:
+        results = count_lines_in_directory(directory)
+        display_results(results)
+        print()
+
+
+# @omlish-manifest
+_CLI_MODULE = CliModule('cloc', __name__)
+
+
+if __name__ == '__main__':
+    _main()

{omdev-0.0.0.dev140/omdev → omdev-0.0.0.dev142/omdev/tools}/json/__main__.py

@@ -1,4 +1,4 @@
-from ..cli import CliModule
+from ...cli import CliModule
 
 
 # @omlish-manifest

{omdev-0.0.0.dev140 → omdev-0.0.0.dev142/omdev.egg-info}/PKG-INFO

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

{omdev-0.0.0.dev140 → omdev-0.0.0.dev142}/omdev.egg-info/SOURCES.txt

@@ -89,14 +89,6 @@ omdev/interp/resolvers.py
 omdev/interp/standalone.py
 omdev/interp/system.py
 omdev/interp/types.py
-omdev/json/__init__.py
-omdev/json/__main__.py
-omdev/json/cli.py
-omdev/json/formats.py
-omdev/json/io.py
-omdev/json/parsing.py
-omdev/json/processing.py
-omdev/json/rendering.py
 omdev/magic/__init__.py
 omdev/magic/find.py
 omdev/magic/magic.py
@@ -148,6 +140,7 @@ omdev/toml/__init__.py
 omdev/toml/parser.py
 omdev/toml/writer.py
 omdev/tools/__init__.py
+omdev/tools/cloc.py
 omdev/tools/doc.py
 omdev/tools/docker.py
 omdev/tools/git.py
@@ -158,6 +151,14 @@ omdev/tools/pip.py
 omdev/tools/prof.py
 omdev/tools/qr.py
 omdev/tools/sqlrepl.py
+omdev/tools/json/__init__.py
+omdev/tools/json/__main__.py
+omdev/tools/json/cli.py
+omdev/tools/json/formats.py
+omdev/tools/json/io.py
+omdev/tools/json/parsing.py
+omdev/tools/json/processing.py
+omdev/tools/json/rendering.py
 omdev/tools/pawk/__init__.py
 omdev/tools/pawk/__main__.py
 omdev/tools/pawk/pawk.py

{omdev-0.0.0.dev140 → omdev-0.0.0.dev142}/omdev.egg-info/requires.txt

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

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