omdev 0.0.0.dev543__tar.gz → 0.0.0.dev544__tar.gz

{omdev-0.0.0.dev543/omdev.egg-info → omdev-0.0.0.dev544}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev543
+Version: 0.0.0.dev544
 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.dev543
+Requires-Dist: omlish==0.0.0.dev544
 Provides-Extra: all
 Requires-Dist: black~=26.3; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"

{omdev-0.0.0.dev543 → omdev-0.0.0.dev544}/omdev/.omlish-manifests.json

@@ -536,7 +536,7 @@
     "module": ".tools.shadow",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/shadow.py",
-    "line": 68,
+    "line": 92,
     "value": {
       "!.cli.types.CliModule": {
         "name": "shadow",

{omdev-0.0.0.dev543 → omdev-0.0.0.dev544}/omdev/home/paths.py

@@ -36,25 +36,35 @@ class HomePaths:
     def home_dir(self) -> str:
         return self._home_dir
 
+    config_subdir: ta.Final = 'config'
+
     @property
     def config_dir(self) -> str:
-        return os.path.join(self._home_dir, 'config')
+        return os.path.join(self._home_dir, self.config_subdir)
+
+    log_subdir: ta.Final = 'log'
 
     @property
     def log_dir(self) -> str:
-        return os.path.join(self._home_dir, 'log')
+        return os.path.join(self._home_dir, self.log_subdir)
+
+    run_subdir: ta.Final = 'run'
 
     @property
     def run_dir(self) -> str:
-        return os.path.join(self._home_dir, 'run')
+        return os.path.join(self._home_dir, self.run_subdir)
+
+    shadow_subdir: ta.Final = 'shadow'
 
     @property
     def shadow_dir(self) -> str:
-        return os.path.join(self._home_dir, 'shadow')
+        return os.path.join(self._home_dir, self.shadow_subdir)
+
+    state_subdir: ta.Final = 'state'
 
     @property
     def state_dir(self) -> str:
-        return os.path.join(self._home_dir, 'state')
+        return os.path.join(self._home_dir, self.state_subdir)
 
 
 def get_home_paths() -> HomePaths:

omdev-0.0.0.dev544/omdev/home/shadow.py

@@ -0,0 +1,24 @@
+from omlish.configs.shadow import FileShadowConfigs
+from omlish.configs.shadow import FileShadowConfigsImpl
+from omlish.configs.shadow import ShadowConfigs
+from omlish.lite.check import check
+from omlish.os.shadow import ManglingShadowPaths
+from omlish.os.shadow import ShadowPaths
+
+from .paths import HomePaths
+from .paths import get_home_paths
+
+
+##
+
+
+def get_shadow_paths() -> ShadowPaths:
+    return ManglingShadowPaths(get_home_paths().shadow_dir)
+
+
+def get_shadow_configs() -> ShadowConfigs:
+    return FileShadowConfigsImpl(get_shadow_paths(), HomePaths.config_subdir)
+
+
+def get_file_shadow_configs() -> FileShadowConfigs:
+    return check.isinstance(get_shadow_configs(), FileShadowConfigs)

{omdev-0.0.0.dev543 → omdev-0.0.0.dev544}/omdev/scripts/ci.py

@@ -95,9 +95,9 @@ def __omlish_amalg__():  # noqa
             dict(path='../oci/compression.py', sha1='7d165bc51a77db13ff45927daecc42839cfd75ea'),
             dict(path='../../omlish/asyncs/asyncio/utils.py', sha1='a093aa6b49e25b3206f59b703b281d569c386838'),
             dict(path='../../omlish/docker/ports.py', sha1='a3202c69b85bc4f1034479df3400fddc86130e5c'),
+            dict(path='../../omlish/http/coro/_pushback.py', sha1='783fe8a40fa9f2febf035f4553c53c73b9bd58e1'),
             dict(path='../../omlish/http/urllib.py', sha1='25431c5bdc7dd5cbecfcb8c0bdffaabf8c1691b9'),
             dict(path='../../omlish/http/versions.py', sha1='5b1659b81eb197c6880fbe78684a1348595ec804'),
-            dict(path='../../omlish/io/pushback.py', sha1='783fe8a40fa9f2febf035f4553c53c73b9bd58e1'),
             dict(path='../../omlish/lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
             dict(path='../../omlish/lite/asyncs.py', sha1='b3f2251c56617ce548abf9c333ac996b63edb23e'),
             dict(path='../../omlish/lite/cached.py', sha1='0c33cf961ac8f0727284303c7a30c5ea98f714f2'),
@@ -173,7 +173,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../oci/building.py', sha1='b4fea06c03ba02d3ecfc6d10d955dc76f263846a'),
             dict(path='../oci/loading.py', sha1='64d806ffad8d24087ccc29f759f672e6d795bee2'),
             dict(path='../../omlish/formats/yaml/goyaml/parsing.py', sha1='c92e4772e2d50f080bc1ca8a317d0c7aea5b710a'),
-            dict(path='../../omlish/http/coro/server/sockets.py', sha1='512e6fdd4ad9a533b81a584e45c7d7e9b0188c15'),
+            dict(path='../../omlish/http/coro/server/sockets.py', sha1='bb0915b307622067c5460387ed0014f954167eb5'),
             dict(path='../../omlish/logs/asyncs.py', sha1='8376df395029a9d0957e2338adede895a9364215'),
             dict(path='../../omlish/logs/std/loggers.py', sha1='dbdfc66188e6accb75d03454e43221d3fba0f011'),
             dict(path='../../omlish/subprocesses/asyncs.py', sha1='bba44d524c24c6ac73168aee6343488414e5bf48'),
@@ -636,128 +636,7 @@ class DockerPortRelay:
 
 
 ########################################
-# ../../../omlish/http/urllib.py
-
-
-##
-
-
-class NonRaisingUrllibErrorProcessor(urllib.request.HTTPErrorProcessor):
-    """
-    https://stackoverflow.com/a/74844056
-
-    Usage:
-
-        opener = urllib.request.build_opener(NonRaisingUrllibErrorProcessor)
-        with opener.open(req) as resp:
-            ...
-    """
-
-    def http_response(self, request, response):
-        return response
-
-    def https_response(self, request, response):
-        return response
-
-
-########################################
-# ../../../omlish/http/versions.py
-
-
-##
-
-
-class UnknownHttpVersionError(Exception):
-    pass
-
-
-@ta.final
-@functools.total_ordering
-class HttpVersion:
-    def __init__(self, major: int, minor: int) -> None:
-        self._major = major
-        self._minor = minor
-
-        self._parts = parts = (major, minor)
-
-        self._hash = hash(parts)
-
-        self._str = f'HTTP/{major}.{minor}'
-        self._short_str = f'{major}.{minor}'
-
-    def __repr__(self) -> str:
-        return f'{self.__class__.__name__}({self.major}, {self.minor})'
-
-    def __hash__(self) -> int:
-        return self._hash
-
-    def __eq__(self, other: object) -> ta.Any:
-        if not isinstance(other, HttpVersion):
-            return NotImplemented
-        return self._parts == other._parts
-
-    def __lt__(self, other: object) -> ta.Any:
-        if not isinstance(other, HttpVersion):
-            return NotImplemented
-        return self._parts < other._parts
-
-    @property
-    def major(self) -> int:
-        return self._major
-
-    @property
-    def minor(self) -> int:
-        return self._minor
-
-    def __str__(self) -> str:
-        return self._str
-
-    @property
-    def short_str(self) -> str:
-        return self._short_str
-
-    def __iter__(self) -> ta.Iterator[int]:
-        return iter(self._parts)
-
-
-@ta.final
-class HttpVersions:
-    def __new__(cls, *args, **kwargs):  # noqa
-        raise TypeError
-
-    HTTP_0_9 = HttpVersion(0, 9)
-    HTTP_1_0 = HttpVersion(1, 0)
-    HTTP_1_1 = HttpVersion(1, 1)
-    HTTP_2_0 = HttpVersion(2, 0)
-
-    _FROM_STR: ta.ClassVar[ta.Mapping[str, HttpVersion]] = {
-        str(v): v for v in [
-            HTTP_0_9,
-            HTTP_1_0,
-            HTTP_1_1,
-            HTTP_2_0,
-        ]
-    }
-
-    @classmethod
-    def from_str(cls, s: str) -> HttpVersion:
-        try:
-            return cls._FROM_STR[s]
-        except KeyError:
-            raise UnknownHttpVersionError(s) from None
-
-    @classmethod
-    def of(cls, o: ta.Union[HttpVersion, str]) -> HttpVersion:
-        if isinstance(o, HttpVersion):
-            return o
-        elif isinstance(o, str):
-            return cls.from_str(o)
-        else:
-            raise TypeError(o)
-
-
-########################################
-# ../../../omlish/io/pushback.py
+# ../../../omlish/http/coro/_pushback.py
 
 
 ##
@@ -897,6 +776,127 @@ class PushbackReader:
             buf += chunk
 
 
+########################################
+# ../../../omlish/http/urllib.py
+
+
+##
+
+
+class NonRaisingUrllibErrorProcessor(urllib.request.HTTPErrorProcessor):
+    """
+    https://stackoverflow.com/a/74844056
+
+    Usage:
+
+        opener = urllib.request.build_opener(NonRaisingUrllibErrorProcessor)
+        with opener.open(req) as resp:
+            ...
+    """
+
+    def http_response(self, request, response):
+        return response
+
+    def https_response(self, request, response):
+        return response
+
+
+########################################
+# ../../../omlish/http/versions.py
+
+
+##
+
+
+class UnknownHttpVersionError(Exception):
+    pass
+
+
+@ta.final
+@functools.total_ordering
+class HttpVersion:
+    def __init__(self, major: int, minor: int) -> None:
+        self._major = major
+        self._minor = minor
+
+        self._parts = parts = (major, minor)
+
+        self._hash = hash(parts)
+
+        self._str = f'HTTP/{major}.{minor}'
+        self._short_str = f'{major}.{minor}'
+
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}({self.major}, {self.minor})'
+
+    def __hash__(self) -> int:
+        return self._hash
+
+    def __eq__(self, other: object) -> ta.Any:
+        if not isinstance(other, HttpVersion):
+            return NotImplemented
+        return self._parts == other._parts
+
+    def __lt__(self, other: object) -> ta.Any:
+        if not isinstance(other, HttpVersion):
+            return NotImplemented
+        return self._parts < other._parts
+
+    @property
+    def major(self) -> int:
+        return self._major
+
+    @property
+    def minor(self) -> int:
+        return self._minor
+
+    def __str__(self) -> str:
+        return self._str
+
+    @property
+    def short_str(self) -> str:
+        return self._short_str
+
+    def __iter__(self) -> ta.Iterator[int]:
+        return iter(self._parts)
+
+
+@ta.final
+class HttpVersions:
+    def __new__(cls, *args, **kwargs):  # noqa
+        raise TypeError
+
+    HTTP_0_9 = HttpVersion(0, 9)
+    HTTP_1_0 = HttpVersion(1, 0)
+    HTTP_1_1 = HttpVersion(1, 1)
+    HTTP_2_0 = HttpVersion(2, 0)
+
+    _FROM_STR: ta.ClassVar[ta.Mapping[str, HttpVersion]] = {
+        str(v): v for v in [
+            HTTP_0_9,
+            HTTP_1_0,
+            HTTP_1_1,
+            HTTP_2_0,
+        ]
+    }
+
+    @classmethod
+    def from_str(cls, s: str) -> HttpVersion:
+        try:
+            return cls._FROM_STR[s]
+        except KeyError:
+            raise UnknownHttpVersionError(s) from None
+
+    @classmethod
+    def of(cls, o: ta.Union[HttpVersion, str]) -> HttpVersion:
+        if isinstance(o, HttpVersion):
+            return o
+        elif isinstance(o, str):
+            return cls.from_str(o)
+        else:
+            raise TypeError(o)
+
+
 ########################################
 # ../../../omlish/lite/abstract.py
 

{omdev-0.0.0.dev543 → omdev-0.0.0.dev544}/omdev/tools/git/cli.py

@@ -124,8 +124,8 @@ class Cli(ap.Cli):
         if path is not self._NOT_SET:
             if path is None:
                 path = os.getcwd()
-            shadow_cfg = get_shadow_configs().get_shadow_config(check.isinstance(path, str)) or {}
-            dct = merge_configs(dct, shadow_cfg.get('git', {}))
+            shadow_cfg = get_shadow_configs().get_shadow_config(check.isinstance(path, str), 'git') or {}
+            dct = merge_configs(dct, shadow_cfg)
 
         return msh.unmarshal(dct, self.Config)
 

omdev-0.0.0.dev544/omdev/tools/shadow.py

@@ -0,0 +1,101 @@
+"""
+TODO:
+ - 'edit', default cwd - use git's
+ - delete?
+ - 'purge'?
+ - 'validate' - at least formats
+"""
+import os.path
+import shutil
+
+from omlish import check
+from omlish.argparse import all as ap
+from omlish.subprocesses.editor import get_user_text_editor
+
+from ..cli.types import CliModule
+from ..home.shadow import get_file_shadow_configs
+
+
+##
+
+
+class ShadowCli(ap.Cli):
+    def _get_shadow_file(
+            self,
+            name: str,
+            *,
+            path: str | None = None,
+            preferred_ext: str | None = None,
+    ) -> str | None:
+        return get_file_shadow_configs().get_shadow_config_file_path(
+            path if path is not None else os.getcwd(),
+            name,
+            preferred_ext=preferred_ext,
+        )
+
+    #
+
+    @ap.cmd(
+        ap.arg('name'),
+        ap.arg('-p', '--path'),
+        ap.arg('-x', '--preferred-ext', default='yml'),
+    )
+    def edit(self) -> None:
+        shd_file = check.not_none(self._get_shadow_file(
+            self._args.name,
+            path=self._args.path,
+            preferred_ext=self._args.preferred_ext,
+        ))
+        os.makedirs(os.path.dirname(shd_file), exist_ok=True)
+
+        ed = get_user_text_editor()
+        ed_exe = check.not_none(shutil.which(ed))
+
+        os.execl(ed_exe, ed_exe, shd_file)
+
+    @ap.cmd(
+        ap.arg('name'),
+        ap.arg('-p', '--path'),
+    )
+    def show(self) -> None:
+        shd_file = self._get_shadow_file(
+            self._args.name,
+            path=self._args.path,
+        )
+        if not shd_file:
+            return
+        try:
+            with open(shd_file) as f:
+                buf = f.read()
+        except FileNotFoundError:
+            return
+        print(buf)
+
+    @ap.cmd(
+        ap.arg('name'),
+        ap.arg('-p', '--path'),
+        ap.arg('-x', '--preferred-ext'),
+    )
+    def which(self) -> None:
+        shd_file = self._get_shadow_file(
+            self._args.name,
+            path=self._args.path,
+            preferred_ext=self._args.preferred_ext,
+        )
+        if shd_file is not None:
+            print(shd_file)
+
+
+##
+
+
+# @omlish-manifest
+_CLI_MODULE = CliModule('shadow', __name__)
+
+
+def _main() -> None:
+    ShadowCli().cli_run_and_exit()
+
+
+if __name__ == '__main__':
+    _main()

{omdev-0.0.0.dev543 → omdev-0.0.0.dev544/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev543
+Version: 0.0.0.dev544
 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.dev543
+Requires-Dist: omlish==0.0.0.dev544
 Provides-Extra: all
 Requires-Dist: black~=26.3; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"

{omdev-0.0.0.dev543 → omdev-0.0.0.dev544}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev543
+omlish==0.0.0.dev544
 
 [all]
 black~=26.3

{omdev-0.0.0.dev543 → omdev-0.0.0.dev544}/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.dev543'
+version = '0.0.0.dev544'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,7 +24,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev543',
+    'omlish == 0.0.0.dev544',
 ]
 
 [project.optional-dependencies]

omdev-0.0.0.dev543/omdev/home/shadow.py

@@ -1,14 +0,0 @@
-from omlish.configs.shadow import MangledFilesShadowConfigs
-from omlish.configs.shadow import ShadowConfigs
-
-from .paths import get_home_paths
-
-
-##
-
-
-def get_shadow_configs() -> ShadowConfigs:
-    return MangledFilesShadowConfigs(
-        get_home_paths().shadow_dir,
-        create=True,
-    )

omdev-0.0.0.dev543/omdev/tools/shadow.py

@@ -1,77 +0,0 @@
-"""
-TODO:
- - 'edit', default cwd - use git's
- - delete?
- - 'purge'?
- - 'validate' - at least formats
-"""
-import os.path
-import shutil
-
-from omlish import check
-from omlish.argparse import all as ap
-from omlish.configs.shadow import FileShadowConfigs
-from omlish.subprocesses.editor import get_user_text_editor
-
-from ..cli.types import CliModule
-from ..home.shadow import get_shadow_configs
-
-
-##
-
-
-class ShadowCli(ap.Cli):
-    def _get_shadow_file(self, path: str | None = None) -> str:
-        if (path := self._args.path) is None:
-            path = os.getcwd()
-        file_scs = check.isinstance(get_shadow_configs(), FileShadowConfigs)
-        shd_file = file_scs.get_shadow_config_file_path(path)
-        return shd_file
-
-    #
-
-    @ap.cmd(
-        ap.arg('path', nargs='?'),
-    )
-    def edit(self) -> None:
-        shd_file = self._get_shadow_file(self._args.path)
-        os.makedirs(os.path.dirname(shd_file), exist_ok=True)
-
-        ed = get_user_text_editor()
-        ed_exe = check.not_none(shutil.which(ed))
-
-        os.execl(ed_exe, ed_exe, shd_file)
-
-    @ap.cmd(
-        ap.arg('path', nargs='?'),
-    )
-    def show(self) -> None:
-        shd_file = self._get_shadow_file(self._args.path)
-        try:
-            with open(shd_file) as f:
-                buf = f.read()
-        except FileNotFoundError:
-            return
-        print(buf)
-
-    @ap.cmd(
-        ap.arg('path', nargs='?'),
-    )
-    def which(self) -> None:
-        shd_file = self._get_shadow_file(self._args.path)
-        print(shd_file)
-
-
-##
-
-
-# @omlish-manifest
-_CLI_MODULE = CliModule('shadow', __name__)
-
-
-def _main() -> None:
-    ShadowCli().cli_run_and_exit()
-
-
-if __name__ == '__main__':
-    _main()