omdev 0.0.0.dev407__tar.gz → 0.0.0.dev408__tar.gz

{omdev-0.0.0.dev407/omdev.egg-info → omdev-0.0.0.dev408}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev407
+Version: 0.0.0.dev408
 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.dev408
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev407 → omdev-0.0.0.dev408}/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-0.0.0.dev407/omdev/amalg → omdev-0.0.0.dev408/omdev/amalg/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-0.0.0.dev407/omdev/amalg → omdev-0.0.0.dev408/omdev/amalg/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-0.0.0.dev407/omdev/amalg → omdev-0.0.0.dev408/omdev/amalg/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-0.0.0.dev407/omdev/amalg → omdev-0.0.0.dev408/omdev/amalg/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-0.0.0.dev407/omdev/amalg → omdev-0.0.0.dev408/omdev/amalg/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-0.0.0.dev407/omdev/amalg → omdev-0.0.0.dev408/omdev/amalg/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-0.0.0.dev407/omdev/amalg → omdev-0.0.0.dev408/omdev/amalg/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-0.0.0.dev407/omdev/amalg → omdev-0.0.0.dev408/omdev/amalg/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-0.0.0.dev407/omdev/amalg → omdev-0.0.0.dev408/omdev/amalg/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-0.0.0.dev408/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-0.0.0.dev407 → omdev-0.0.0.dev408}/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-0.0.0.dev407 → omdev-0.0.0.dev408/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev407
+Version: 0.0.0.dev408
 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.dev408
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev407 → omdev-0.0.0.dev408}/omdev.egg-info/SOURCES.txt

@@ -17,15 +17,18 @@ omdev.egg-info/requires.txt
 omdev.egg-info/top_level.txt
 omdev/amalg/__init__.py
 omdev/amalg/__main__.py
-omdev/amalg/gen.py
-omdev/amalg/imports.py
-omdev/amalg/main.py
-omdev/amalg/manifests.py
-omdev/amalg/resources.py
-omdev/amalg/srcfiles.py
-omdev/amalg/strip.py
-omdev/amalg/types.py
-omdev/amalg/typing.py
+omdev/amalg/sources.py
+omdev/amalg/cli/__init__.py
+omdev/amalg/cli/main.py
+omdev/amalg/gen/__init__.py
+omdev/amalg/gen/gen.py
+omdev/amalg/gen/imports.py
+omdev/amalg/gen/manifests.py
+omdev/amalg/gen/resources.py
+omdev/amalg/gen/srcfiles.py
+omdev/amalg/gen/strip.py
+omdev/amalg/gen/types.py
+omdev/amalg/gen/typing.py
 omdev/cache/__init__.py
 omdev/cache/compute/__init__.py
 omdev/cache/compute/cache.py

{omdev-0.0.0.dev407 → omdev-0.0.0.dev408}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev407
+omlish==0.0.0.dev408
 
 [all]
 black~=25.1

{omdev-0.0.0.dev407 → omdev-0.0.0.dev408}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.13'
-version = '0.0.0.dev407'
+version = '0.0.0.dev408'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,7 +24,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev407',
+    'omlish == 0.0.0.dev408',
 ]
 
 [project.optional-dependencies]