omdev 0.0.0.dev234__py3-none-any.whl → 0.0.0.dev236__py3-none-any.whl

omdev/.manifests.json

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

omdev/cmake.py

@@ -45,7 +45,6 @@ class Target(abc.ABC):
 
 @dc.dataclass(frozen=True)
 class Library(Target):
-
     @property
     def command_name(self) -> str:
         return 'add_library'
@@ -53,7 +52,6 @@ class Library(Target):
 
 @dc.dataclass(frozen=True)
 class StaticLibrary(Library):
-
     @property
     def command_extra(self) -> ta.Sequence[str]:
         return ['STATIC']
@@ -61,7 +59,6 @@ class StaticLibrary(Library):
 
 @dc.dataclass(frozen=True)
 class ModuleLibrary(Library):
-
     @property
     def command_extra(self) -> ta.Sequence[str]:
         return ['MODULE']
@@ -69,14 +66,12 @@ class ModuleLibrary(Library):
 
 @dc.dataclass(frozen=True)
 class Executable(Target):
-
     @property
     def command_name(self) -> str:
         return 'add_executable'
 
 
 class CmakeGen:
-
     def __init__(
             self,
             out: ta.TextIO,

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/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/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/tools/git/cli.py

@@ -1,42 +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:
@@ -46,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' | "
@@ -61,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
 
     #
 
@@ -84,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)
 
@@ -99,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)
@@ -126,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):]
@@ -142,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)
 
@@ -189,25 +234,50 @@ class Cli(ap.Cli):
 
     @ap.cmd(
         ap.arg('-m', '--message', nargs='?'),
-        ap.arg('--time-fmt', default=TimestampGitMessageGenerator.DEFAULT_TIME_FMT),
+        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:
-                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:
-                    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)
+                else:
+                    mg_cls: type[GitMessageGenerator] = TimestampGitMessageGenerator
+                    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()
+
+                    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
+
+                check_call('git', 'commit', '-m', msg)
+
+            check_call('git', 'push')
 
         if not self.args.dir:
             run(None)
@@ -221,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/tools/git/messages.py

@@ -4,16 +4,32 @@ import os
 import typing as ta
 
 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
 
 
 ##
 
 
 class GitMessageGenerator(abc.ABC):
+    @dc.dataclass(frozen=True, kw_only=True)
+    class GenerateCommitMessageArgs:
+        cwd: str | None = None
+
+        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) -> str:
+    def generate_commit_message(self, args: GenerateCommitMessageArgs) -> GenerateCommitMessageResult:
         raise NotImplementedError
 
 
@@ -21,11 +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
+class GitMessageGeneratorManifest(NameAliasesManifest, ModAttrManifest):
+    def load_cls(self) -> type[GitMessageGenerator]:
+        return check.issubclass(self.load(), GitMessageGenerator)
 
 
 @cached.function
@@ -36,16 +50,23 @@ def load_message_generator_manifests() -> ta.Sequence[GitMessageGeneratorManifes
     return [mf.value for mf in mfs]
 
 
+@cached.function
+def load_message_generator_manifests_map() -> ta.Mapping[str, GitMessageGeneratorManifest]:
+    return GitMessageGeneratorManifest.build_name_dict(load_message_generator_manifests())
+
+
 ##
 
 
 @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)
+    def generate_commit_message(
+            self,
+            args: GitMessageGenerator.GenerateCommitMessageArgs,
+    ) -> GitMessageGenerator.GenerateCommitMessageResult:
+        return GitMessageGenerator.GenerateCommitMessageResult(
+            msg=lang.utcnow().strftime(args.time_fmt),
+        )
 
 
 #

{omdev-0.0.0.dev234.dist-info → omdev-0.0.0.dev236.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: omdev
-Version: 0.0.0.dev234
+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.dev234
+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.dev234.dist-info → omdev-0.0.0.dev236.dist-info}/RECORD

@@ -1,9 +1,9 @@
-omdev/.manifests.json,sha256=-gFNSfj9LiUN5Wg47Jr9VVSd-Mhmhy8KMHhjmd_9RO0,9545
+omdev/.manifests.json,sha256=kbXBVJQiDXr0p1RGZBjb3sJhl8kgPdRjz8tbbn-_i2k,9545
 omdev/__about__.py,sha256=Iect_SBD2EXgx7QcFGiOqTHkOWD-bWOyvzgReDOY4Es,1214
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/bracepy.py,sha256=I8EdqtDvxzAi3I8TuMEW-RBfwXfqKbwp06CfOdj3L1o,2743
 omdev/classdot.py,sha256=YOvgy6x295I_8NKBbBlRVd3AN7Osirm_Lqt4Wj0j9rY,1631
-omdev/cmake.py,sha256=Diy2ry65806dQP125DAstD3w46z_wszMH7PwC2-6iik,4578
+omdev/cmake.py,sha256=oBAp1K8h-iCDd9uCn-OpNpZ6n36oYFkWLIiTyQw4irU,4573
 omdev/findimports.py,sha256=2t8QP852saEEJFeXySEzhi_nxRSxghlkXz2jVdvy08M,2392
 omdev/imgur.py,sha256=Uyz8nkORlhfXXK5Sty16tX8ro8s-b7LrxjOECv4_sB0,3005
 omdev/pip.py,sha256=7cZ_IOpekQvgPm_gKnX3Pr8xjqUid50PPScTlZCYVlM,2118
