omdev 0.0.0.dev43__py3-none-any.whl → 0.0.0.dev45__py3-none-any.whl

omdev/.manifests.json

@@ -36,14 +36,14 @@
     }
   },
   {
-    "module": ".cli.clicmds",
+    "module": ".cli.clicli",
     "attr": "_CLI_MODULE",
-    "file": "omdev/cli/clicmds.py",
-    "line": 57,
+    "file": "omdev/cli/clicli.py",
+    "line": 62,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "cli",
-        "mod_name": "omdev.cli.clicmds"
+        "mod_name": "omdev.cli.clicli"
       }
     }
   },
@@ -135,7 +135,7 @@
     "module": ".tools.gittools",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/gittools.py",
-    "line": 22,
+    "line": 64,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "git",

omdev/cli/__main__.py

@@ -1,4 +1,4 @@
 if __name__ == '__main__':
-    from .main import _main
+    from .main import _main  # noqa
 
     _main()

omdev/cli/clicli.py

@@ -0,0 +1,71 @@
+import inspect
+import os
+import subprocess
+import sys
+
+from omlish import __about__
+from omlish import argparse as ap
+
+from . import install
+from .types import CliModule
+
+
+class CliCli(ap.Cli):
+
+    @ap.command(name='version')
+    def print_version(self) -> None:
+        print(__about__.__version__)
+
+    @ap.command(name='revision')
+    def print_revision(self) -> None:
+        print(__about__.__revision__)
+
+    @ap.command(
+        ap.arg('extra_deps', nargs='*'),
+    )
+    def reinstall(self) -> None:
+        mod_name = globals()['__spec__'].name
+        tool_name = '.'.join([mod_name.partition('.')[0], 'tools', 'piptools'])
+
+        out = subprocess.check_output([
+            sys.executable,
+            '-m',
+            tool_name,
+            'list-root-dists',
+        ]).decode()
+
+        deps = sorted(
+            ({s for l in out.splitlines() if (s := l.strip())} | set(self.args.extra_deps or []))
+            - {install.DEFAULT_CLI_PKG}  # noqa
+        )
+
+        if deps:
+            print('Reinstalling with following additional dependencies:')
+            print('\n'.join('  ' + d for d in deps))
+        else:
+            print('No additional dependencies detected.')
+        print()
+        print('Continue with reinstall? (ctrl-c to cancel)')
+        input()
+
+        install_src = inspect.getsource(install)
+
+        os.execl(
+            sys.executable,
+            sys.executable,
+            '-c',
+            install_src,
+            *deps,
+        )
+
+
+# @omlish-manifest
+_CLI_MODULE = CliModule('cli', __name__)
+
+
+def _main() -> None:
+    CliCli()()
+
+
+if __name__ == '__main__':
+    _main()

omdev/cli/install.py

@@ -32,7 +32,7 @@ class InstallOpts:
     extras: ta.Sequence[str] = dc.field(default_factory=list)
 
 
-class InstallMgr(abc.ABC):
+class InstallManager(abc.ABC):
     @abc.abstractmethod
     def is_available(self) -> bool:
         raise NotImplementedError
@@ -46,7 +46,7 @@ class InstallMgr(abc.ABC):
         raise NotImplementedError
 
 
-class UvxInstallMgr(InstallMgr):
+class UvxInstallManager(InstallManager):
     def is_available(self) -> bool:
         return bool(shutil.which('uv'))
 
@@ -80,15 +80,25 @@ class UvxInstallMgr(InstallMgr):
             *itertools.chain.from_iterable(['--with', e] for e in (opts.extras or [])),
         ])
 
+        subprocess.check_call([
+            'uv', 'tool',
+            'run',
+            '--from', opts.cli_pkg,
+            'om',
+            '_post_install',
+        ])
 
-class PipxInstallMgr(InstallMgr):
+
+class PipxInstallManager(InstallManager):
     def is_available(self) -> bool:
         return bool(shutil.which('pipx'))
 
-    def uninstall(self, cli_pkg: str) -> None:
+    def _list_installed(self) -> ta.Any:
         out = subprocess.check_output(['pipx', 'list', '--json']).decode()
+        return json.loads(out)
 
-        dct = json.loads(out)
+    def uninstall(self, cli_pkg: str) -> None:
+        dct = self._list_installed()
 
         if cli_pkg not in dct.get('venvs', {}):
             return
@@ -108,10 +118,19 @@ class PipxInstallMgr(InstallMgr):
             *itertools.chain.from_iterable(['--preinstall', e] for e in (opts.extras or [])),
         ])
 
+        dct = self._list_installed()
 
