omdev 0.0.0.dev407__py3-none-any.whl → 0.0.0.dev409__py3-none-any.whl

omdev/amalg/__main__.py

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

omdev/amalg/{main.py → cli/main.py}

@@ -34,8 +34,8 @@ import typing as ta
 from omlish import check
 from omlish.logs import all as logs
 
-from .gen import SCAN_COMMENT
-from .gen import AmalgGenerator
+from ..gen.gen import SCAN_COMMENT
+from ..gen.gen import AmalgGenerator
 
 
 log = logging.getLogger(__name__)

omdev/amalg/{gen.py → gen/gen.py}

@@ -8,8 +8,8 @@ from omlish import lang
 from omlish.algorithm import all as alg
 from omlish.lite.runtime import LITE_REQUIRED_PYTHON_VERSION
 
-from ..git.magic import GIT_DIFF_OMIT_MAGIC
-from ..tokens import all as tks
+from ...git.magic import GIT_DIFF_OMIT_MAGIC
+from ...tokens import all as tks
 from .srcfiles import SrcFile
 from .srcfiles import make_src_file
 from .strip import strip_main_lines

omdev/amalg/{imports.py → gen/imports.py}

@@ -4,7 +4,7 @@ import typing as ta
 
 from omlish import check
 
-from ..tokens import all as tks
+from ...tokens import all as tks
 
 
 ##

omdev/amalg/{manifests.py → gen/manifests.py}

@@ -2,7 +2,7 @@ import ast
 
 from omlish import check
 
-from ..tokens import all as tks
+from ...tokens import all as tks
 
 
 ##

omdev/amalg/{resources.py → gen/resources.py}

@@ -4,7 +4,7 @@ import itertools
 import os.path
 import typing as ta
 
-from ..tokens import all as tks
+from ...tokens import all as tks
 
 
 ##

omdev/amalg/{srcfiles.py → gen/srcfiles.py}

@@ -4,7 +4,7 @@ import typing as ta
 from omlish import collections as col
 from omlish import lang
 
-from ..tokens import all as tks
+from ...tokens import all as tks
 from .imports import Import
 from .imports import make_import
 from .manifests import comment_out_manifest_comment

omdev/amalg/{strip.py → gen/strip.py}

@@ -1,8 +1,8 @@
 import re
 import typing as ta
 
-from .. import magic
-from ..tokens import all as tks
+from ... import magic
+from ...tokens import all as tks
 
 
 ##

omdev/amalg/{types.py → gen/types.py}

@@ -1,6 +1,6 @@
 import typing as ta
 
-from ..tokens import all as tks
+from ...tokens import all as tks
 
 
 Tokens: ta.TypeAlias = tks.Tokens

omdev/amalg/{typing.py → gen/typing.py}

@@ -2,7 +2,7 @@ import dataclasses as dc
 
 from omlish import check
 
-from ..tokens import all as tks
+from ...tokens import all as tks
 
 
 ##

omdev/amalg/sources.py

@@ -0,0 +1,51 @@
+# ruff: noqa: UP045
+# @omlish-lite
+import typing as ta
+
+from omlish.lite.cached import cached_nullary
+
+
+##
+
+
+class AmalgSources:
+    def __init__(
+            self,
+            *,
+            name: ta.Optional[str] = None,
+            package: ta.Optional[str] = None,
+    ) -> None:
+        super().__init__()
+
+        self._name = name or __name__
+        self._package = package or __package__
+
+    @cached_nullary
+    def get_mod(self) -> ta.Any:
+        import sys  # noqa
+        return sys.modules[self._name]
+
+    @cached_nullary
+    def get_src(self) -> str:
+        import inspect  # noqa
+        return inspect.getsource(self.get_mod())
+
+    @classmethod
+    def is_src_amalg(cls, src: str) -> bool:
+        for l in src.splitlines():  # noqa
+            if l.startswith('# @omlish-amalg-output '):
+                return True
+        return False
+
+    @cached_nullary
+    def is_amalg(self) -> bool:
+        return self.is_src_amalg(self.get_src())
+
+    # TODO: read `@omlish-amalg ../scripts/manage.py`, given self._name/self._package, convert to resources path to read
+    # @cached_nullary
+    # def get_amalg_src(self) -> str:
+    #     if _is_self_amalg():
+    #         return _get_self_src()
+    #
+    #     import importlib.resources  # noqa
+    #     return importlib.resources.files(__package__.split('.')[0] + '.scripts').joinpath('manage.py').read_text()

