omdev 0.0.0.dev233__py3-none-any.whl → 0.0.0.dev235__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": 74,
     "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/{revisions.py → 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/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/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/tools/git/cli.py

@@ -15,8 +15,10 @@ from omlish.logs import all as logs
 
 from ...git.status import GitStatusItem
 from ...git.status import get_git_status
+from .messages import GitMessageGenerator
 from .messages import TimestampGitMessageGenerator
 from .messages import load_message_generator_manifests
+from .messages import load_message_generator_manifests_map
 
 
 ##
@@ -189,7 +191,9 @@ 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('dir', nargs='*'),
         aliases=['acp'],
     )
@@ -198,16 +202,27 @@ class Cli(ap.Cli):
             st = get_git_status(cwd=cwd)
 
             if st.has_dirty:
-                subprocess.check_call(['git', 'add', '.'], cwd=cwd)
+                if not self.args.dry_run:
+                    subprocess.check_call(['git', 'add', '.'], cwd=cwd)
 
             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)
+                    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()
+                    mg = mg_cls()
+                    msg = mg.generate_commit_message(GitMessageGenerator.GenerateCommitMessageArgs(
+                        cwd=cwd,
+                        time_fmt=self.args.time_fmt,
+                    ))
+
+                if not self.args.dry_run:
+                    subprocess.check_call(['git', 'commit', '-m', msg], cwd=cwd)
+
+            if not self.args.dry_run:
+                subprocess.check_call(['git', 'push'], cwd=cwd)
 
         if not self.args.dir:
             run(None)

omdev/tools/git/messages.py

@@ -1,9 +1,11 @@
 import abc
 import dataclasses as dc
+import importlib
 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
 
@@ -12,8 +14,15 @@ from omlish.manifests import load as manifest_load
 
 
 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
+
     @abc.abstractmethod
-    def generate_commit_message(self) -> str:
+    def generate_commit_message(self, args: GenerateCommitMessageArgs) -> str:
         raise NotImplementedError
 
 
@@ -27,6 +36,10 @@ class GitMessageGeneratorManifest:
     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)
+
 
 @cached.function
 def load_message_generator_manifests() -> ta.Sequence[GitMessageGeneratorManifest]:
@@ -36,16 +49,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]:
+    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
+
+
 ##
 
 
 @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) -> str:
+        return lang.utcnow().strftime(args.time_fmt)
 
 
 #

{omdev-0.0.0.dev233.dist-info → omdev-0.0.0.dev235.dist-info}/METADATA

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

{omdev-0.0.0.dev233.dist-info → omdev-0.0.0.dev235.dist-info}/RECORD

@@ -1,15 +1,13 @@
-omdev/.manifests.json,sha256=-gFNSfj9LiUN5Wg47Jr9VVSd-Mhmhy8KMHhjmd_9RO0,9545
+omdev/.manifests.json,sha256=qFKYwGJnQZsXpEFKYvzoSqimpWMnZkwwlJKlRDyPC-8,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
-omdev/revisions.py,sha256=0feRWC0Uttd6K9cCImAHEXoo6-Nuso3tpaHUuhzBlRQ,4985
 omdev/tagstrings.py,sha256=zIP7nzcsZf5te0lphu6k36ND_cOvNFRg00neoTcoCs8,5484
-omdev/wheelfile.py,sha256=yfupGcGkbFlmzGzKU64k_vmOKpaKnUlDWxeGn2KdekU,10005
 omdev/amalg/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/amalg/__main__.py,sha256=1sZH8SLAueWxMxK9ngvndUW3L_rw7f-s_jK3ZP1yAH8,170
 omdev/amalg/gen.py,sha256=GPHXtsywa0Pb4v5pN2icMCW30bRt-yF3uKUxvBLQh1Y,6069