-INSTALL_MGRS = {
-    'uvx': UvxInstallMgr(),
-    'pipx': PipxInstallMgr(),
+        exe = dct['venvs'][opts.cli_pkg]['metadata']['main_package']['app_paths'][0]['__Path__']
+
+        subprocess.check_call([
+            exe,
+            '_post_install',
+        ])
+
+
+INSTALL_MANAGERS = {
+    'uvx': UvxInstallManager(),
+    'pipx': PipxInstallManager(),
 }
 
 
@@ -129,22 +148,24 @@ def _main() -> None:
     if not (cli := args.cli):
         raise ValueError(f'Must specify cli')
 
+    cli = cli.lower().replace('_', '-')
+
     if not (py := args.py):
         raise ValueError(f'Must specify py')
 
     if mgr := args.mgr:
-        if (im := INSTALL_MGRS.get(mgr)) is None:
+        if (im := INSTALL_MANAGERS.get(mgr)) is None:
             raise ValueError(f'Unsupported mgr: {mgr}')
         if not im.is_available():
             raise ValueError(f'Unavailable mgr: {mgr}')
     else:
-        for im in INSTALL_MGRS.values():
+        for im in INSTALL_MANAGERS.values():
             if im.is_available():
                 break
         else:
             raise RuntimeError("Can't find install manager")
 
-    for m in INSTALL_MGRS.values():
+    for m in INSTALL_MANAGERS.values():
         if m.is_available():
             m.uninstall(cli)
 

omdev/cli/main.py

@@ -23,7 +23,18 @@ from .types import CliModule
 ##
 
 
-_CLI_FUNCS: ta.Sequence[CliFunc] = []
+def _post_install() -> None:
+    from .managers import setup_install_manager
+
+    setup_install_manager()
+
+
+##
+
+
+_CLI_FUNCS: ta.Sequence[CliFunc] = [
+    CliFunc('_post_install', _post_install),
+]
 
 
 ##

omdev/cli/managers.py

@@ -0,0 +1,107 @@
+import enum
+import os.path
+import site
+import sys
+
+
+##
+
+
+def _normalize_pkg_name(s: str) -> str:
+    return s.lower().replace('_', '-')
+
+
+CLI_PKG = _normalize_pkg_name(__name__.split('.')[0])
+
+
+##
+
+
+class ManagerType(enum.Enum):
+    UVX = 'uvx'
+    PIPX = 'pipx'
+
+
+def _detect_install_manager() -> ManagerType | None:
+    if os.path.isfile(fp := os.path.join(sys.prefix, 'uv-receipt.toml')):
+        import tomllib
+
+        with open(fp) as f:
+            dct = tomllib.loads(f.read())
+
+        reqs = dct.get('tool', {}).get('requirements')
+        main_pkg = _normalize_pkg_name(reqs[0].get('name', ''))
+        if reqs and main_pkg == CLI_PKG:
+            return ManagerType.UVX
+
+    if os.path.isfile(fp := os.path.join(sys.prefix, 'pipx_metadata.json')):
+        import json
+
+        with open(fp) as f:
+            dct = json.loads(f.read())
+
+        main_pkg = _normalize_pkg_name(dct.get('main_package', {}).get('package_or_url', ''))
+        if main_pkg == CLI_PKG:
+            return ManagerType.PIPX
+
+    return None
+
+
+def detect_install_manager() -> ManagerType | None:
+    try:
+        return globals()['_DETECTED_MANAGER_TYPE']
+    except KeyError:
+        pass
+    ret = globals()['_DETECTED_MANAGER_TYPE'] = _detect_install_manager()
+    return ret
+
+
+##
+# Python is insistent in prepending sys.path with an empty string (translating to the current working directory),
+# which leads to problems when using the cli in directories containing python packages (such as within this very
+# source tree). This can't be done in cli main as the code frequently spawns other sys.executable processes which
+# wouldn't know to do that, so a .pth file hack is used. Cleaning sys.path solely there is also insufficient as that
+# code runs before the problematic empty string is added, so a sys.meta_path hook is prepended.
+#
+# See:
+#     https://github.com/python/cpython/blob/da1e5526aee674bb33c17a498aa3781587b9850c/Python/sysmodule.c#L3939
+
+
+def _remove_empty_from_sys_path() -> None:
+    while '' in sys.path:
+        sys.path.remove('')
+
+
+class _PathHackMetaFinder:
+    def find_spec(self, fullname, path, target=None):
+        _remove_empty_from_sys_path()
+        return None  # noqa
+
+
+def _activate_path_hack() -> None:
+    if not any(isinstance(mp, _PathHackMetaFinder) for mp in sys.meta_path):
+        sys.meta_path.insert(0, _PathHackMetaFinder())
+
+
+_PATH_HACK_FILE_NAME = f'{"-".join(__name__.split("."))}-path-hack.pth'
+
+
+def _install_path_hack_file() -> None:
+    sp = site.getsitepackages()[0]
+    if os.path.isfile(fp := os.path.join(sp, _PATH_HACK_FILE_NAME)):
+        return
+
+    with open(fp, 'w') as f:
+        f.write(f'import {__name__}; {__name__}._activate_path_hack()')
+
+    _activate_path_hack()
+
+
+##
+
+
+def setup_install_manager() -> None:
+    if detect_install_manager() is None:
+        return
+
+    _install_path_hack_file()

omdev/tools/gittools.py

@@ -1,3 +1,5 @@
+import os
+import re
 import subprocess
 
 from omlish import argparse as ap
@@ -18,6 +20,46 @@ class Cli(ap.Cli):
             shell=True,
         )
 