omdev/cli/main.py

@@ -182,7 +182,7 @@ def _build_arg_parser() -> argparse.ArgumentParser:
     return parser
 
 
-def _build_cmd_set(args: ta.Any) -> CliCmdSet:
+def _initialize_global_manifests(args: ta.Any) -> None:
     ldr_cfg = GlobalManifestLoader.default_config()
 
     ldr_cfg |= ManifestLoader.config_from_entry_point(globals())
@@ -195,8 +195,8 @@ def _build_cmd_set(args: ta.Any) -> CliCmdSet:
 
     GlobalManifestLoader.initialize(ldr_cfg)
 
-    #
 
+def _build_cmd_set() -> CliCmdSet:
     lst: list[CliCmd] = []
 
     for mv in GlobalManifestLoader.load_values_of(CliModule):
@@ -247,7 +247,9 @@ def _main() -> ta.Any:
     args = parser.parse_args()
 
     def inner():
-        cmds = _build_cmd_set(args)
+        _initialize_global_manifests(args)
+
+        cmds = _build_cmd_set()
         sel = _select_cmd(args, cmds)
 
         if isinstance(sel, int):

omdev/intellij/ides.py

@@ -24,6 +24,7 @@ class Ide(enum.Enum):
 
 
 _INFER_FILE_NAME_SETS_BY_IDE: ta.Mapping[Ide, ta.AbstractSet[str]] = {
+
     Ide.PYCHARM: frozenset([
         'setup.py',
         'setup.cfg',
@@ -36,6 +37,7 @@ _INFER_FILE_NAME_SETS_BY_IDE: ta.Mapping[Ide, ta.AbstractSet[str]] = {
         'asgi.py',
         'manage.py',
     ]),
+
     Ide.IDEA: frozenset([
         'pom.xml',
         'mvnw',
@@ -45,21 +47,27 @@ _INFER_FILE_NAME_SETS_BY_IDE: ta.Mapping[Ide, ta.AbstractSet[str]] = {
         'module-info.java',
         '.java-version',
     ]),
+
     Ide.CLION: frozenset([
         'CMakeLists.txt',
+        'Cargo.toml',
+        'config.h.in',
         'configure.ac',
         'configure.in',
-        'config.h.in',
+        'rust-toolchain.toml',
         'vcpkg.json',
     ]),
+
     Ide.WEBSTORM: frozenset([
         'package.json',
         'package-lock.json',
     ]),
+
     Ide.GOLAND: frozenset([
         'go.mod',
         'go.sum',
     ]),
+
 }
 
 

omdev/py/scripts/execstat.py

@@ -148,7 +148,7 @@ def _main() -> None:
             f'dct = _run(**{run_kw!r})',
             f'import json',
             f'with open({out_file!r}, "w") as f:',  # noqa
-            f'    print(f.write(json.dumps(dct)))',
+            f'    f.write(json.dumps(dct))',
         ])
 
         subprocess.check_call([exe, '-c', payload])

{omdev-0.0.0.dev407.dist-info → omdev-0.0.0.dev409.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev407
+Version: 0.0.0.dev409
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev407
+Requires-Dist: omlish==0.0.0.dev409
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev407.dist-info → omdev-0.0.0.dev409.dist-info}/RECORD

@@ -6,16 +6,19 @@ omdev/imgur.py,sha256=oG4jZH2EAk1my0JzoPNes-4LCtF2_aU08vmKbGzmuxo,3129
 omdev/pip.py,sha256=PqzAWDO_CbiZvXzJAZcCkFqWynUDls1jIgBWlrswQyA,2012
 omdev/tagstrings.py,sha256=cBmAc9-TtOBupvGQ9G4T1jjjtzijx4ihQCBu6FezzV0,5490
 omdev/amalg/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omdev/amalg/__main__.py,sha256=1sZH8SLAueWxMxK9ngvndUW3L_rw7f-s_jK3ZP1yAH8,170
