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

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/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.dist-info → ominfra-0.0.0.dev244.dist-info}/METADATA

@@ -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.dist-info → ominfra-0.0.0.dev244.dist-info}/RECORD

@@ -52,7 +52,7 @@ ominfra/manage/bootstrap.py,sha256=1RIRhVkUZjxZcZerHMg8U6xgWhhemGgPN5cDye8dQ68,4
 ominfra/manage/bootstrap_.py,sha256=B9UfR9J7mS3J54PFaSe1MQS5lCnKgxt5dDRJ9mnHYwg,656
 ominfra/manage/config.py,sha256=1y2N_8nXHBZc6YbW6BaRZoDDCTBmiHuWtTOQ7zdr5VE,184
 ominfra/manage/inject.py,sha256=_FVaMZUBKi-oObv14H77luWYCodxNJJD1t4pNQzckFE,2030
-ominfra/manage/main.py,sha256=sA0Kv3g4KAtRN5AKgzEF0r0g0pviKCtlUrr9SJkqmIo,4436
+ominfra/manage/main.py,sha256=jWraEP0l9YwjbLuPpnYUR2PTwIcKEpaHBUk2qYnkKO0,4447
 ominfra/manage/marshal.py,sha256=WKj7IU9bo4fBMSSzT6ZMm_WFalXIJZ-V7j8oi92fNhk,305
 ominfra/manage/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/manage/commands/base.py,sha256=LtaI0AgnplttQK7gNncNItq8yuTZQimJTaprVpZktI8,3993
@@ -113,7 +113,7 @@ ominfra/manage/targets/inject.py,sha256=P4597xWM-V3I_gCt2O71OLhYQkkXtuJvkYRsIbhh
 ominfra/manage/targets/targets.py,sha256=7GP6UAZyJFEhpkJN6UQdpr_WN3p7C76v-s445y-WB6U,1885
 ominfra/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/scripts/journald2aws.py,sha256=i1WBsTvVx8XetO_Kl0hGPHGDAFhPybyMBm60bvg_Hi8,167534
-ominfra/scripts/manage.py,sha256=KMYlDMLDa9W4dQXwRpc0q0dHnNGT8Q0Vk2Gh7hq1DZo,377660
+ominfra/scripts/manage.py,sha256=2uU_QU9C6s1DiLz9wV_zLkfWNZZ91MZHiCIjuKLqDJw,378202
 ominfra/scripts/supervisor.py,sha256=XQGNjIHFvyy7S5uv7bQ4hOne4hqWqny1SLcNlr1vX7w,296335
 ominfra/supervisor/LICENSE.txt,sha256=ZrHY15PVR98y26Yg6iQfa-SXnUaYTDhrUsPVcEO5OKM,1874
 ominfra/supervisor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
@@ -156,9 +156,9 @@ ominfra/tailscale/api.py,sha256=C5-t_b6jZXUWcy5k8bXm7CFnk73pSdrlMOgGDeGVrpw,1370
 ominfra/tailscale/cli.py,sha256=3FnJbgpLw6gInTfhERd1mDy9ijjMUGxkdYVo43Tnxx4,3555
 ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tools/listresources.py,sha256=auGP1LlbBJSFKUWNvQo_UzA8IsBNZBTMwEkFFRJ4FX4,6185
-ominfra-0.0.0.dev243.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev243.dist-info/METADATA,sha256=Yb-OAI8b5WxeyUO6lZcUcECtTvFcxhEAYCS6EiW0rdU,731
-ominfra-0.0.0.dev243.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-ominfra-0.0.0.dev243.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev243.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev243.dist-info/RECORD,,
+ominfra-0.0.0.dev244.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev244.dist-info/METADATA,sha256=E34HYzv8JQRFxgXeUiuROpXUGG9EMn6KZfNKbUMGFkY,731
+ominfra-0.0.0.dev244.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+ominfra-0.0.0.dev244.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev244.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev244.dist-info/RECORD,,