@@ -178,8 +176,10 @@ omdev/packaging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/packaging/marshal.py,sha256=c4Mdy5-s4O51eEKMWWBwkhTGQ1FoxVI2lD6CxI_cF3k,2379
 omdev/packaging/names.py,sha256=-a7AykFPVR1i6EYJepbe3ABRrZQ_tPPmK5olzbn9HLI,2528
 omdev/packaging/requires.py,sha256=7xyGLX9wk_sb9KI0U7Wcajhn8rJpTjzY3QQmUJoMgcg,15680
+omdev/packaging/revisions.py,sha256=3u-6vY0mq01tgRENcncozsMLXSgtaQWXuQp0kRkEHvg,4986
 omdev/packaging/specifiers.py,sha256=X8xOcwRLXTQYx5mYAS3ijqoTLlCtYESyUu4fX9bvblY,17447
 omdev/packaging/versions.py,sha256=K4eUOUvLmYcR4aeUywekeWTBqAvZchrIxLf7dl07MS4,12261
+omdev/packaging/wheelfile.py,sha256=yfupGcGkbFlmzGzKU64k_vmOKpaKnUlDWxeGn2KdekU,10005
 omdev/precheck/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/precheck/__main__.py,sha256=UEuS4z5-heIrwTtB-ONe1KeXJdqj8tYXMqWMpuO10so,165
 omdev/precheck/base.py,sha256=a_lGoFM-QhL8u8XDUYFhb-feEyfPbP4j8lcmNO51sHY,732
@@ -200,7 +200,7 @@ omdev/pyproject/cexts.py,sha256=x13piOOnNrYbA17qZLDVuR0p1sqhgEwpk4FtImX-klM,4281
 omdev/pyproject/cli.py,sha256=Jp3OTevYndvtid2fr-Q7rWza29GnLexotmf19JJcX-o,8743
 omdev/pyproject/configs.py,sha256=HEo90bPUAo6CBnBHZFDYohlwiRD-4cxZCYR6oXv-5lQ,2802
 omdev/pyproject/inject.py,sha256=PgZnfWGoqjHsaHLUEPJaQW_66h1LRuSm8Njl--KDzOw,314
-omdev/pyproject/pkg.py,sha256=bPQQIfxfSkAEmENMBwJzWCLrywMUbeVmbwjP-NHxOf4,14570
+omdev/pyproject/pkg.py,sha256=NcyHxTYFKJ3TGod-ewKUWZVp_dYb2EXjbf9gkKJCN38,14580
 omdev/pyproject/reqs.py,sha256=8feZ71YnGzwKbLK4zO28CDQeNcZIIuq6cnkBhs6M-7E,2406
 omdev/pyproject/venvs.py,sha256=GUurjC7qzGlFL-su4C0YPO_pxbwDAyl1CqyLOB3WLCA,1911
 omdev/pyproject/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -213,7 +213,7 @@ 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=BxsTCENusscEFdRa5DaXwe7TA5-76_F3qvSiPODo4u8,258092
+omdev/scripts/pyproject.py,sha256=aMmQuIMRxULdnDmecIGiSBgDtfnzpSSNILXRjYJbRkI,258112
 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=jXEnMpw1WZpICwyhktQElkUuEpVhju3twN_CafYs2Ws,8516
+omdev/tools/git/messages.py,sha256=D3u6DApTjWT9q329VRpCl7mvams-xYWjVvQI0amTnQE,2070
 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.dev233.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev233.dist-info/METADATA,sha256=6zcFwHMj4lJLXVZN67ExkhjSsNb1SrxwP51TBb9Lt60,1636
-omdev-0.0.0.dev233.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-omdev-0.0.0.dev233.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev233.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev233.dist-info/RECORD,,
+omdev-0.0.0.dev235.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev235.dist-info/METADATA,sha256=j2CxaL7vG7m9JHXYNaUZJVux695Lq1bJ6MMMtNXsQJk,1636
+omdev-0.0.0.dev235.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+omdev-0.0.0.dev235.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev235.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev235.dist-info/RECORD,,