ominfra 0.0.0.dev384__tar.gz → 0.0.0.dev386__tar.gz

{ominfra-0.0.0.dev384/ominfra.egg-info → ominfra-0.0.0.dev386}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ominfra
-Version: 0.0.0.dev384
+Version: 0.0.0.dev386
 Summary: ominfra
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,8 +14,8 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev384
-Requires-Dist: omlish==0.0.0.dev384
+Requires-Dist: omdev==0.0.0.dev386
+Requires-Dist: omlish==0.0.0.dev386
 Provides-Extra: all
 Requires-Dist: paramiko~=4.0; extra == "all"
 Requires-Dist: asyncssh~=2.21; extra == "all"

{ominfra-0.0.0.dev384 → ominfra-0.0.0.dev386}/ominfra/scripts/manage.py

@@ -155,76 +155,6 @@ SubprocessChannelOption = ta.Literal['pipe', 'stdout', 'devnull']  # ta.TypeAlia
 SystemPackageOrStr = ta.Union['SystemPackage', str]  # ta.TypeAlias
 
 
-########################################
-# ../../../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))
-
-
-#
-
-
-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/packaging/versions.py
 # Copyright (c) Donald Stufft and individual contributors.
@@ -3867,6 +3797,158 @@ def set_process_deathsig(sig: int) -> bool:
         return False
 
 
+########################################
+# ../../../omlish/os/environ.py
+
+
+##
+
+
+class EnvVar:
+    def __init__(self, name: str) -> None:
+        super().__init__()
+
+        if not isinstance(name, str):
+            raise TypeError(name)
+        if not name:
+            raise NameError(name)
+        self._name = name
+
+    @property
+    def name(self) -> str:
+        return self._name
+
+    def __init_subclass__(cls, **kwargs):
+        raise TypeError
+
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}({self._name!r})'
+
+    def __hash__(self) -> int:
+        return hash((self.__class__, self._name))
+
+    def __eq__(self, other):
+        if not isinstance(other, EnvVar):
+            return NotImplemented
+        return self._name == other._name
+
+    def __bool__(self) -> bool:
+        raise TypeError
+
+    def __str__(self) -> str:
+        raise TypeError
+
+    #
+
+    @classmethod
+    def _get_mut_environ(
+            cls,
+            environ: ta.Optional[ta.MutableMapping[str, str]] = None,
+    ) -> ta.MutableMapping[str, str]:
+        if environ is None:
+            return os.environ
+        return environ
+
+    @classmethod
+    def _get_environ(
+            cls,
+            environ: ta.Optional[ta.Mapping[str, str]] = None,
+    ) -> ta.Mapping[str, str]:
+        if environ is None:
+            return cls._get_mut_environ()
+        return environ
+
+    #
+
+    def is_set(self, environ: ta.Optional[ta.Mapping[str, str]] = None) -> bool:
+        return self._name in self._get_environ(environ)
+
+    _NO_DEFAULT: ta.ClassVar[ta.Any] = object()
+
+    @ta.overload
+    def get(
+            self,
+            *,
+            environ: ta.Optional[ta.Mapping[str, str]] = None,
+    ) -> str:
+        ...
+
+    @ta.overload
+    def get(
+            self,
+            default: str,
+            /,
+            *,
+            environ: ta.Optional[ta.Mapping[str, str]] = None,
+    ) -> str:
+        ...
+
+    @ta.overload
+    def get(
+            self,
+            default: ta.Optional[str],
+            /,
+            *,
+            environ: ta.Optional[ta.Mapping[str, str]] = None,
+    ) -> ta.Optional[str]:
+        ...
+
+    @ta.overload
+    def get(
+            self,
+            default: ta.Callable[[], str],
+            /,
+            *,
+            environ: ta.Optional[ta.Mapping[str, str]] = None,
+    ) -> str:
+        ...
+
+    @ta.overload
+    def get(
+            self,
+            default: ta.Callable[[], ta.Optional[str]],
+            /,
+            *,
+            environ: ta.Optional[ta.Mapping[str, str]] = None,
+    ) -> ta.Optional[str]:
+        ...
+
+    def get(self, default=_NO_DEFAULT, /, *, environ=None):
+        environ = self._get_environ(environ)
+        try:
+            return environ[self._name]
+        except KeyError:
+            if default is self._NO_DEFAULT:
+                raise
+            elif callable(default):
+                return default()
+            else:
+                return default
+
+    #
+
+    def set(self, value: ta.Optional[str], *, environ: ta.Optional[ta.MutableMapping[str, str]] = None) -> None:
+        environ = self._get_mut_environ(environ)
+        if value is not None:
+            environ[self._name] = value
+        else:
+            del environ[self._name]
+
+    @contextlib.contextmanager
+    def set_context(
+            self,
+            value: ta.Optional[str],
+            *,
+            environ: ta.Optional[ta.MutableMapping[str, str]] = None,
+    ) -> ta.Iterator[ta.Optional[str]]:
+        prev = self.get(None, environ=environ)
+        self.set(value, environ=environ)
+        try:
+            yield prev
+        finally:
+            self.set(prev, environ=environ)
+
+
 ########################################
 # ../../../omlish/os/linux.py
 """
@@ -4435,6 +4517,76 @@ def shlex_maybe_quote(s: str) -> str:
         return s
 
 
+########################################
+# ../../../omdev/home/paths.py
+"""
+TODO:
+ - XDG cache root
+"""
+
+
+##
+
+
+HOME_DIR_ENV_VAR = EnvVar('OMLISH_HOME')
+DEFAULT_HOME_DIR = '~/.omlish'
+
+
+def get_home_dir() -> str:
+    return os.path.expanduser(HOME_DIR_ENV_VAR.get(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/packaging/specifiers.py
 # Copyright (c) Donald Stufft and individual contributors.

{ominfra-0.0.0.dev384 → ominfra-0.0.0.dev386/ominfra.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ominfra
-Version: 0.0.0.dev384
+Version: 0.0.0.dev386
 Summary: ominfra
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,8 +14,8 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev384
-Requires-Dist: omlish==0.0.0.dev384
+Requires-Dist: omdev==0.0.0.dev386
+Requires-Dist: omlish==0.0.0.dev386
 Provides-Extra: all
 Requires-Dist: paramiko~=4.0; extra == "all"
 Requires-Dist: asyncssh~=2.21; extra == "all"

{ominfra-0.0.0.dev384 → ominfra-0.0.0.dev386}/ominfra.egg-info/requires.txt

@@ -1,5 +1,5 @@
-omdev==0.0.0.dev384
-omlish==0.0.0.dev384
+omdev==0.0.0.dev386
+omlish==0.0.0.dev386
 
 [all]
 paramiko~=4.0

{ominfra-0.0.0.dev384 → ominfra-0.0.0.dev386}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.13'
-version = '0.0.0.dev384'
+version = '0.0.0.dev386'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,8 +24,8 @@ classifiers = [
 ]
 description = 'ominfra'
 dependencies = [
-    'omdev == 0.0.0.dev384',
-    'omlish == 0.0.0.dev384',
+    'omdev == 0.0.0.dev386',
+    'omlish == 0.0.0.dev386',
 ]
 
 [project.optional-dependencies]