omdev 0.0.0.dev233__tar.gz → 0.0.0.dev235__tar.gz

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

@@ -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 → omdev-0.0.0.dev235}/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-0.0.0.dev233 → omdev-0.0.0.dev235}/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-0.0.0.dev233/omdev → omdev-0.0.0.dev235/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.dev233 → omdev-0.0.0.dev235}/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.dev233 → omdev-0.0.0.dev235}/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.dev233 → omdev-0.0.0.dev235}/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-0.0.0.dev233 → omdev-0.0.0.dev235}/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 → omdev-0.0.0.dev235/omdev.egg-info}/PKG-INFO

@@ -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 → omdev-0.0.0.dev235}/omdev.egg-info/SOURCES.txt

@@ -11,9 +11,7 @@ omdev/cmake.py
 omdev/findimports.py
 omdev/imgur.py
 omdev/pip.py
-omdev/revisions.py
 omdev/tagstrings.py
-omdev/wheelfile.py
 omdev.egg-info/PKG-INFO
 omdev.egg-info/SOURCES.txt
 omdev.egg-info/dependency_links.txt
@@ -188,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

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

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

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