omdev 0.0.0.dev69__py3-none-any.whl → 0.0.0.dev71__py3-none-any.whl

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",
@@ -194,6 +194,30 @@
       }
     }
   },
+  {
+    "module": ".tools.proftools",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/tools/proftools.py",
+    "line": 50,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "prof",
+        "mod_name": "omdev.tools.proftools"
+      }
+    }
+  },
+  {
+    "module": ".tools.rsttool",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/tools/rsttool.py",
+    "line": 55,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "rst",
+        "mod_name": "omdev.tools.rsttool"
+      }
+    }
+  },
   {
     "module": ".tools.sqlrepl",
     "attr": "_CLI_MODULE",

omdev/__about__.py

@@ -30,6 +30,10 @@ class Project(ProjectBase):
             'mypy ~= 1.11',
         ],
 
+        'prof': [
+            'gprof2dot ~= 2024.6',
+        ],
+
         'tokens': [
             'tokenize_rt ~= 6.0',
         ],

omdev/cli/managers.py

@@ -50,5 +50,5 @@ def setup_install_manager(cli_pkg: str) -> None:
     if detect_install_manager(cli_pkg) is None:
         return
 
-    from .pathhack import _install_pth_file
+    from ._pathhack import _install_pth_file
     _install_pth_file()

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

@@ -1,4 +1,55 @@
-"""
-TODO:
- - rm prof.pstats.pdf ; ./python -m gprof2dot -f pstats prof.pstats | dot -Tpdf -o prof.pstats.pdf && open prof.pstats.pdf
-"""  # noqa
+import os.path
+import subprocess
+import sys
+import tempfile
+
+from omlish import argparse as ap
+
+from ..cli import CliModule
+
+
+class Cli(ap.Cli):
+    @ap.command(
+        ap.arg('file'),
+        ap.arg('out-file', nargs='?'),
+        ap.arg('-w', '--write', action='store_true'),
+        ap.arg('-o', '--overwrite', action='store_true'),
+        ap.arg('-O', '--open', action='store_true'),
+    )
+    def pstats_pdf(self) -> None:
+        out_file = self.args.out_file
+        if out_file is None and self.args.write:
+            out_file = self.args.file + '.pdf'
+
+        if out_file is not None:
+            if os.path.exists(out_file) and not self.args.overwrite:
+                raise OSError(f'File exists: {out_file}')
+        else:
+            out_file = tempfile.mktemp(suffix=os.path.basename(self.args.file) + '.pdf')  # noqa
+
+        dot = subprocess.check_output([
+            sys.executable,
+            '-m', 'gprof2dot',
+            '-f', 'pstats',
+            self.args.file,
+        ])
+
+        pdf = subprocess.check_output(
+            ['dot', '-Tpdf'],
+            input=dot,
+        )
+
+        with open(out_file, 'wb') as f:
+            f.write(pdf)
+        print(out_file)
+
+        if self.args.open:
+            subprocess.check_call(['open', out_file])
+
+
+# @omlish-manifest
+_CLI_MODULE = CliModule('prof', __name__)
+
+
+if __name__ == '__main__':
+    Cli()()

omdev/tools/rsttool.py

