omdev 0.0.0.dev232__tar.gz → 0.0.0.dev234__tar.gz

{omdev-0.0.0.dev232/omdev.egg-info → omdev-0.0.0.dev234}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: omdev
-Version: 0.0.0.dev232
+Version: 0.0.0.dev234
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev232
+Requires-Dist: omlish==0.0.0.dev234
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev232 → omdev-0.0.0.dev234}/omdev/.manifests.json

@@ -276,14 +276,30 @@
     }
   },
   {
-    "module": ".tools.git",
+    "module": ".tools.git.__main__",
     "attr": "_CLI_MODULE",
-    "file": "omdev/tools/git.py",
-    "line": 231,
+    "file": "omdev/tools/git/__main__.py",
+    "line": 4,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "git",
-        "mod_name": "omdev.tools.git"
+        "mod_name": "omdev.tools.git.__main__"
+      }
+    }
+  },
+  {
+    "module": ".tools.git.messages",
+    "attr": "_TIMESTAMP_GIT_MESSAGE_GENERATOR_MANIFEST",
+    "file": "omdev/tools/git/messages.py",
+    "line": 54,
+    "value": {
+      "$.tools.git.messages.GitMessageGeneratorManifest": {
+        "mod_name": "omdev.tools.git.messages",
+        "attr_name": "TimestampGitMessageGenerator",
+        "name": "timestamp",
+        "aliases": [
+          "ts"
+        ]
       }
     }
   },

{omdev-0.0.0.dev232 → omdev-0.0.0.dev234}/omdev/cache/data/defaults.py

@@ -2,6 +2,7 @@ import os.path
 
 from omlish import lang
 
+from ...home.paths import get_cache_dir
 from .cache import Cache
 
 
@@ -10,7 +11,7 @@ from .cache import Cache
 
 @lang.cached_function(lock=True)
 def default_dir() -> str:
-    return os.path.expanduser('~/.cache/omlish/data')
+    return os.path.join(get_cache_dir(), 'data')
 
 
 @lang.cached_function(lock=True)

{omdev-0.0.0.dev232 → omdev-0.0.0.dev234}/omdev/cli/main.py

@@ -185,23 +185,12 @@ def _build_arg_parser() -> argparse.ArgumentParser:
 def _build_cmd_set(args: ta.Any) -> CliCmdSet:
     ldr = ManifestLoader.from_entry_point(globals())
 
-    pkgs: list[str] = []
-
-    def scan_pkg_root(r: str) -> None:
-        r = os.path.expanduser(r)
-        for n in os.listdir(r):
-            if os.path.isdir(p := os.path.join(r, n)) and os.path.exists(os.path.join(p, '__init__.py')):
-                pkgs.append(n)
-
-    if args.cli_pkg_root:
-        for r in args.cli_pkg_root:
-            scan_pkg_root(r)
-
-    else:
-        pkgs.extend(ldr.discover())
+    #
 
-        if not pkgs:
-            scan_pkg_root(os.getcwd())
+    pkgs = ldr.scan_or_discover_pkgs(
+        specified_roots=args.cli_pkg_root,
+        fallback_root=os.getcwd(),
+    )
 
     #
 

omdev-0.0.0.dev234/omdev/home/paths.py

@@ -0,0 +1,20 @@
+"""
+TODO:
+ - XDG cache root
+"""
+import os.path
+
+
+HOME_DIR_ENV_VAR = 'OMLISH_HOME'
+DEFAULT_HOME_DIR = '~/.omlish'
+
+CACHE_DIR_ENV_VAR = 'OMLISH_CACHE'
+DEFAULT_CACHE_DIR = '~/.cache/omlish'
+
+
+def get_home_dir() -> str:
+    return os.path.expanduser(os.getenv(HOME_DIR_ENV_VAR, DEFAULT_HOME_DIR))
+
+
+def get_cache_dir() -> str:
+    return os.path.expanduser(os.getenv(DEFAULT_CACHE_DIR, DEFAULT_CACHE_DIR))

omdev-0.0.0.dev234/omdev/home/secrets.py

@@ -0,0 +1,33 @@
+import os.path
+import typing as ta
+
+from omlish import lang
+from omlish.secrets import all as sec
+
+from .paths import get_home_dir
+
+
+if ta.TYPE_CHECKING:
+    import yaml
+else:
+    yaml = lang.proxy_import('yaml')
+
+
+SECRETS_FILE_ENV_VAR = 'OMLISH_SECRETS'
+DEFAULT_SECRETS_FILE_NAME = 'secrets.yml'
+
+
+def get_secrets_file() -> str:
+    return os.path.expanduser(os.getenv(SECRETS_FILE_ENV_VAR, os.path.join(get_home_dir(), DEFAULT_SECRETS_FILE_NAME)))
+
+
+def load_secrets() -> sec.Secrets:
+    dct: dict[str, sec.Secret] = {}
+    try:
+        with open(get_secrets_file()) as f:
+            for k, v in yaml.safe_load(f).items():
+                if isinstance(v, str):
+                    dct[k] = sec.Secret(key=k, value=v)
+    except FileNotFoundError:
+        pass
+    return sec.MappingSecrets(dct)