-omdev/amalg/gen.py,sha256=LFkob-UhqnOnnwuUeMkPuGUjQRMhw-jGYVePIPMRQZ4,6192
-omdev/amalg/imports.py,sha256=me-I_FOD5874NVebZGt_wlc9kxEpuZV-XGuifbNkgNk,2073
-omdev/amalg/main.py,sha256=CNkpAMVXlBoaCmgs68rKSUlL8Xh4AuNdZjSFZPeao_4,4313
-omdev/amalg/manifests.py,sha256=CGwh-DiOU4ZKv0p_uUvdpBl2H72g468kvBHtguOHGMA,902
-omdev/amalg/resources.py,sha256=aIqVd1tbGCv4vIt6gbzqnB0L3PsQsAeqVaZJ_J7QSz8,2692
-omdev/amalg/srcfiles.py,sha256=TKSYSfv78Wb8bcsQS3V76dV_H_MICPwzv06Ar09ew9U,3079
-omdev/amalg/strip.py,sha256=dWQQ5WbtcebLi_PGjPzVYey2mJOnrRES8rkoUS8L52w,1444
-omdev/amalg/types.py,sha256=BXXJI0VctKTsZv_wXiyMMq3-xShxZ1ak0wxXUK8n9_g,89
-omdev/amalg/typing.py,sha256=GZX0O7J6lgxOX0mZV3T9M8IkVJpyohKj2vHF4UaUpHk,2300
+omdev/amalg/__main__.py,sha256=nGxQ4PLd2u7zf6dH4TDWZg6yrVe3FxIVn9sGT5w8O-o,174
+omdev/amalg/sources.py,sha256=wxPxPFnxRhPSRhQoWn9bpTYopXW-tanJQLvVQkf2K_A,1379
+omdev/amalg/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+omdev/amalg/cli/main.py,sha256=U1PQ8JfdzQ1l4m-TS9YECTcTLltuQSxB6oIomVemg6w,4323
+omdev/amalg/gen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+omdev/amalg/gen/gen.py,sha256=95iQT0At_NsMf4IEg702ZOmmyEdhCZJGcSCFypm1BTk,6194
+omdev/amalg/gen/imports.py,sha256=Bv3xNgej1Nsuv5R_y-9wd9b8cPtWljZsxjMh9bolJWc,2074
+omdev/amalg/gen/manifests.py,sha256=SN4wvPZ8iNTcQIdpSZ6d64cL32pSlT_ak_GwctTPn_Y,903
+omdev/amalg/gen/resources.py,sha256=wxqrudGbHzru2KWu-a_4LDmOf7tRRCd8NM0BXx_ZU9I,2693
+omdev/amalg/gen/srcfiles.py,sha256=UUAW2XtzaMv6-ACr364gyAxa-W3bAawRIwTiXE3-ndQ,3080
+omdev/amalg/gen/strip.py,sha256=GW76ZWJNdwH8dxLDG7gVHFi_CnS958fWvSfroD0HCaw,1446
+omdev/amalg/gen/types.py,sha256=DvxUmEenqCeXycRHi4brxAkSjztq800qT1XlT94bXAY,90
+omdev/amalg/gen/typing.py,sha256=VWw4_iZXqM_29ElSVUlLTO6-KLUCQPdieQDvG_q1YsI,2301
 omdev/cache/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cache/compute/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cache/compute/cache.py,sha256=7cJmxiHwbnitMZaLZEZVjEq0v1JJN7HKBK-BH_EtVY4,3628
@@ -113,7 +116,7 @@ omdev/cli/__main__.py,sha256=mOJpgc07o0r5luQ1DlX4tk2PqZkgmbwPbdzJ3KmtjgQ,138
 omdev/cli/_pathhack.py,sha256=ABWxtuMY29WBOPqC-4LAZK9S9PwGY3zn5aK6HavFPh0,2125
 omdev/cli/clicli.py,sha256=TZnQYHyyh97B6N_pVYYduYgt03s8Yp5mrJ7wblXWSWY,6308
 omdev/cli/install.py,sha256=oB34AOwu07sqEztW_z5mgorAFoP_Tw556XiTPj2WSM0,4904