@@ -0,0 +1,60 @@
+"""
+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
+
+
+def rst2html(rst, report_level=None):
+    kwargs = {
+        'writer_name': 'html',
+        'settings_overrides': {
+            '_disable_config': True,
+            'report_level': int(report_level) if report_level else 0,
+        },
+    }
+
+    target = io.StringIO()
+    with contextlib.redirect_stderr(target):
+        parts = docutils.core.publish_parts(rst, **kwargs)  # type: ignore
+        html = parts['html_body']
+        warning = target.getvalue().strip()
+        return html, warning
+
+
+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()
+
+        html, warning = rst2html(
+            src,
+            report_level=self.args.report_level,
+        )
+
+        if warning:
+            sys.stderr.write(warning)
+        print(html)
+
+
+# @omlish-manifest
+_CLI_MODULE = CliModule('rst', __name__)
+
+
+if __name__ == '__main__':
+    Cli().call_and_exit()

{omdev-0.0.0.dev69.dist-info → omdev-0.0.0.dev71.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev69
+Version: 0.0.0.dev71
 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.dev69
+Requires-Dist: omlish ==0.0.0.dev71
 Provides-Extra: all
 Requires-Dist: black ~=24.10 ; extra == 'all'
 Requires-Dist: pycparser ~=2.22 ; extra == 'all'
@@ -20,6 +20,7 @@ Requires-Dist: cffi ~=1.17 ; extra == 'all'
 Requires-Dist: pcpp ~=1.30 ; extra == 'all'
 Requires-Dist: docutils ~=0.21 ; extra == 'all'
 Requires-Dist: mypy ~=1.11 ; extra == 'all'
+Requires-Dist: gprof2dot ~=2024.6 ; extra == 'all'
 Requires-Dist: tokenize-rt ~=6.0 ; extra == 'all'
 Requires-Dist: wheel ~=0.44 ; extra == 'all'
 Provides-Extra: black
@@ -32,6 +33,8 @@ Provides-Extra: docutils
 Requires-Dist: docutils ~=0.21 ; extra == 'docutils'
 Provides-Extra: mypy
 Requires-Dist: mypy ~=1.11 ; extra == 'mypy'
+Provides-Extra: prof
+Requires-Dist: gprof2dot ~=2024.6 ; extra == 'prof'
 Provides-Extra: tokens
 Requires-Dist: tokenize-rt ~=6.0 ; extra == 'tokens'
 Provides-Extra: wheel

{omdev-0.0.0.dev69.dist-info → omdev-0.0.0.dev71.dist-info}/RECORD

@@ -1,5 +1,5 @@
-omdev/.manifests.json,sha256=uO7iZexM0Maf0zfoaBOG0fia5BzUfRQ3Ji9A4CSmd08,4477
-omdev/__about__.py,sha256=2mFs3ycC0n2aFJRsyL2yt4CVslLnIMTEYwXmubo7EeM,1066
+omdev/.manifests.json,sha256=nQzpxNEwzKDGCbPlKZ9WGPy-hFOMM2c4ME7jt0lxWzA,4991
+omdev/__about__.py,sha256=bwCUKH9MgCgKZ4s7JedVN9_ESOv-1CziylwJJCgiaE4,1131
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/bracepy.py,sha256=HwBK5XmlOsF_juTel25fRLJK9vHSJCWXuCc-OZlevRQ,2619
 omdev/classdot.py,sha256=K0YMTngaC6uuEKhDb95tFzW33Re_YEdgIWBBeze4PTI,1628
@@ -59,11 +59,11 @@ omdev/cexts/_distutils/compilers/options.py,sha256=H7r5IcLvga5Fs3jjXWIT-6ap3JBdu
 omdev/cexts/_distutils/compilers/unixccompiler.py,sha256=o1h8QuyupLntv4F21_XjzAZmCiwwxJuTmOirvBSL-Qw,15419
 omdev/cli/__init__.py,sha256=V_l6VP1SZMlJbO-8CJwSuO9TThOy2S_oaPepNYgIrbE,37
 omdev/cli/__main__.py,sha256=mOJpgc07o0r5luQ1DlX4tk2PqZkgmbwPbdzJ3KmtjgQ,138
+omdev/cli/_pathhack.py,sha256=_446loyBbCI3LaP2OhYAkKjWEgf_7eJ6UZyt_hlrClA,1479
 omdev/cli/clicli.py,sha256=S2iFrFpGrhm2Ls1Z9qiteBVDEdmF4QJgP3Vv5ndnQ8o,2537
 omdev/cli/install.py,sha256=C-W171YlIHt4Cfok-nWSMbHwWhqF_PFqq2HixFttYx8,4460
 omdev/cli/main.py,sha256=fQL-KdKZDmw00d8vtgxGmUc9Pp3dnhW1BW-Pzu6JPX0,4172
-omdev/cli/managers.py,sha256=tC4saQQhawMwmRzXs4ErKuO3P10rm7GhY2PUUsTK2Ss,1159
-omdev/cli/pathhack.py,sha256=_446loyBbCI3LaP2OhYAkKjWEgf_7eJ6UZyt_hlrClA,1479
+omdev/cli/managers.py,sha256=BV98_n30Jj63OJrFgRoVZRfICxMLXEZKoEn4rMj9LV4,1160
 omdev/cli/types.py,sha256=bqKw9SbtBtAip2vF9v4khh0CqKG6LBr6n9VzWBz7AJE,474
 omdev/interp/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/interp/__main__.py,sha256=GMCqeGYltgt5dlJzHxY9gqisa8cRkrPfmZYuZnjg4WI,162
@@ -112,17 +112,17 @@ omdev/toml/parser.py,sha256=84bn09uhYHwQGyfww6Rw6y1RxPAE_HDltODOSakcqDM,29186
 omdev/toml/writer.py,sha256=lk3on3YXVbWuLJa-xsOzOhs1bBAT1vXqw4mBbluZl_w,3040
 omdev/tools/__init__.py,sha256=iVJAOQ0viGTQOm0DLX4uZLro-9jOioYJGLg9s0kDx1A,78
 omdev/tools/dockertools.py,sha256=fkiIAzV-67b4knoF68P19shk94Vec_7xX8MwFGzvPlc,6907
-omdev/tools/gittools.py,sha256=SMuKeonZP16lYBecmKB7sn_VZ-ljQnJJF6TGX0isVwA,2031
+omdev/tools/gittools.py,sha256=wfNu6uqZdSUbpCWO7OOA8d91t6ZwltRTIhjkzMOq0xU,3795
 omdev/tools/importscan.py,sha256=vxOMdAABShqt5-G3n6DGHopCZ5uGgciThY0MCa5W0mA,4066
 omdev/tools/mkrelimp.py,sha256=fwt4GWzenuLNVtzdK2uaJJTSuJbUVJZquF5adwAwlPg,4051
 omdev/tools/nbtools.py,sha256=5sAFXw0joeHsE1wCseiyYFHxE459UfE83S8VnHIRXiE,3395
 omdev/tools/piptools.py,sha256=-jR5q3w4sHqntxCLExFCBNIARB788FUsAbJ62PK2sBU,2774
-omdev/tools/proftools.py,sha256=xKSm_yPoCnfsvS3iT9MblDqFMuZmGfI3_koGj8amMyU,145
-omdev/tools/rst.py,sha256=6dWk8QZHoGiLSuBw3TKsXZjjFK6wWBEtPi9krdCLKKg,977
+omdev/tools/proftools.py,sha256=8ZU9x_Dq8eT2ZFwU9sJpDIvxcIn9qBc8y2ELKPb5e5M,1382
+omdev/tools/rsttool.py,sha256=suwsfseUf8GH8rYmYygTUdif-Jk_bX1g9fYRLXaKkmM,1340
 omdev/tools/sqlrepl.py,sha256=tmFZh80-xsGM62dyQ7_UGLebChrj7IHbIPYBWDJMgVk,5741
-omdev-0.0.0.dev69.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev69.dist-info/METADATA,sha256=iywdQ1OkwY6R1tyXqZ_19DKRmYK2uNHdW2xXLTx4VPs,1368
-omdev-0.0.0.dev69.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-omdev-0.0.0.dev69.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev69.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev69.dist-info/RECORD,,
+omdev-0.0.0.dev71.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev71.dist-info/METADATA,sha256=VH6UCzzi_xZHYEwtNljGTLWxULtJof_DapUs3-tkMgE,1492
+omdev-0.0.0.dev71.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+omdev-0.0.0.dev71.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev71.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev71.dist-info/RECORD,,

omdev/tools/rst.py

@@ -1,44 +0,0 @@
-import argparse
-import contextlib
-import io
-import sys
-
-import docutils.core
-
-
-def rst2html(rst, report_level=None):
-    kwargs = {
-        'writer_name': 'html',
-        'settings_overrides': {
-            '_disable_config': True,
-            'report_level': int(report_level) if report_level else 0,
-        },
-    }
-
-    target = io.StringIO()
-    with contextlib.redirect_stderr(target):
-        parts = docutils.core.publish_parts(rst, **kwargs)  # type: ignore
-        html = parts['html_body']
-        warning = target.getvalue().strip()
-        return html, warning
-
-
-def _main() -> None:
-    parser = argparse.ArgumentParser()
-    parser.add_argument('input', nargs='?')
-    args = parser.parse_args()
-
-    if args.input:
-        with open(args.input) as f:
-            src = f.read()
-    else:
-        src = sys.stdin.read()
-
-    html, warning = rst2html(src)
-    if warning:
-        sys.stderr.write(warning)
-    print(html)
-
-
-if __name__ == '__main__':
-    _main()