{omdev-0.0.0.dev232 → omdev-0.0.0.dev234}/omdev/imgur.py

@@ -33,7 +33,7 @@ from omlish.http import all as hu
 from omlish.secrets.secrets import Secret
 
 from .cli import CliModule
-from .secrets import load_secrets
+from .home.secrets import load_secrets
 
 
 @dc.dataclass(frozen=True)

{omdev-0.0.0.dev232/omdev → omdev-0.0.0.dev234/omdev/packaging}/revisions.py

@@ -17,7 +17,7 @@ from omlish.lite.check import check
 from omlish.lite.logs import log
 from omlish.logs.standard import configure_standard_logging
 
-from .git.revisions import get_git_revision
+from ..git.revisions import get_git_revision
 from .wheelfile import WheelFile
 
 

{omdev-0.0.0.dev232 → omdev-0.0.0.dev234}/omdev/pyproject/pkg.py

@@ -42,7 +42,7 @@ from omlish.subprocesses.sync import subprocesses
 
 from ..cexts.magic import CextMagic
 from ..magic.find import find_magic_files
-from ..revisions import GitRevisionAdder
+from ..packaging.revisions import GitRevisionAdder
 
 
 #

{omdev-0.0.0.dev232 → omdev-0.0.0.dev234}/omdev/scripts/pyproject.py