@@ -208,12 +208,12 @@ omdev/pyproject/resources/docker-dev.sh,sha256=DHkz5D18jok_oDolfg2mqrvGRWFoCe9GQ
 omdev/pyproject/resources/python.sh,sha256=rFaN4SiJ9hdLDXXsDTwugI6zsw6EPkgYMmtacZeTbvw,749
 omdev/scripts/__init__.py,sha256=MKCvUAEQwsIvwLixwtPlpBqmkMXLCnjjXyAXvVpDwVk,91
 omdev/scripts/bumpversion.py,sha256=Kn7fo73Hs8uJh3Hi3EIyLOlzLPWAC6dwuD_lZ3cIzuY,1064
-omdev/scripts/ci.py,sha256=lyiGw7uIqs3e3Dac0xDB46m_albQZlYQR-i2iCXv_FA,162362
+omdev/scripts/ci.py,sha256=BdITcdZfxdqPGOcITwDkhNnjeORKgzW5UaTj5aSauc4,162480
 omdev/scripts/execrss.py,sha256=mR0G0wERBYtQmVIn63lCIIFb5zkCM6X_XOENDFYDBKc,651
 omdev/scripts/exectime.py,sha256=S2O4MgtzTsFOY2IUJxsrnOIame9tEFc6aOlKP-F1JSg,1541
 omdev/scripts/importtrace.py,sha256=oa7CtcWJVMNDbyIEiRHej6ICfABfErMeo4_haIqe18Q,14041
-omdev/scripts/interp.py,sha256=tBIiJAd5OLBhvhuH_Lj7uFGWreJQjHSVr-2MgqTGYPo,150419
-omdev/scripts/pyproject.py,sha256=aMmQuIMRxULdnDmecIGiSBgDtfnzpSSNILXRjYJbRkI,258112
+omdev/scripts/interp.py,sha256=H_WWqQ6ULe5cc976Q_9h2rhNTiKB0vg5PYJGBXWnfFY,150537
+omdev/scripts/pyproject.py,sha256=6g3NmQfUaxtLhEizAEyewmuhjlEyQht_u9QTIkWMeJs,258230
 omdev/scripts/slowcat.py,sha256=lssv4yrgJHiWfOiHkUut2p8E8Tq32zB-ujXESQxFFHY,2728
 omdev/scripts/tmpexec.py,sha256=WTYcf56Tj2qjYV14AWmV8SfT0u6Y8eIU6cKgQRvEK3c,1442
 omdev/tokens/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -235,8 +235,8 @@ omdev/tools/qr.py,sha256=tm68lPwEAkEwIL2sUKPKBYfwwPtjVWG1DBZwur8_jY8,1737
 omdev/tools/sqlrepl.py,sha256=wAjrfXNrRV63-NJCC2HlGQnFh7lUH0bHMnOjYotQqFs,5753
 omdev/tools/git/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/git/__main__.py,sha256=gI87SBUgTkKUcUM-RtZWnei-UUDDqzbr5aPztb-gvbE,168
-omdev/tools/git/cli.py,sha256=0MwnDO4V-i3jvtCd9W0VR9LJjicY2_WoKq47_UhqNAA,7762
-omdev/tools/git/messages.py,sha256=gcXjzBUFOcL8Kia5x-t8jyN-aBLcHVhnfJX-lxXiQ3I,1299
+omdev/tools/git/cli.py,sha256=9D9sKnm--2T_XEoMUWZXAzPBMtlKJk7qGCLt0Avl34Y,10088
+omdev/tools/git/messages.py,sha256=zFKw4gMBU2vpTqs0CkwUVyZIdCQ_j0ZPUJTZrp2llqc,2207
 omdev/tools/json/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/json/__main__.py,sha256=wqpkN_NsQyNwKW4qjVj8ADJ4_C98KhrFBtE-Z1UamfU,168
 omdev/tools/json/cli.py,sha256=EubIMT-n2XsjWBZjSy2fWXqijlwrIhLsfbkg3SZzi28,9586
@@ -248,9 +248,9 @@ omdev/tools/json/rendering.py,sha256=tMcjOW5edfozcMSTxxvF7WVTsbYLoe9bCKFh50qyaGw
 omdev/tools/pawk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/pawk/__main__.py,sha256=VCqeRVnqT1RPEoIrqHFSu4PXVMg4YEgF4qCQm90-eRI,66
 omdev/tools/pawk/pawk.py,sha256=zsEkfQX0jF5bn712uqPAyBSdJt2dno1LH2oeSMNfXQI,11424
-omdev-0.0.0.dev234.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev234.dist-info/METADATA,sha256=jYQg7Y-n7e6R8dy6ffJ5pVsrT0WIAPcyc4mUyHtpiEs,1636
-omdev-0.0.0.dev234.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-omdev-0.0.0.dev234.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev234.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev234.dist-info/RECORD,,
+omdev-0.0.0.dev236.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev236.dist-info/METADATA,sha256=UuDRY3-O9mz5L5kSV5UCK8csUNCLJF9-jO-CZhFeWX0,1636
+omdev-0.0.0.dev236.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+omdev-0.0.0.dev236.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev236.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev236.dist-info/RECORD,,