omdev 0.0.0.dev243__py3-none-any.whl → 0.0.0.dev244__py3-none-any.whl

omdev/home/paths.py

@@ -5,6 +5,7 @@ TODO:
  - XDG cache root
 """
 import os.path
+import typing as ta
 
 
 ##
@@ -21,20 +22,41 @@ def get_home_dir() -> str:
 #
 
 
-def get_config_dir() -> str:
-    return os.path.join(get_home_dir(), 'config')
+class HomePaths:
+    def __init__(self, home_dir: ta.Optional[str] = None) -> None:
+        super().__init__()
 
+        if home_dir is None:
+            home_dir = get_home_dir()
+        self._home_dir = home_dir
 
-def get_run_dir() -> str:
-    return os.path.join(get_home_dir(), 'run')
+    @property
+    def home_dir(self) -> str:
+        return self._home_dir
 
+    @property
+    def config_dir(self) -> str:
+        return os.path.join(self._home_dir, 'config')
 
-def get_shadow_dir() -> str:
-    return os.path.join(get_home_dir(), 'shadow')
+    @property
+    def log_dir(self) -> str:
+        return os.path.join(self._home_dir, 'log')
 
+    @property
+    def run_dir(self) -> str:
+        return os.path.join(self._home_dir, 'run')
 
-def get_state_dir() -> str:
-    return os.path.join(get_home_dir(), 'state')
+    @property
+    def shadow_dir(self) -> str:
+        return os.path.join(self._home_dir, 'shadow')
+
+    @property
+    def state_dir(self) -> str:
+        return os.path.join(self._home_dir, 'state')
+
+
+def get_home_paths() -> HomePaths:
+    return HomePaths()
 
 
 ##

omdev/home/secrets.py

@@ -4,7 +4,7 @@ import typing as ta
 from omlish import lang
 from omlish.secrets import all as sec
 
-from .paths import get_config_dir
+from .paths import get_home_paths
 
 
 if ta.TYPE_CHECKING:
@@ -24,7 +24,7 @@ def get_secrets_file() -> str:
     return os.path.expanduser(
         os.getenv(
             SECRETS_FILE_ENV_VAR,
-            os.path.join(get_config_dir(), DEFAULT_SECRETS_FILE_NAME),
+            os.path.join(get_home_paths().config_dir, DEFAULT_SECRETS_FILE_NAME),
         ),
     )
 

omdev/home/shadow.py

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

omdev/scripts/ci.py

@@ -10773,6 +10773,7 @@ def make_simple_http_server(
         ignore_ssl_errors: bool = False,
         executor: ta.Optional[cf.Executor] = None,
         use_threads: bool = False,
+        **kwargs: ta.Any,
 ) -> ta.Iterator[SocketServer]:
     check.arg(not (executor is not None and use_threads))
 
@@ -10837,6 +10838,7 @@ def make_simple_http_server(
         server = es.enter_context(SocketServer(
             SocketBinder.of(bind),
             server_handler,
+            **kwargs,
         ))
 
         yield server

omdev/tools/git/cli.py

@@ -22,7 +22,7 @@ from omlish.subprocesses.sync import subprocesses
 
 from ...git.status import GitStatusItem
 from ...git.status import get_git_status
-from ...home.paths import get_config_dir
+from ...home.paths import get_home_paths
 from ...home.shadow import get_shadow_configs
 from . import consts
 from .messages import GitMessageGenerator
@@ -75,7 +75,7 @@ class Cli(ap.Cli):
         if (arg := self._config_file_path_arg) is not None:
             return os.path.expanduser(arg)
         else:
-            return os.path.join(get_config_dir(), 'tools', 'git.yml')
+            return os.path.join(get_home_paths().config_dir, 'tools', 'git.yml')
 
     @cached.function
     def load_home_config_content(self) -> ta.Any:

{omdev-0.0.0.dev243.dist-info → omdev-0.0.0.dev244.dist-info}/METADATA

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

{omdev-0.0.0.dev243.dist-info → omdev-0.0.0.dev244.dist-info}/RECORD

@@ -121,9 +121,9 @@ omdev/git/revisions.py,sha256=XJDs4LAnSuETSUpV6Nv_4iDFqdzMHSixWgrH8UiP09w,1171
 omdev/git/shallow.py,sha256=pu2Dro9P7oUa-cpFkcscbay1bM6jLFfV5mevICzbjcE,2530
 omdev/git/status.py,sha256=7KKiNSgEa93TsLp54xshwEuVO-3hRiUItBEBnen-8Gg,8111
 omdev/home/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omdev/home/paths.py,sha256=3nGs1LOnNiVBtnF3JeKJ0dqnK8uu9KtMiZHWIQuO9RU,774
-omdev/home/secrets.py,sha256=TeSCcVj1cm8cIQBKbkccNtPa0D0Ruxrcx0QuRwBB4fw,859
-omdev/home/shadow.py,sha256=r8YQDp_uimeHOejRNi6mHlwgY8J3AEDAwiV_wxeDd4s,284
+omdev/home/paths.py,sha256=zFplXTmdTs1PLe_tvZhDkkApHEpSRg-JKxZ0WVgb6P8,1325
+omdev/home/secrets.py,sha256=AOua0JKRA55_xThah2IG1e4Soo8FCXK85eH2-_kzNV0,870
+omdev/home/shadow.py,sha256=6mGDJV70IExa-nzd7mOUW4R3OZIXO0fBwmOUU9T9f4M,295
 omdev/interp/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/interp/__main__.py,sha256=GMCqeGYltgt5dlJzHxY9gqisa8cRkrPfmZYuZnjg4WI,162
 omdev/interp/cli.py,sha256=xVap7jd5EGS-5lKj2bw6EdUf61eI7oPHRAQkMvYci60,2369
@@ -212,7 +212,7 @@ omdev/pyproject/resources/docker-dev.sh,sha256=DHkz5D18jok_oDolfg2mqrvGRWFoCe9GQ
 omdev/pyproject/resources/python.sh,sha256=rFaN4SiJ9hdLDXXsDTwugI6zsw6EPkgYMmtacZeTbvw,749
 omdev/scripts/__init__.py,sha256=MKCvUAEQwsIvwLixwtPlpBqmkMXLCnjjXyAXvVpDwVk,91
 omdev/scripts/bumpversion.py,sha256=2NnfRsJiZNTg-LubIwXCm2vklG7-kIR8_xFUEZNxtiY,1119
-omdev/scripts/ci.py,sha256=ZmbSdJmiIefgfoRkoZYBqACECyMfZnf5aXpRz5UzfZo,333011
+omdev/scripts/ci.py,sha256=uPisSbapukOgntmWCmNXHOU_IYpEh6KOceOuD5f8Cgc,333059
 omdev/scripts/execrss.py,sha256=mR0G0wERBYtQmVIn63lCIIFb5zkCM6X_XOENDFYDBKc,651
 omdev/scripts/exectime.py,sha256=S2O4MgtzTsFOY2IUJxsrnOIame9tEFc6aOlKP-F1JSg,1541
 omdev/scripts/importtrace.py,sha256=oa7CtcWJVMNDbyIEiRHej6ICfABfErMeo4_haIqe18Q,14041
@@ -240,7 +240,7 @@ omdev/tools/shadow.py,sha256=e0-R3Ss9CaZbGSUzSSr29OVj9mUQ-Oelh-66Dfkx5nk,1600
 omdev/tools/sqlrepl.py,sha256=wAjrfXNrRV63-NJCC2HlGQnFh7lUH0bHMnOjYotQqFs,5753
 omdev/tools/git/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/git/__main__.py,sha256=gI87SBUgTkKUcUM-RtZWnei-UUDDqzbr5aPztb-gvbE,168
-omdev/tools/git/cli.py,sha256=c2kHbSrvw0Yb95httkTT9VeeOg8HeZD1Nrc-qkCi4nA,11891
+omdev/tools/git/cli.py,sha256=j1w9nKWu_1qFzgKKcX1ZiaWBbmXA_gVkf5OobQgcL_w,11902
 omdev/tools/git/consts.py,sha256=JuXivUNDkNhM4pe97icjRVAKM8cNRbrODquHINNKqOE,40
 omdev/tools/git/messages.py,sha256=NWztIK0nAKJIOVzuVQcR_5LHZUgqyVkrOlpl7dFLMdU,2424
 omdev/tools/json/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -254,9 +254,9 @@ omdev/tools/json/rendering.py,sha256=tMcjOW5edfozcMSTxxvF7WVTsbYLoe9bCKFh50qyaGw
 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=zsEkfQX0jF5bn712uqPAyBSdJt2dno1LH2oeSMNfXQI,11424
-omdev-0.0.0.dev243.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev243.dist-info/METADATA,sha256=RTZBTdIwM0qlSukFnKc503zmK9nPuDaJ67OuGFWudJ8,1636
-omdev-0.0.0.dev243.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-omdev-0.0.0.dev243.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev243.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev243.dist-info/RECORD,,
+omdev-0.0.0.dev244.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev244.dist-info/METADATA,sha256=Hf6o1WNkU6OkjzL3apIzTiedCkD-NYl-KgcapQIA2bY,1636
+omdev-0.0.0.dev244.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+omdev-0.0.0.dev244.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev244.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev244.dist-info/RECORD,,