omdev 0.0.0.dev243__tar.gz → 0.0.0.dev244__tar.gz

{omdev-0.0.0.dev243/omdev.egg-info → omdev-0.0.0.dev244}/PKG-INFO

@@ -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.dev244/omdev/home/paths.py

@@ -0,0 +1,70 @@
+# ruff: noqa: UP006 UP007
+# @omlish-lite
+"""
+TODO:
+ - XDG cache root
+"""
+import os.path
+import typing as ta
+
+
+##
+
+
+HOME_DIR_ENV_VAR = 'OMLISH_HOME'
+DEFAULT_HOME_DIR = '~/.omlish'
+
+
+def get_home_dir() -> str:
+    return os.path.expanduser(os.getenv(HOME_DIR_ENV_VAR, DEFAULT_HOME_DIR))
+
+
+#
+
+
+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
+
+    @property
+    def home_dir(self) -> str:
+        return self._home_dir
+
+    @property
+    def config_dir(self) -> str:
+        return os.path.join(self._home_dir, 'config')
+
+    @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')
+
+    @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()
+
+
+##
+
+
+CACHE_DIR_ENV_VAR = 'OMLISH_CACHE'
+DEFAULT_CACHE_DIR = '~/.cache/omlish'
+
+
+def get_cache_dir() -> str:
+    return os.path.expanduser(os.getenv(DEFAULT_CACHE_DIR, DEFAULT_CACHE_DIR))

{omdev-0.0.0.dev243 → omdev-0.0.0.dev244}/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-0.0.0.dev243 → omdev-0.0.0.dev244}/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-0.0.0.dev243 → omdev-0.0.0.dev244}/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-0.0.0.dev243 → omdev-0.0.0.dev244}/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 → omdev-0.0.0.dev244/omdev.egg-info}/PKG-INFO

@@ -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 → omdev-0.0.0.dev244}/omdev.egg-info/requires.txt

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

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

omdev-0.0.0.dev243/omdev/home/paths.py

@@ -1,48 +0,0 @@
-# ruff: noqa: UP006 UP007
-# @omlish-lite
-"""
-TODO:
- - XDG cache root
-"""
-import os.path
-
-
-##
-
-
-HOME_DIR_ENV_VAR = 'OMLISH_HOME'
-DEFAULT_HOME_DIR = '~/.omlish'
-
-
-def get_home_dir() -> str:
-    return os.path.expanduser(os.getenv(HOME_DIR_ENV_VAR, DEFAULT_HOME_DIR))
-
-
-#
-
-
-def get_config_dir() -> str:
-    return os.path.join(get_home_dir(), 'config')
-
-
-def get_run_dir() -> str:
-    return os.path.join(get_home_dir(), 'run')
-
-
-def get_shadow_dir() -> str:
-    return os.path.join(get_home_dir(), 'shadow')
-
-
-def get_state_dir() -> str:
-    return os.path.join(get_home_dir(), 'state')
-
-
-##
-
-
-CACHE_DIR_ENV_VAR = 'OMLISH_CACHE'
-DEFAULT_CACHE_DIR = '~/.cache/omlish'
-
-
-def get_cache_dir() -> str:
-    return os.path.expanduser(os.getenv(DEFAULT_CACHE_DIR, DEFAULT_CACHE_DIR))