ominfra 0.0.0.dev243__tar.gz → 0.0.0.dev244__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ominfra
-Version: 0.0.0.dev243
+Version: 0.0.0.dev244
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev243
-Requires-Dist: omlish==0.0.0.dev243
+Requires-Dist: omdev==0.0.0.dev244
+Requires-Dist: omlish==0.0.0.dev244
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.18; extra == "all"

{ominfra-0.0.0.dev243 → ominfra-0.0.0.dev244}/ominfra/manage/main.py

@@ -11,7 +11,7 @@ import os.path
 import sys
 import typing as ta
 
-from omdev.home.paths import get_config_dir
+from omdev.home.paths import get_home_paths
 from omlish.argparse.cli import ArgparseCli
 from omlish.argparse.cli import argparse_arg
 from omlish.argparse.cli import argparse_cmd
@@ -44,7 +44,7 @@ class MainCli(ArgparseCli):
     @cached_nullary
     def config(self) -> ManageConfig:
         if (cf := self.config_file) is None:
-            cf = os.path.join(get_config_dir(), 'manage', 'manage.yml')
+            cf = os.path.join(get_home_paths().config_dir, 'manage', 'manage.yml')
             if not os.path.isfile(cf):
                 cf = None
 

{ominfra-0.0.0.dev243 → ominfra-0.0.0.dev244}/ominfra/scripts/manage.py

@@ -173,20 +173,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
+
+    @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')
 
-def get_run_dir() -> str:
-    return os.path.join(get_home_dir(), 'run')
+    @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')
 
-def get_shadow_dir() -> str:
-    return os.path.join(get_home_dir(), 'shadow')
+    @property
+    def state_dir(self) -> str:
+        return os.path.join(self._home_dir, 'state')
 
 
-def get_state_dir() -> str:
-    return os.path.join(get_home_dir(), 'state')
+def get_home_paths() -> HomePaths:
+    return HomePaths()
 
 
 ##
@@ -13526,7 +13547,7 @@ class MainCli(ArgparseCli):
     @cached_nullary
     def config(self) -> ManageConfig:
         if (cf := self.config_file) is None:
-            cf = os.path.join(get_config_dir(), 'manage', 'manage.yml')
+            cf = os.path.join(get_home_paths().config_dir, 'manage', 'manage.yml')
             if not os.path.isfile(cf):
                 cf = None
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ominfra
-Version: 0.0.0.dev243
+Version: 0.0.0.dev244
 Summary: ominfra
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev243
-Requires-Dist: omlish==0.0.0.dev243
+Requires-Dist: omdev==0.0.0.dev244
+Requires-Dist: omlish==0.0.0.dev244
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.18; extra == "all"

{ominfra-0.0.0.dev243 → ominfra-0.0.0.dev244}/ominfra.egg-info/requires.txt

@@ -1,5 +1,5 @@
-omdev==0.0.0.dev243
-omlish==0.0.0.dev243
+omdev==0.0.0.dev244
+omlish==0.0.0.dev244
 
 [all]
 paramiko~=3.5

{ominfra-0.0.0.dev243 → ominfra-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,8 +22,8 @@ classifiers = [
 ]
 description = 'ominfra'
 dependencies = [
-    'omdev == 0.0.0.dev243',
-    'omlish == 0.0.0.dev243',
+    'omdev == 0.0.0.dev244',
+    'omlish == 0.0.0.dev244',
 ]
 
 [project.optional-dependencies]