ominfra 0.0.0.dev237__tar.gz → 0.0.0.dev239__tar.gz

{ominfra-0.0.0.dev237/ominfra.egg-info → ominfra-0.0.0.dev239}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ominfra
-Version: 0.0.0.dev237
+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.dev237
-Requires-Dist: omlish==0.0.0.dev237
+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.dev237 → ominfra-0.0.0.dev239}/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-0.0.0.dev237 → ominfra-0.0.0.dev239}/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.dev237 → ominfra-0.0.0.dev239/ominfra.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ominfra
-Version: 0.0.0.dev237
+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.dev237
-Requires-Dist: omlish==0.0.0.dev237
+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.dev237 → ominfra-0.0.0.dev239}/ominfra.egg-info/requires.txt

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

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