@@ -624,7 +624,7 @@ def canonicalize_version(
 
 
 ########################################
-# ../../wheelfile.py
+# ../../packaging/wheelfile.py
 # https://github.com/pypa/wheel/blob/7bb46d7727e6e89fe56b3c78297b3af2672bbbe2/src/wheel/wheelfile.py
 # MIT License
 #
@@ -7236,7 +7236,7 @@ class Pyenv:
 
 
 ########################################
-# ../../revisions.py
+# ../../packaging/revisions.py
 """
 TODO:
  - omlish-lite, move to pyproject/

omdev-0.0.0.dev234/omdev/tools/git/__main__.py

@@ -0,0 +1,11 @@
+from ...cli import CliModule
+
+
+# @omlish-manifest
+_CLI_MODULE = CliModule('git', __name__)
+
+
+if __name__ == '__main__':
+    from .cli import _main  # noqa
+
+    _main()

omdev-0.0.0.dev232/omdev/tools/git.py → omdev-0.0.0.dev234/omdev/tools/git/cli.py

@@ -9,14 +9,17 @@ import typing as ta
 import urllib.parse
 
 from omlish import check
-from omlish import lang
 from omlish.argparse import all as ap
 from omlish.formats import json
 from omlish.logs import all as logs
 
-from ..cli import CliModule
-from ..git.status import GitStatusItem
-from ..git.status import get_git_status
+from ...git.status import GitStatusItem
+from ...git.status import get_git_status
+from .messages import TimestampGitMessageGenerator
+from .messages import load_message_generator_manifests
+
+
+##
 
 
 def rev_parse(rev: str) -> str:
@@ -186,7 +189,7 @@ class Cli(ap.Cli):
 
     @ap.cmd(
         ap.arg('-m', '--message', nargs='?'),
-        ap.arg('--time-fmt', default='%Y-%m-%dT%H:%M:%SZ'),
+        ap.arg('--time-fmt', default=TimestampGitMessageGenerator.DEFAULT_TIME_FMT),
         ap.arg('dir', nargs='*'),
         aliases=['acp'],
     )
@@ -201,7 +204,7 @@ class Cli(ap.Cli):
                 if self.args.message is not None:
                     msg = self.args.message
                 else:
-                    msg = lang.utcnow().strftime(self.args.time_fmt)
+                    msg = TimestampGitMessageGenerator(self.args.time_fmt).generate_commit_message()
                 subprocess.check_call(['git', 'commit', '-m', msg], cwd=cwd)
 
             subprocess.check_call(['git', 'push'], cwd=cwd)
@@ -227,11 +230,21 @@ class Cli(ap.Cli):
             for d in self.args.dir:
                 run(d)
 
+    #
 
-# @omlish-manifest
-_CLI_MODULE = CliModule('git', __name__)
+    @ap.cmd()
+    def list_message_generators(self) -> None:
+        for mgm in load_message_generator_manifests():
+            print(mgm.name)
 
 
-if __name__ == '__main__':
+##
+
+
+def _main() -> None:
     logs.configure_standard_logging('INFO')
     Cli()()
+
+
+if __name__ == '__main__':
+    _main()

omdev-0.0.0.dev234/omdev/tools/git/messages.py

@@ -0,0 +1,60 @@
+import abc
+import dataclasses as dc
+import os
+import typing as ta
+
+from omlish import cached
+from omlish import lang
+from omlish.manifests import load as manifest_load
+
+
+##
+
+
+class GitMessageGenerator(abc.ABC):
+    @abc.abstractmethod
+    def generate_commit_message(self) -> str:
+        raise NotImplementedError
+
+
+#
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class GitMessageGeneratorManifest:
+    mod_name: str
+    attr_name: str
+    name: str
+    aliases: ta.Collection[str] | None = None
+
+
+@cached.function
+def load_message_generator_manifests() -> ta.Sequence[GitMessageGeneratorManifest]:
+    ldr = manifest_load.MANIFEST_LOADER
+    pkgs = ldr.scan_or_discover_pkgs(fallback_root=os.getcwd())
+    mfs = ldr.load(*pkgs, only=[GitMessageGeneratorManifest])
+    return [mf.value for mf in mfs]
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class TimestampGitMessageGenerator(GitMessageGenerator):
+    DEFAULT_TIME_FMT: ta.ClassVar[str] = '%Y-%m-%d %H:%M:%S'
+    time_fmt: str = DEFAULT_TIME_FMT
+
+    def generate_commit_message(self) -> str:
+        return lang.utcnow().strftime(self.time_fmt)
+
+
+#
+
+
+# @omlish-manifest
+_TIMESTAMP_GIT_MESSAGE_GENERATOR_MANIFEST = GitMessageGeneratorManifest(
+    mod_name=__name__,
+    attr_name='TimestampGitMessageGenerator',
+    name='timestamp',
+    aliases=['ts'],
+)

{omdev-0.0.0.dev232 → omdev-0.0.0.dev234/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: omdev
-Version: 0.0.0.dev232
+Version: 0.0.0.dev234
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev232
+Requires-Dist: omlish==0.0.0.dev234
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev232 → omdev-0.0.0.dev234}/omdev.egg-info/SOURCES.txt

@@ -11,10 +11,7 @@ omdev/cmake.py
 omdev/findimports.py
 omdev/imgur.py
 omdev/pip.py
-omdev/revisions.py
-omdev/secrets.py
 omdev/tagstrings.py
-omdev/wheelfile.py
 omdev.egg-info/PKG-INFO
 omdev.egg-info/SOURCES.txt
 omdev.egg-info/dependency_links.txt
@@ -131,6 +128,9 @@ omdev/git/__init__.py
 omdev/git/revisions.py
 omdev/git/shallow.py
 omdev/git/status.py
+omdev/home/__init__.py
+omdev/home/paths.py
+omdev/home/secrets.py
 omdev/interp/__init__.py
 omdev/interp/__main__.py
 omdev/interp/cli.py
@@ -186,8 +186,10 @@ omdev/packaging/__init__.py
 omdev/packaging/marshal.py
 omdev/packaging/names.py
 omdev/packaging/requires.py
+omdev/packaging/revisions.py
 omdev/packaging/specifiers.py
 omdev/packaging/versions.py
+omdev/packaging/wheelfile.py
 omdev/precheck/__init__.py
 omdev/precheck/__main__.py
 omdev/precheck/base.py
@@ -232,7 +234,6 @@ omdev/tools/__init__.py
 omdev/tools/cloc.py
 omdev/tools/doc.py
 omdev/tools/docker.py
-omdev/tools/git.py
 omdev/tools/importscan.py
 omdev/tools/linehisto.py
 omdev/tools/mkenv.py
@@ -242,6 +243,10 @@ omdev/tools/pip.py
 omdev/tools/prof.py
 omdev/tools/qr.py
 omdev/tools/sqlrepl.py
+omdev/tools/git/__init__.py
+omdev/tools/git/__main__.py
+omdev/tools/git/cli.py
+omdev/tools/git/messages.py
 omdev/tools/json/__init__.py
 omdev/tools/json/__main__.py
 omdev/tools/json/cli.py

{omdev-0.0.0.dev232 → omdev-0.0.0.dev234}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev232
+omlish==0.0.0.dev234
 
 [all]
 black~=25.1

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

omdev-0.0.0.dev232/omdev/secrets.py

@@ -1,23 +0,0 @@
-import os.path
-import typing as ta
-
-from omlish import lang
-from omlish.secrets import all as sec
-
-
-if ta.TYPE_CHECKING:
-    import yaml
-else:
-    yaml = lang.proxy_import('yaml')
-
-
-SECRETS_FILE = os.getenv('SECRETS_FILE', '~/.omlish/secrets.yml')
-
-
-def load_secrets() -> sec.Secrets:
-    dct: dict[str, sec.Secret] = {}
-    with open(os.path.expanduser(SECRETS_FILE)) as f:
-        for k, v in yaml.safe_load(f).items():
-            if isinstance(v, str):
-                dct[k] = sec.Secret(key=k, value=v)
-    return sec.MappingSecrets(dct)