omdev 0.0.0.dev235__tar.gz → 0.0.0.dev236__tar.gz

{omdev-0.0.0.dev235/omdev.egg-info → omdev-0.0.0.dev236}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: omdev
-Version: 0.0.0.dev235
+Version: 0.0.0.dev236
 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.dev235
+Requires-Dist: omlish==0.0.0.dev236
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev235 → omdev-0.0.0.dev236}/omdev/.manifests.json

@@ -291,7 +291,7 @@
     "module": ".tools.git.messages",
     "attr": "_TIMESTAMP_GIT_MESSAGE_GENERATOR_MANIFEST",
     "file": "omdev/tools/git/messages.py",
-    "line": 74,
+    "line": 75,
     "value": {
       "$.tools.git.messages.GitMessageGeneratorManifest": {
         "mod_name": "omdev.tools.git.messages",

{omdev-0.0.0.dev235 → omdev-0.0.0.dev236}/omdev/scripts/ci.py

@@ -1732,6 +1732,9 @@ def is_in_github_actions() -> bool:
 ########################################
 # ../../../omlish/argparse/cli.py
 """
+FIXME:
+ - exit_on_error lol
+
 TODO:
  - default command
  - auto match all underscores to hyphens
@@ -1759,6 +1762,10 @@ def argparse_arg(*args, **kwargs) -> ArgparseArg:
     return ArgparseArg(args, kwargs)
 
 
+def argparse_arg_(*args, **kwargs) -> ta.Any:
+    return argparse_arg(*args, **kwargs)
+
+
 #
 
 

{omdev-0.0.0.dev235 → omdev-0.0.0.dev236}/omdev/scripts/interp.py

@@ -2127,6 +2127,9 @@ class SpecifierSet(BaseSpecifier):
 ########################################
 # ../../../omlish/argparse/cli.py
 """
+FIXME:
+ - exit_on_error lol
+
 TODO:
  - default command
  - auto match all underscores to hyphens
@@ -2154,6 +2157,10 @@ def argparse_arg(*args, **kwargs) -> ArgparseArg:
     return ArgparseArg(args, kwargs)
 
 
+def argparse_arg_(*args, **kwargs) -> ta.Any:
+    return argparse_arg(*args, **kwargs)
+
+
 #
 
 

{omdev-0.0.0.dev235 → omdev-0.0.0.dev236}/omdev/scripts/pyproject.py

@@ -3785,6 +3785,9 @@ class RequirementsRewriter:
 ########################################
 # ../../../omlish/argparse/cli.py
 """
+FIXME:
+ - exit_on_error lol
+
 TODO:
  - default command
  - auto match all underscores to hyphens
@@ -3812,6 +3815,10 @@ def argparse_arg(*args, **kwargs) -> ArgparseArg:
     return ArgparseArg(args, kwargs)
 
 
+def argparse_arg_(*args, **kwargs) -> ta.Any:
+    return argparse_arg(*args, **kwargs)
+
+
 #
 
 

{omdev-0.0.0.dev235 → omdev-0.0.0.dev236}/omdev/tools/git/cli.py

@@ -1,44 +1,56 @@
+# ruff: noqa: UP006 UP007
 """
 TODO:
  - https://github.com/vegardit/bash-funk/blob/main/docs/git.md
 """
+import dataclasses as dc
 import os
 import re
-import subprocess
 import typing as ta
 import urllib.parse
 
+from omlish import cached
 from omlish import check
+from omlish import lang
 from omlish.argparse import all as ap
 from omlish.formats import json
+from omlish.formats import yaml
 from omlish.logs import all as logs
+from omlish.subprocesses.sync import subprocesses
 
 from ...git.status import GitStatusItem
 from ...git.status import get_git_status
+from ...home.paths import get_home_dir
 from .messages import GitMessageGenerator
 from .messages import TimestampGitMessageGenerator
 from .messages import load_message_generator_manifests
 from .messages import load_message_generator_manifests_map
 
 
+if ta.TYPE_CHECKING:
+    from omlish import marshal as msh
+else:
+    msh = lang.proxy_import('omlish.marshal')
+
+
 ##
 
 
 def rev_parse(rev: str) -> str:
-    return subprocess.check_output(['git', 'rev-parse', rev]).decode().strip()
+    return subprocesses.check_output('git', 'rev-parse', rev).decode().strip()
 
 
 def get_first_commit_of_day(rev: str) -> str | None:
-    commit_date = subprocess.check_output([
+    commit_date = subprocesses.check_output(
         'git', 'show', '-s', '--format=%ci', rev,
-    ]).decode().strip().split(' ')[0]
+    ).decode().strip().split(' ')[0]
 
-    first_commit = subprocess.check_output([
+    first_commit = subprocesses.check_output(
         'git', 'rev-list', '--reverse', '--max-parents=1',
         '--since', f'{commit_date} 00:00:00',
         '--until', f'{commit_date} 23:59:59',
         rev,
-    ]).decode().strip().splitlines()
+    ).decode().strip().splitlines()
 
     # Return the first commit (if there is any)
     if first_commit:
@@ -48,10 +60,41 @@ def get_first_commit_of_day(rev: str) -> str | None:
 
 
 class Cli(ap.Cli):
+    @dc.dataclass(frozen=True, kw_only=True)
+    class Config:
+        default_message_generator: str | None = None
+
+    _config_file_path_arg: ta.Optional[str] = ap.arg_('-c', '--config-file-path', nargs='?')
+
+    @cached.function
+    def config_file_path(self) -> str:
+        if (arg := self._config_file_path_arg) is not None:
+            return os.path.expanduser(arg)
+        else:
+            return os.path.join(get_home_dir(), 'tools', 'git.yml')
+
+    @cached.function
+    def load_config(self) -> Config:
+        try:
+            with open(self.config_file_path()) as f:
+                buf = f.read()
+        except FileNotFoundError:
+            return self.Config()
+
+        dct = yaml.safe_load(buf)
+        return msh.unmarshal(dct, self.Config)
+
+    @ap.cmd()
+    def print_cfg(self) -> None:
+        cfg = self.load_config()
+        print(yaml.dump(msh.marshal(cfg)))
+
+    #
+
     @ap.cmd()
     def blob_sizes(self) -> None:
         # https://stackoverflow.com/a/42544963
-        subprocess.check_call(  # noqa
+        subprocesses.check_call(  # noqa
             "git rev-list --objects --all | "
             "git cat-file --batch-check='%(objecttype) %(objectname) %(objectsize) %(rest)' | "
             "sed -n 's/^blob //p' | "
@@ -63,7 +106,7 @@ class Cli(ap.Cli):
 
     @ap.cmd()
     def commits_by_date(self) -> None:
-        subprocess.check_call(['git log --date=short --pretty=format:%ad | sort | uniq -c'], shell=True)  # noqa
+        subprocesses.check_call('git log --date=short --pretty=format:%ad | sort | uniq -c', shell=True)  # noqa
 
     #
 
@@ -86,14 +129,14 @@ class Cli(ap.Cli):
 
                 os.makedirs(user, 0o755, exist_ok=True)
 
-                subprocess.check_call([
+                subprocesses.check_call(
                     'git',
                     'clone',
                     *self.unknown_args,
                     *self.args.args,
                     f'git@github.com:{user}/{repo}.git',
                     os.path.join(user, repo),
-                ])
+                )
 
                 out_dir = os.path.join(user, repo)
 
@@ -101,13 +144,13 @@ class Cli(ap.Cli):
                 parsed = urllib.parse.urlparse(self.args.repo)
                 out_dir = parsed.path.split('/')[-1]
 
-                subprocess.check_call([
+                subprocesses.check_call(
                     'git',
                     'clone',
                     *self.unknown_args,
                     *self.args.args,
                     self.args.repo,
-                ])
+                )
 
         finally:
             print(out_dir)
@@ -128,7 +171,7 @@ class Cli(ap.Cli):
             os.execvp('git', ['git', 'diff', *(['--stat'] if self.args.stat else []), base_rev, rev])
 
         elif self.args.github or self.args.open:
-            rm_url = subprocess.check_output(['git', 'remote', 'get-url', 'origin']).decode('utf-8').strip()
+            rm_url = subprocesses.check_output('git', 'remote', 'get-url', 'origin').decode('utf-8').strip()
 
             if rm_url.startswith(git_pfx := 'git@github.com:'):
                 s = rm_url[len(git_pfx):]
@@ -144,7 +187,7 @@ class Cli(ap.Cli):
             gh_url = f'https://github.com/{user}/{repo}/compare/{base_rev}...{rev}#files_bucket'
 
             if self.args.open:
-                subprocess.check_call(['open', gh_url])
+                subprocesses.check_call('open', gh_url)
             else:
                 print(gh_url)
 
@@ -194,35 +237,47 @@ class Cli(ap.Cli):
         ap.arg('-g', '--message-generator', nargs='?'),
         ap.arg('--time-fmt', default=GitMessageGenerator.GenerateCommitMessageArgs.DEFAULT_TIME_FMT),
         ap.arg('--dry-run', action='store_true'),
+        ap.arg('-y', '--no-confirmation', action='store_true'),
         ap.arg('dir', nargs='*'),
         aliases=['acp'],
     )
     def add_commit_push(self) -> None:
         def run(cwd: str | None) -> None:
+            def check_call(*cmd: str) -> None:
+                if self.args.dry_run:
+                    print(cmd)
+                else:
+                    subprocesses.check_call(*cmd, cwd=cwd)
+
             st = get_git_status(cwd=cwd)
 
             if st.has_dirty:
-                if not self.args.dry_run:
-                    subprocess.check_call(['git', 'add', '.'], cwd=cwd)
+                check_call('git', 'add', '.')
 
             if st.has_staged or st.has_dirty:
                 if self.args.message is not None:
                     msg = self.args.message
+
                 else:
                     mg_cls: type[GitMessageGenerator] = TimestampGitMessageGenerator
-                    if (mg_name := self.args.message_generator) is not None:
-                        mg_cls = load_message_generator_manifests_map()[mg_name].get_cls()
+                    if (mg_name := self.args.message_generator) is None:
+                        mg_name = self.load_config().default_message_generator
+                    if mg_name is not None:
+                        mg_cls = load_message_generator_manifests_map()[mg_name].load_cls()
                     mg = mg_cls()
-                    msg = mg.generate_commit_message(GitMessageGenerator.GenerateCommitMessageArgs(
+
+                    mgr = mg.generate_commit_message(GitMessageGenerator.GenerateCommitMessageArgs(
                         cwd=cwd,
                         time_fmt=self.args.time_fmt,
                     ))
+                    if mgr.confirm and not self._args.no_confirmation:
+                        print(mgr.msg)
+                        input()
+                    msg = mgr.msg
 
-                if not self.args.dry_run:
-                    subprocess.check_call(['git', 'commit', '-m', msg], cwd=cwd)
+                check_call('git', 'commit', '-m', msg)
 
-            if not self.args.dry_run:
-                subprocess.check_call(['git', 'push'], cwd=cwd)
+            check_call('git', 'push')
 
         if not self.args.dir:
             run(None)
@@ -236,8 +291,8 @@ class Cli(ap.Cli):
     )
     def pull_submodule_update(self) -> None:
         def run(cwd: str | None) -> None:
-            subprocess.check_call(['git', 'pull'], cwd=cwd)
-            subprocess.check_call(['git', 'submodule', 'update'], cwd=cwd)
+            subprocesses.check_call('git', 'pull', cwd=cwd)
+            subprocesses.check_call('git', 'submodule', 'update', cwd=cwd)
 
         if not self.args.dir:
             run(None)

{omdev-0.0.0.dev235 → omdev-0.0.0.dev236}/omdev/tools/git/messages.py

@@ -1,6 +1,5 @@
 import abc
 import dataclasses as dc
-import importlib
 import os
 import typing as ta
 
@@ -8,6 +7,8 @@ from omlish import cached
 from omlish import check
 from omlish import lang
 from omlish.manifests import load as manifest_load
+from omlish.manifests.base import ModAttrManifest
+from omlish.manifests.base import NameAliasesManifest
 
 
 ##
@@ -21,8 +22,14 @@ class GitMessageGenerator(abc.ABC):
         DEFAULT_TIME_FMT: ta.ClassVar[str] = '%Y-%m-%dT%H:%M:%SZ'
         time_fmt: str = DEFAULT_TIME_FMT
 
+    @dc.dataclass(frozen=True, kw_only=True)
+    class GenerateCommitMessageResult:
+        msg: str
+
+        confirm: bool = False
+
     @abc.abstractmethod
-    def generate_commit_message(self, args: GenerateCommitMessageArgs) -> str:
+    def generate_commit_message(self, args: GenerateCommitMessageArgs) -> GenerateCommitMessageResult:
         raise NotImplementedError
 
 
@@ -30,15 +37,9 @@ class GitMessageGenerator(abc.ABC):
 
 
 @dc.dataclass(frozen=True, kw_only=True)
-class GitMessageGeneratorManifest:
-    mod_name: str
-    attr_name: str
-    name: str
-    aliases: ta.Collection[str] | None = None
-
-    def get_cls(self) -> type[GitMessageGenerator]:
-        mod = importlib.import_module(self.mod_name)
-        return check.issubclass(getattr(mod, self.attr_name), GitMessageGenerator)
+class GitMessageGeneratorManifest(NameAliasesManifest, ModAttrManifest):
+    def load_cls(self) -> type[GitMessageGenerator]:
+        return check.issubclass(self.load(), GitMessageGenerator)
 
 
 @cached.function
@@ -51,12 +52,7 @@ def load_message_generator_manifests() -> ta.Sequence[GitMessageGeneratorManifes
 
 @cached.function
 def load_message_generator_manifests_map() -> ta.Mapping[str, GitMessageGeneratorManifest]:
-    dct: dict[str, GitMessageGeneratorManifest] = {}
-    for m in load_message_generator_manifests():
-        for n in (m.name, *(m.aliases or ())):
-            check.not_in(n, dct)
-            dct[n] = m
-    return dct
+    return GitMessageGeneratorManifest.build_name_dict(load_message_generator_manifests())
 
 
 ##
@@ -64,8 +60,13 @@ def load_message_generator_manifests_map() -> ta.Mapping[str, GitMessageGenerato
 
 @dc.dataclass(frozen=True)
 class TimestampGitMessageGenerator(GitMessageGenerator):
-    def generate_commit_message(self, args: GitMessageGenerator.GenerateCommitMessageArgs) -> str:
-        return lang.utcnow().strftime(args.time_fmt)
+    def generate_commit_message(
+            self,
+            args: GitMessageGenerator.GenerateCommitMessageArgs,
+    ) -> GitMessageGenerator.GenerateCommitMessageResult:
+        return GitMessageGenerator.GenerateCommitMessageResult(
+            msg=lang.utcnow().strftime(args.time_fmt),
+        )
 
 
 #

{omdev-0.0.0.dev235 → omdev-0.0.0.dev236/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: omdev
-Version: 0.0.0.dev235
+Version: 0.0.0.dev236
 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.dev235
+Requires-Dist: omlish==0.0.0.dev236
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev235 → omdev-0.0.0.dev236}/omdev.egg-info/requires.txt

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

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