omdev 0.0.0.dev236__tar.gz → 0.0.0.dev237__tar.gz

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

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

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

@@ -291,7 +291,7 @@
     "module": ".tools.git.messages",
     "attr": "_TIMESTAMP_GIT_MESSAGE_GENERATOR_MANIFEST",
     "file": "omdev/tools/git/messages.py",
-    "line": 75,
+    "line": 77,
     "value": {
       "$.tools.git.messages.GitMessageGeneratorManifest": {
         "mod_name": "omdev.tools.git.messages",
@@ -431,6 +431,18 @@
       }
     }
   },
+  {
+    "module": ".tools.shadow",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/tools/shadow.py",
+    "line": 63,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "shadow",
+        "mod_name": "omdev.tools.shadow"
+      }
+    }
+  },
   {
     "module": ".tools.sqlrepl",
     "attr": "_CLI_MODULE",

omdev-0.0.0.dev237/omdev/home/configs.py

@@ -0,0 +1,13 @@
+import os.path
+
+from omlish.configs.shadow import MangledFilesShadowConfigs
+from omlish.configs.shadow import ShadowConfigs
+
+from .paths import get_home_dir
+
+
+def get_shadow_configs() -> ShadowConfigs:
+    return MangledFilesShadowConfigs(
+        os.path.join(get_home_dir(), 'shadow'),
+        create=True,
+    )

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

@@ -13,6 +13,7 @@ from omlish import cached
 from omlish import check
 from omlish import lang
 from omlish.argparse import all as ap
+from omlish.configs.processing.merging import merge_configs
 from omlish.formats import json
 from omlish.formats import yaml
 from omlish.logs import all as logs
@@ -20,7 +21,9 @@ from omlish.subprocesses.sync import subprocesses
 
 from ...git.status import GitStatusItem
 from ...git.status import get_git_status
+from ...home.configs import get_shadow_configs
 from ...home.paths import get_home_dir
+from . import consts
 from .messages import GitMessageGenerator
 from .messages import TimestampGitMessageGenerator
 from .messages import load_message_generator_manifests
@@ -74,23 +77,42 @@ class Cli(ap.Cli):
             return os.path.join(get_home_dir(), 'tools', 'git.yml')
 
     @cached.function
-    def load_config(self) -> Config:
+    def load_home_config_content(self) -> ta.Any:
         try:
             with open(self.config_file_path()) as f:
                 buf = f.read()
         except FileNotFoundError:
             return self.Config()
 
-        dct = yaml.safe_load(buf)
+        return yaml.safe_load(buf) or {}
+
+    class _NOT_SET(lang.Marker):  # noqa
+        pass
+
+    def load_config(self, path: str | type[_NOT_SET] | None = _NOT_SET) -> Config:
+        dct = self.load_home_config_content() or {}
+
+        if path is not self._NOT_SET:
+            if path is None:
+                path = os.getcwd()
+            shadow_cfg = get_shadow_configs().get_shadow_config(check.isinstance(path, str)) or {}
+            dct = merge_configs(dct, shadow_cfg.get('git', {}))
+
         return msh.unmarshal(dct, self.Config)
 
-    @ap.cmd()
+    @ap.cmd(
+        ap.arg('dir', nargs='?'),
+    )
     def print_cfg(self) -> None:
-        cfg = self.load_config()
+        cfg = self.load_config(self._args.dir)
         print(yaml.dump(msh.marshal(cfg)))
 
     #
 
+    _time_fmt: str = ap.arg_('--time-fmt', default=consts.DEFAULT_TIME_FMT)
+
+    # Commands
+
     @ap.cmd()
     def blob_sizes(self) -> None:
         # https://stackoverflow.com/a/42544963
@@ -232,10 +254,40 @@ class Cli(ap.Cli):
 
     # Lazy helpers
 
+    @ap.cmd(
+        ap.arg('-g', '--message-generator', nargs='?'),
+        ap.arg('dir', nargs='*'),
+        aliases=['gcm'],
+    )
+    def generate_commit_message(self) -> None:
+        def run(cwd: str | None) -> None:
+            st = get_git_status(cwd=cwd)
+
+            if not (st.has_staged or st.has_dirty):
+                return
+
+            mg_cls: type[GitMessageGenerator] = TimestampGitMessageGenerator
+            if (mg_name := self.args.message_generator) is None:
+                mg_name = self.load_config(cwd).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._time_fmt,
+            ))
+            print(mgr.msg)
+
+        if not self.args.dir:
+            run(None)
+        else:
+            for d in self.args.dir:
+                run(d)
+
     @ap.cmd(
         ap.arg('-m', '--message', nargs='?'),
         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='*'),