+    #
+
+    @ap.command()
+    def commits_by_date(self) -> None:
+        subprocess.check_call(['git log --date=short --pretty=format:%ad | sort | uniq -c'], shell=True)  # noqa
+
+    #
+
+    _GITHUB_PAT = re.compile(r'((http(s)?://)?(www\./)?github(\.com)?/)?(?P<user>[^/.]+)/(?P<repo>[^/.]+)(/.*)?')
+
+    @ap.command(
+        ap.arg('repo'),
+        ap.arg('args', nargs=ap.REMAINDER),
+        accepts_unknown=True,
+    )
+    def clone(self) -> None:
+        if not (m := self._GITHUB_PAT.fullmatch(self.args.repo)):
+            subprocess.check_call([
+                'git',
+                'clone',
+                *self.unknown_args,
+                *self.args.args,
+                self.args.repo,
+            ])
+            return
+
+        user = m.group('user')
+        repo = m.group('repo')
+
+        os.makedirs(user, 0o755, exist_ok=True)
+
+        subprocess.check_call([
+            'git',
+            'clone',
+            *self.unknown_args,
+            *self.args.args,
+            f'https://github.com/{user}/{repo}.git',
+            os.path.join(user, repo),
+        ])
+
 
 # @omlish-manifest
 _CLI_MODULE = CliModule('git', __name__)

omdev/tools/piptools.py

@@ -66,7 +66,7 @@ class Cli(ap.Cli):
             dist_cn = canonicalize_name(dist.metadata['Name'], validate=True)
             if dist_cn in dists:
                 # raise NameError(dist_cn)
-                print(f'!! duplicate dist: {dist_cn}', file=sys.stderr)
+                # print(f'!! duplicate dist: {dist_cn}', file=sys.stderr)
                 continue
 
             dists.add(dist_cn)