-omdev/cli/main.py,sha256=ZbRst-axMDzlFvFptMrSpdbBjjo2JN6PWBYZNBIzz2k,6869
+omdev/cli/main.py,sha256=JIyQjaoVkXpkanNYpJbQnauzvpMtzn9-nXGKu57dVls,6947
 omdev/cli/managers.py,sha256=BV98_n30Jj63OJrFgRoVZRfICxMLXEZKoEn4rMj9LV4,1160
 omdev/cli/types.py,sha256=SDv6aefBAvFmATZ-dlp9rvBBETC-2bSJfFvf87JxSNg,482
 omdev/clipboard/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -146,7 +149,7 @@ omdev/home/secrets.py,sha256=Bq9Pak4lzsogw5GvOeQ4zs3Yatmn7glGH0q-b0Sf6h8,2003
 omdev/home/shadow.py,sha256=6mGDJV70IExa-nzd7mOUW4R3OZIXO0fBwmOUU9T9f4M,295
 omdev/intellij/__init__.py,sha256=OkihYdld_LTk_gTcyzOWc9Nze_drjsIYMYpbA5DG6m4,132
 omdev/intellij/cli.py,sha256=Sds9Xj_OHgbm76j70frhwrZEzlVi-1Rd93g0ypIe6t4,2038
-omdev/intellij/ides.py,sha256=uYSbVDPOlhKeImRCPV6HdcrO2JtACBPUpElbecTz7uM,1580
+omdev/intellij/ides.py,sha256=5YSJZ0Sbe6UPExn6atOlZd7j3WK1hptHh4RDxSh6CkI,1639
 omdev/intellij/open.py,sha256=3HlbJsGkwZ28UBi1P7dVJMRDMLbJyOGQs9QMQqgYVus,2679
 omdev/interp/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/interp/__main__.py,sha256=GMCqeGYltgt5dlJzHxY9gqisa8cRkrPfmZYuZnjg4WI,162
@@ -252,7 +255,7 @@ omdev/py/docstrings/parser.py,sha256=umJEgQBkSXLwWIKZrBbFCfNrz847vpTNDqTTEwlvHpA
 omdev/py/docstrings/rest.py,sha256=c2xPYg_W01W9eYY_KLKX69E4qu4jpkgUshi5K5EyVv8,5221
 omdev/py/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/py/scripts/bumpversion.py,sha256=UDMtTd_wfkqsmrtHqTKDilWVzUBigzZAOCVND7t9jyw,1124
-omdev/py/scripts/execstat.py,sha256=Z4UWxVIlXci5aC_kQPd6U4pnWp9wnxWZjIW5Dc2h67M,4574
+omdev/py/scripts/execstat.py,sha256=T5ls_Qx7iGmqiRQYFrc__yuHIarjt84vIm5wiaOPovw,4567
 omdev/py/scripts/importtrace.py,sha256=OOf9GvB6PWP2uVzogSYsM5JGUAoSfMx1IKfYUXB8ABc,14245
 omdev/py/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/py/tools/importscan.py,sha256=4dCH0coX0OqNwesteKaTE8GxuSfLhgXYQlzNUXLiSNY,4640
@@ -321,9 +324,9 @@ omdev/tools/jsonview/resources/jsonview.js,sha256=faDvXDOXKvEvjOuIlz4D3F2ReQXb_b
 omdev/tools/pawk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/pawk/__main__.py,sha256=VCqeRVnqT1RPEoIrqHFSu4PXVMg4YEgF4qCQm90-eRI,66
 omdev/tools/pawk/pawk.py,sha256=ao5mdrpiSU4AZ8mBozoEaV3UVlmVTnRG9wD9XP70MZE,11429
-omdev-0.0.0.dev407.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev407.dist-info/METADATA,sha256=5Yy6kmFhhdkAEpbefAKb2p47mMNEQ_Aha8QmLQb66Dk,5094
-omdev-0.0.0.dev407.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omdev-0.0.0.dev407.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev407.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev407.dist-info/RECORD,,
+omdev-0.0.0.dev409.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev409.dist-info/METADATA,sha256=MfRdRwUIT4O-gqPXz0MuF6WYTRd4xv5SI5N5phzerCU,5094
+omdev-0.0.0.dev409.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omdev-0.0.0.dev409.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev409.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev409.dist-info/RECORD,,