ominfra 0.0.0.dev238__py3-none-any.whl → 0.0.0.dev239__py3-none-any.whl

ominfra/manage/main.py

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

ominfra/scripts/manage.py

@@ -151,6 +151,55 @@ SubprocessChannelOption = ta.Literal['pipe', 'stdout', 'devnull']  # ta.TypeAlia
 SystemPackageOrStr = ta.Union['SystemPackage', str]
 
 
+########################################
+# ../../../omdev/home/paths.py
+"""
+TODO:
+ - XDG cache root
+"""
+
+
+##
+
+
+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))
+
+
 ########################################
 # ../../../omdev/packaging/versions.py
 # Copyright (c) Donald Stufft and individual contributors.
@@ -13390,7 +13439,7 @@ class MainCli(ArgparseCli):
     @cached_nullary
     def config(self) -> ManageConfig:
         if (cf := self.config_file) is None:
-            cf = os.path.expanduser('~/.omlish/manage.yml')
+            cf = os.path.join(get_config_dir(), 'manage', 'manage.yml')
             if not os.path.isfile(cf):
                 cf = None
 

{ominfra-0.0.0.dev238.dist-info → ominfra-0.0.0.dev239.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ominfra
-Version: 0.0.0.dev238
+Version: 0.0.0.dev239
 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.dev238
-Requires-Dist: omlish==0.0.0.dev238
+Requires-Dist: omdev==0.0.0.dev239
+Requires-Dist: omlish==0.0.0.dev239
 Provides-Extra: all
 Requires-Dist: paramiko~=3.5; extra == "all"
 Requires-Dist: asyncssh~=2.18; extra == "all"

{ominfra-0.0.0.dev238.dist-info → ominfra-0.0.0.dev239.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=eZ2YpXlFaDxV_O5oNRKJ_6r5kS6GsQ0bQJflhxAIXDw,4380
+ominfra/manage/main.py,sha256=sA0Kv3g4KAtRN5AKgzEF0r0g0pviKCtlUrr9SJkqmIo,4436
 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=Hub3-WL7ZzxU9-UaIB78eT9grq4XldTyd3EZmcY2ulI,164834
-ominfra/scripts/manage.py,sha256=2yNF1vLPBqz2diJSbRufo3WBkWvRZQTy69mgvN0-j9A,373926
+ominfra/scripts/manage.py,sha256=rxq3p8MHhw2Z2SwxRp61US4CPidoMIIHshARYTGWCZo,374730
 ominfra/scripts/supervisor.py,sha256=8vVoR8kq7Qh2z_NdOrDXXnNCu9N5TnOM2M5om4D-ZmA,296097
 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.dev238.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev238.dist-info/METADATA,sha256=SIsnprMm6VdHR-w9Vtaeg4GNuNijKmEXWQGdiGr7Fuc,731
-ominfra-0.0.0.dev238.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-ominfra-0.0.0.dev238.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev238.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev238.dist-info/RECORD,,
+ominfra-0.0.0.dev239.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev239.dist-info/METADATA,sha256=wwV87zGXFGQxOia12xE5Bo6ZAolfo9INumkNDnsFRuE,731
+ominfra-0.0.0.dev239.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+ominfra-0.0.0.dev239.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev239.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev239.dist-info/RECORD,,