omdev 0.0.0.dev70__tar.gz → 0.0.0.dev72__tar.gz

{omdev-0.0.0.dev70/omdev.egg-info → omdev-0.0.0.dev72}/PKG-INFO

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

{omdev-0.0.0.dev70 → omdev-0.0.0.dev72}/omdev/.manifests.json

@@ -135,7 +135,7 @@
     "module": ".tools.gittools",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/gittools.py",
-    "line": 74,
+    "line": 124,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "git",
@@ -207,14 +207,14 @@
     }
   },
   {
-    "module": ".tools.rst",
+    "module": ".tools.rsttool",
     "attr": "_CLI_MODULE",
-    "file": "omdev/tools/rst.py",
-    "line": 45,
+    "file": "omdev/tools/rsttool.py",
+    "line": 55,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "rst",
-        "mod_name": "omdev.tools.rst"
+        "mod_name": "omdev.tools.rsttool"
       }
     }
   },

{omdev-0.0.0.dev70 → omdev-0.0.0.dev72}/omdev/tools/gittools.py

@@ -4,11 +4,35 @@ import subprocess
 import urllib.parse
 
 from omlish import argparse as ap
+from omlish import check
 from omlish import logs
 
 from ..cli import CliModule
 
 
+def rev_parse(rev: str) -> str:
+    return subprocess.check_output(['git', 'rev-parse', rev]).decode().strip()
+
+
+def get_first_commit_of_day(rev: str) -> str | None:
+    commit_date = subprocess.check_output([
+        'git', 'show', '-s', '--format=%ci', rev,
+    ]).decode().strip().split(' ')[0]
+
+    first_commit = subprocess.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()
+
+    # Return the first commit (if there is any)
+    if first_commit:
+        return first_commit[0]
+    else:
+        return None
+
+
 class Cli(ap.Cli):
     @ap.command()
     def blob_sizes(self) -> None:
@@ -70,6 +94,32 @@ class Cli(ap.Cli):
 
         print(out_dir)
 
+    @ap.command(
+        ap.arg('rev', nargs='?', default='HEAD'),
+        ap.arg('-d', '--diff', action='store_true'),
+        ap.arg('-s', '--diff-stat', action='store_true'),
+        ap.arg('-g', '--github', action='store_true'),
+    )
+    def recap(self) -> None:
+        rev = rev_parse(self.args.rev)
+        day_rev = check.not_none(get_first_commit_of_day(rev))
+        base_rev = rev_parse(f'{day_rev}~1')
+
+        if self.args.diff or self.args.diff_stat:
+            os.execvp('git', ['git', 'diff', *(['--stat'] if self.args.diff_stat else []), base_rev, rev])
+
+        elif self.args.github:
+            rm_url = subprocess.check_output(['git', 'remote', 'get-url', 'origin']).decode('utf-8').strip()
+            pu = urllib.parse.urlparse(rm_url)
+            check.equal(pu.scheme, 'https')
+            check.equal(pu.hostname, 'github.com')
+            _, user, repo, *_ = pu.path.split('/')
+            gh_url = f'https://github.com/{user}/{repo}/compare/{base_rev}...{rev}'
+            print(gh_url)
+
+        else:
+            print(base_rev)
+
 
 # @omlish-manifest
 _CLI_MODULE = CliModule('git', __name__)

omdev-0.0.0.dev70/omdev/tools/rst.py → omdev-0.0.0.dev72/omdev/tools/rsttool.py

@@ -1,10 +1,15 @@
-import argparse
+"""
+TODO:
+ - omdev/rst.py *and* rsttool.py, when we want extracted helpers
+"""
 import contextlib
 import io
 import sys
 
 import docutils.core
 
+from omlish import argparse as ap
+
 from ..cli import CliModule
 
 
@@ -25,21 +30,26 @@ def rst2html(rst, report_level=None):
         return html, warning
 
 
-def _main() -> None:
-    parser = argparse.ArgumentParser()
-    parser.add_argument('input', nargs='?')
-    args = parser.parse_args()
+class Cli(ap.Cli):
+    @ap.command(
+        ap.arg('input-file', nargs='?'),
+        ap.arg('--report-level', type=int),
+    )
+    def html(self) -> None:
+        if self.args.input_file is not None:
+            with open(self.args.input_file) as f:
+                src = f.read()
+        else:
+            src = sys.stdin.read()
 
-    if args.input:
-        with open(args.input) as f:
-            src = f.read()
-    else:
-        src = sys.stdin.read()
+        html, warning = rst2html(
+            src,
+            report_level=self.args.report_level,
+        )
 
-    html, warning = rst2html(src)
-    if warning:
-        sys.stderr.write(warning)
-    print(html)
+        if warning:
+            sys.stderr.write(warning)
+        print(html)
 
 
 # @omlish-manifest
@@ -47,4 +57,4 @@ _CLI_MODULE = CliModule('rst', __name__)
 
 
 if __name__ == '__main__':
-    _main()
+    Cli().call_and_exit()

{omdev-0.0.0.dev70 → omdev-0.0.0.dev72/omdev.egg-info}/PKG-INFO

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

{omdev-0.0.0.dev70 → omdev-0.0.0.dev72}/omdev.egg-info/SOURCES.txt

@@ -128,5 +128,5 @@ omdev/tools/mkrelimp.py
 omdev/tools/nbtools.py
 omdev/tools/piptools.py
 omdev/tools/proftools.py
-omdev/tools/rst.py
+omdev/tools/rsttool.py
 omdev/tools/sqlrepl.py

{omdev-0.0.0.dev70 → omdev-0.0.0.dev72}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev70
+omlish==0.0.0.dev72
 
 [all]
 black~=24.10

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