{omdev-0.0.0.dev43.dist-info → omdev-0.0.0.dev45.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev43
+Version: 0.0.0.dev45
 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.dev43
+Requires-Dist: omlish ==0.0.0.dev45
 Provides-Extra: all
 Requires-Dist: pycparser ~=2.22 ; extra == 'all'
 Requires-Dist: cffi ~=1.17 ; extra == 'all'

{omdev-0.0.0.dev43.dist-info → omdev-0.0.0.dev45.dist-info}/RECORD

@@ -1,4 +1,4 @@
-omdev/.manifests.json,sha256=c-eZ9NasJYDz6P7LeyEV_-NLPoVpI3ph8LcO8Hg0JNY,3921
+omdev/.manifests.json,sha256=kEgqk5lxYhb_GAnksPc5f0xDcG-5eMUtdcT-v77bCzU,3918
 omdev/__about__.py,sha256=LqSNNFFcT84xW3W8fIOJ78kPYJKFLIXZyDX-AJREvN0,1005
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/bracepy.py,sha256=HwBK5XmlOsF_juTel25fRLJK9vHSJCWXuCc-OZlevRQ,2619
@@ -54,10 +54,11 @@ omdev/cexts/_distutils/compilers/ccompiler.py,sha256=cTs88qrvj0hBVXHfemSDE_du_nE
 omdev/cexts/_distutils/compilers/options.py,sha256=H7r5IcLvga5Fs3jjXWIT-6ap3JBduXRKgtpDmSGCZxs,3818
 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=d23loR_cKfTYZwYiqpt_CmKI7dd5WcYFgIYzqMep75E,68
-omdev/cli/clicmds.py,sha256=Qt75JOZ5nnI1OSvKFkNy25Zi1iaNx_hcPlK3PkgWgYY,1923
-omdev/cli/install.py,sha256=-pFczwyJn48IeqCswbJzrV15ZslQUNIcREiiOGSjDk0,3933
-omdev/cli/main.py,sha256=rGc8SIk-czOS9eILZbzu27nx3ezjc54fn880OWskpYE,1880
+omdev/cli/__main__.py,sha256=5IeIERm-371fSI5ZvPv8eldAJBwgKwpR0R49pTsILNM,76
+omdev/cli/clicli.py,sha256=NY4MF16007Ri31rUsq868u1V9JYDb_2atBALqjjXJK4,1624
+omdev/cli/install.py,sha256=D-OlewQU3HJdt8F-u3C4o90Py5_XrFXhDxp_nXQvpko,4495
+omdev/cli/main.py,sha256=opoOOc_d4yCfI0_dWkwDV7O2WSnoybIH3YsylGFwqLI,2039
+omdev/cli/managers.py,sha256=k2IkanY-vO_zSJqMrSaak3KjAhrGAjoOLBerTrM9o-A,2855
 omdev/cli/types.py,sha256=7_Owg0P8C8oOObSuOp6aEYSjkEukVFxTT00SRy1bLHM,250
 omdev/interp/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/interp/__main__.py,sha256=GMCqeGYltgt5dlJzHxY9gqisa8cRkrPfmZYuZnjg4WI,162
@@ -106,15 +107,15 @@ 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=x00GV8j1KReMXwxJ641GlcsVwHoWeuzdIKVBp36BqwU,5298
-omdev/tools/gittools.py,sha256=s_-cxh-4Nv2a_bJtHZ6AiKF8kx2IjDrt_GOH8Wjz-3M,669
+omdev/tools/gittools.py,sha256=i2WFM2pX5riDJBchFXMmegOCuLSjvTkKC1ltqShSo7E,1773
 omdev/tools/importscan.py,sha256=usF35AjdMZacpe8nfP-wfzxelExT5sEQUORNcBKqr5M,3929
-omdev/tools/piptools.py,sha256=lhwzGXD-v0KFEQNyvzvdO2Kw1OA_2AfGPBs_rIkz8iE,2772
+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/sqlrepl.py,sha256=tmFZh80-xsGM62dyQ7_UGLebChrj7IHbIPYBWDJMgVk,5741
-omdev-0.0.0.dev43.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev43.dist-info/METADATA,sha256=5Hv8QOnRyAlCu0hmOy2f4I772ceLh29Q1XPQmufh8fw,1252
-omdev-0.0.0.dev43.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-omdev-0.0.0.dev43.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev43.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev43.dist-info/RECORD,,
+omdev-0.0.0.dev45.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev45.dist-info/METADATA,sha256=0VYbpYlLSNXLvBrxEpOdijqa8PlkH72pNoxql6wYM8Q,1252
+omdev-0.0.0.dev45.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+omdev-0.0.0.dev45.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev45.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev45.dist-info/RECORD,,

omdev/cli/clicmds.py

@@ -1,83 +0,0 @@
-import argparse
-import inspect
-import os
-import subprocess
-import sys
-
-from omlish import __about__
-
-from . import install
-from .types import CliModule
-
-
-def _print_version(args) -> None:
-    print(__about__.__version__)
-
-
-def _print_revision(args) -> None:
-    print(__about__.__revision__)
-
-
-def _reinstall(args) -> None:
-    mod_name = globals()['__spec__'].name
-    tool_name = '.'.join([mod_name.partition('.')[0], 'tools', 'piptools'])
-
-    out = subprocess.check_output([
-        sys.executable,
-        '-m',
-        tool_name,
-        'list-root-dists',
-    ]).decode()
-
-    deps = sorted(
-        ({s for l in out.splitlines() if (s := l.strip())} | set(args.extra_deps or []))
-        - {install.DEFAULT_CLI_PKG}  # noqa
-    )
-
-    if deps:
-        print('Reinstalling with following additional dependencies:')
-        print('\n'.join('  ' + d for d in deps))
-    else:
-        print('No additional dependencies detected.')
-    print()
-    print('Continue with reinstall? (ctrl-c to cancel)')
-    input()
-
-    install_src = inspect.getsource(install)
-
-    os.execl(
-        sys.executable,
-        sys.executable,
-        '-c',
-        install_src,
-        *deps,
-    )
-
-
-# @omlish-manifest
-_CLI_MODULE = CliModule('cli', __name__)
-
-
-def _main(argv=None) -> None:
-    parser = argparse.ArgumentParser()
-    subparsers = parser.add_subparsers()
-
-    parser_version = subparsers.add_parser('version')
-    parser_version.set_defaults(func=_print_version)
-
-    parser_revision = subparsers.add_parser('revision')
-    parser_revision.set_defaults(func=_print_revision)
-
-    parser_reinstall = subparsers.add_parser('reinstall')
-    parser_reinstall.add_argument('extra_deps', nargs='*')
-    parser_reinstall.set_defaults(func=_reinstall)
-
-    args = parser.parse_args(argv)
-    if not getattr(args, 'func', None):
-        parser.print_help()
-    else:
-        args.func(args)
-
-
-if __name__ == '__main__':
-    _main()