omdev 0.0.0.dev43__tar.gz → 0.0.0.dev45__tar.gz

{omdev-0.0.0.dev43/omdev.egg-info → omdev-0.0.0.dev45}/PKG-INFO

@@ -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 → omdev-0.0.0.dev45}/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-0.0.0.dev43 → omdev-0.0.0.dev45}/omdev/cli/__main__.py

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

omdev-0.0.0.dev45/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-0.0.0.dev43 → omdev-0.0.0.dev45}/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-0.0.0.dev43 → omdev-0.0.0.dev45}/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-0.0.0.dev45/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-0.0.0.dev45/omdev/tools/gittools.py

@@ -0,0 +1,70 @@
+import os
+import re
+import subprocess
+
+from omlish import argparse as ap
+from omlish import logs
+
+from ..cli import CliModule
+
+
+class Cli(ap.Cli):
+    @ap.command()
+    def blob_sizes(self) -> None:
+        # https://stackoverflow.com/a/42544963
+        subprocess.check_call(  # noqa
+            "git rev-list --objects --all | "
+            "git cat-file --batch-check='%(objecttype) %(objectname) %(objectsize) %(rest)' | "
+            "sed -n 's/^blob //p' | "
+            "sort --numeric-sort --key=2",
+            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__)
+
+
+if __name__ == '__main__':
+    logs.configure_standard_logging('INFO')
+    Cli()()

{omdev-0.0.0.dev43 → omdev-0.0.0.dev45}/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 → omdev-0.0.0.dev45/omdev.egg-info}/PKG-INFO

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

@@ -65,9 +65,10 @@ omdev/cexts/_distutils/compilers/options.py
 omdev/cexts/_distutils/compilers/unixccompiler.py
 omdev/cli/__init__.py
 omdev/cli/__main__.py
-omdev/cli/clicmds.py
+omdev/cli/clicli.py
 omdev/cli/install.py
 omdev/cli/main.py
+omdev/cli/managers.py
 omdev/cli/types.py
 omdev/interp/__init__.py
 omdev/interp/__main__.py

{omdev-0.0.0.dev43 → omdev-0.0.0.dev45}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev43
+omlish==0.0.0.dev45
 
 [all]
 pycparser~=2.22

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

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

omdev-0.0.0.dev43/omdev/tools/gittools.py

@@ -1,28 +0,0 @@
-import subprocess
-
-from omlish import argparse as ap
-from omlish import logs
-
-from ..cli import CliModule
-
-
-class Cli(ap.Cli):
-    @ap.command()
-    def blob_sizes(self) -> None:
-        # https://stackoverflow.com/a/42544963
-        subprocess.check_call(  # noqa
-            "git rev-list --objects --all | "
-            "git cat-file --batch-check='%(objecttype) %(objectname) %(objectsize) %(rest)' | "
-            "sed -n 's/^blob //p' | "
-            "sort --numeric-sort --key=2",
-            shell=True,
-        )
-
-
-# @omlish-manifest
-_CLI_MODULE = CliModule('git', __name__)
-
-
-if __name__ == '__main__':
-    logs.configure_standard_logging('INFO')
-    Cli()()