@@ -261,14 +313,14 @@ class Cli(ap.Cli):
                 else:
                     mg_cls: type[GitMessageGenerator] = TimestampGitMessageGenerator
                     if (mg_name := self.args.message_generator) is None:
-                        mg_name = self.load_config().default_message_generator
+                        mg_name = self.load_config(cwd).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,
+                        time_fmt=self._time_fmt,
                     ))
                     if mgr.confirm and not self._args.no_confirmation:
                         print(mgr.msg)

omdev-0.0.0.dev237/omdev/tools/git/consts.py

@@ -0,0 +1 @@
+DEFAULT_TIME_FMT = '%Y-%m-%dT%H:%M:%SZ'

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

@@ -10,6 +10,8 @@ from omlish.manifests import load as manifest_load
 from omlish.manifests.base import ModAttrManifest
 from omlish.manifests.base import NameAliasesManifest
 
+from . import consts
+
 
 ##
 
@@ -19,7 +21,7 @@ class GitMessageGenerator(abc.ABC):
     class GenerateCommitMessageArgs:
         cwd: str | None = None
 
-        DEFAULT_TIME_FMT: ta.ClassVar[str] = '%Y-%m-%dT%H:%M:%SZ'
+        DEFAULT_TIME_FMT: ta.ClassVar[str] = consts.DEFAULT_TIME_FMT
         time_fmt: str = DEFAULT_TIME_FMT
 
     @dc.dataclass(frozen=True, kw_only=True)

omdev-0.0.0.dev237/omdev/tools/shadow.py

@@ -0,0 +1,72 @@
+"""
+TODO:
+ - 'edit', default cwd - use git's
+ - delete?
+ - 'purge'?
+ - 'validate' - at least formats
+"""
+import os.path
+import shutil
+
+from omlish import check
+from omlish.argparse import all as ap
+from omlish.configs.shadow import FileShadowConfigs
+
+from ..cli.types import CliModule
+from ..home.configs import get_shadow_configs
+
+
+##
+
+
+class ShadowCli(ap.Cli):
+    def _get_shadow_file(self, path: str | None = None) -> str:
+        if (path := self._args.path) is None:
+            path = os.getcwd()
+        file_scs = check.isinstance(get_shadow_configs(), FileShadowConfigs)
+        shd_file = file_scs.get_shadow_config_file_path(path)
+        return shd_file
+
+    #
+
+    @ap.cmd(
+        ap.arg('path', nargs='?'),
+    )
+    def edit(self) -> None:
+        shd_file = self._get_shadow_file(self._args.path)
+        os.makedirs(os.path.dirname(shd_file), exist_ok=True)
+        os.execl(check.not_none(shutil.which('vim')), 'vim', shd_file)
+
+    @ap.cmd(
+        ap.arg('path', nargs='?'),
+    )
+    def show(self) -> None:
+        shd_file = self._get_shadow_file(self._args.path)
+        try:
+            with open(shd_file) as f:
+                buf = f.read()
+        except FileNotFoundError:
+            return
+        print(buf)
+
+    @ap.cmd(
+        ap.arg('path', nargs='?'),
+    )
+    def which(self) -> None:
+        shd_file = self._get_shadow_file(self._args.path)
+        print(shd_file)
+
+
+##
+
+
+# @omlish-manifest
+_CLI_MODULE = CliModule('shadow', __name__)
+
+
+def _main() -> None:
+    ShadowCli().cli_run_and_exit()
+
+
+if __name__ == '__main__':
+    _main()

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

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

{omdev-0.0.0.dev236 → omdev-0.0.0.dev237}/omdev.egg-info/SOURCES.txt

@@ -129,6 +129,7 @@ omdev/git/revisions.py
 omdev/git/shallow.py
 omdev/git/status.py
 omdev/home/__init__.py
+omdev/home/configs.py
 omdev/home/paths.py
 omdev/home/secrets.py
 omdev/interp/__init__.py
@@ -242,10 +243,12 @@ omdev/tools/notebook.py
 omdev/tools/pip.py
 omdev/tools/prof.py
 omdev/tools/qr.py
+omdev/tools/shadow.py
 omdev/tools/sqlrepl.py
 omdev/tools/git/__init__.py
 omdev/tools/git/__main__.py
 omdev/tools/git/cli.py
+omdev/tools/git/consts.py
 omdev/tools/git/messages.py
 omdev/tools/json/__init__.py
 omdev/tools/json/__main__.py

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

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

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