omdev 0.0.0.dev69__tar.gz → 0.0.0.dev71__tar.gz

{omdev-0.0.0.dev69/omdev.egg-info → omdev-0.0.0.dev71}/PKG-INFO

@@ -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 → omdev-0.0.0.dev71}/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-0.0.0.dev69 → omdev-0.0.0.dev71}/omdev/__about__.py

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

{omdev-0.0.0.dev69 → omdev-0.0.0.dev71}/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-0.0.0.dev69 → omdev-0.0.0.dev71}/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.dev71/omdev/tools/proftools.py

@@ -0,0 +1,55 @@
+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-0.0.0.dev71/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 → omdev-0.0.0.dev71/omdev.egg-info}/PKG-INFO

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

@@ -69,11 +69,11 @@ omdev/cexts/_distutils/compilers/options.py
 omdev/cexts/_distutils/compilers/unixccompiler.py
 omdev/cli/__init__.py
 omdev/cli/__main__.py
+omdev/cli/_pathhack.py
 omdev/cli/clicli.py
 omdev/cli/install.py
 omdev/cli/main.py
 omdev/cli/managers.py
-omdev/cli/pathhack.py
 omdev/cli/types.py
 omdev/interp/__init__.py
 omdev/interp/__main__.py
@@ -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.dev69 → omdev-0.0.0.dev71}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev69
+omlish==0.0.0.dev71
 
 [all]
 black~=24.10
@@ -7,6 +7,7 @@ cffi~=1.17
 pcpp~=1.30
 docutils~=0.21
 mypy~=1.11
+gprof2dot~=2024.6
 tokenize_rt~=6.0
 wheel~=0.44
 
@@ -24,6 +25,9 @@ docutils~=0.21
 [mypy]
 mypy~=1.11
 
+[prof]
+gprof2dot~=2024.6
+
 [tokens]
 tokenize_rt~=6.0
 

{omdev-0.0.0.dev69 → omdev-0.0.0.dev71}/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.dev69'
+version = '0.0.0.dev71'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev69',
+    'omlish == 0.0.0.dev71',
 ]
 
 [project.optional-dependencies]
@@ -33,6 +33,7 @@ all = [
     'pcpp ~= 1.30',
     'docutils ~= 0.21',
     'mypy ~= 1.11',
+    'gprof2dot ~= 2024.6',
     'tokenize_rt ~= 6.0',
     'wheel ~= 0.44',
 ]
@@ -50,6 +51,9 @@ docutils = [
 mypy = [
     'mypy ~= 1.11',
 ]
+prof = [
+    'gprof2dot ~= 2024.6',
+]
 tokens = [
     'tokenize_rt ~= 6.0',
 ]

omdev-0.0.0.dev69/omdev/tools/proftools.py

@@ -1,4 +0,0 @@
-"""
-TODO:
- - rm prof.pstats.pdf ; ./python -m gprof2dot -f pstats prof.pstats | dot -Tpdf -o prof.pstats.pdf && open prof.pstats.pdf
-"""  # noqa

omdev-0.0.0.dev69/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()