omdev 0.0.0.dev249__tar.gz → 0.0.0.dev251__tar.gz

{omdev-0.0.0.dev249/omdev.egg-info → omdev-0.0.0.dev251}/PKG-INFO

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

{omdev-0.0.0.dev249 → omdev-0.0.0.dev251}/omdev/.manifests.json

@@ -155,18 +155,6 @@
       }
     }
   },
-  {
-    "module": ".pycharm.__main__",
-    "attr": "_CLI_MODULE",
-    "file": "omdev/pycharm/__main__.py",
-    "line": 4,
-    "value": {
-      "$.cli.types.CliModule": {
-        "cmd_name": "pycharm",
-        "mod_name": "omdev.pycharm.__main__"
-      }
-    }
-  },
   {
     "module": ".pyproject.__main__",
     "attr": "_CLI_MODULE",
@@ -315,6 +303,21 @@
       }
     }
   },
+  {
+    "module": ".tools.intellij",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/tools/intellij.py",
+    "line": 248,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": [
+          "intellij",
+          "ij"
+        ],
+        "mod_name": "omdev.tools.intellij"
+      }
+    }
+  },
   {
     "module": ".tools.json.__main__",
     "attr": "_CLI_MODULE",

{omdev-0.0.0.dev249 → omdev-0.0.0.dev251}/omdev/cexts/_distutils/compilers/unixccompiler.py

@@ -372,7 +372,7 @@ class UnixCCompiler(CCompiler):
         """
         lib_names = (
             self.library_filename(lib, lib_type=ty)
-            for ty in 'dylib xcode_stub shared static'.split()
+            for ty in ['dylib', 'xcode_stub', 'shared', 'static']
         )
 
         roots = map(self._library_root, dirs)

{omdev-0.0.0.dev249 → omdev-0.0.0.dev251}/omdev/ci/compose.py

@@ -99,8 +99,7 @@ class DockerComposeRun(AsyncExitStacked):
         out_service['image'] = self._cfg.image
 
         for k in ['build', 'platform']:
-            if k in out_service:
-                del out_service[k]
+            out_service.pop(k, None)
 
         #
 

{omdev-0.0.0.dev249 → omdev-0.0.0.dev251}/omdev/scripts/ci.py

@@ -4653,7 +4653,7 @@ _DEFAULT_OBJ_MARSHALERS: ta.Dict[ta.Any, ObjMarshaler] = {
 
 _OBJ_MARSHALER_GENERIC_MAPPING_TYPES: ta.Dict[ta.Any, type] = {
     **{t: t for t in (dict,)},
-    **{t: dict for t in (collections.abc.Mapping, collections.abc.MutableMapping)},
+    **{t: dict for t in (collections.abc.Mapping, collections.abc.MutableMapping)},  # noqa
 }
 
 _OBJ_MARSHALER_GENERIC_ITERABLE_TYPES: ta.Dict[ta.Any, type] = {
@@ -10945,8 +10945,7 @@ class DockerComposeRun(AsyncExitStacked):
         out_service['image'] = self._cfg.image
 
         for k in ['build', 'platform']:
-            if k in out_service:
-                del out_service[k]
+            out_service.pop(k, None)
 
         #
 

{omdev-0.0.0.dev249 → omdev-0.0.0.dev251}/omdev/scripts/pyproject.py

@@ -5487,7 +5487,7 @@ _DEFAULT_OBJ_MARSHALERS: ta.Dict[ta.Any, ObjMarshaler] = {
 
 _OBJ_MARSHALER_GENERIC_MAPPING_TYPES: ta.Dict[ta.Any, type] = {
     **{t: t for t in (dict,)},
-    **{t: dict for t in (collections.abc.Mapping, collections.abc.MutableMapping)},
+    **{t: dict for t in (collections.abc.Mapping, collections.abc.MutableMapping)},  # noqa
 }
 
 _OBJ_MARSHALER_GENERIC_ITERABLE_TYPES: ta.Dict[ta.Any, type] = {

{omdev-0.0.0.dev249 → omdev-0.0.0.dev251}/omdev/tools/git/cli.py

@@ -1,27 +1,26 @@
 # ruff: noqa: UP006 UP007
 """
 TODO:
- - https://github.com/vegardit/bash-funk/blob/main/docs/git.md
- - git submodule foreach 'git remote show origin | grep "HEAD branch" | cut -f5 -d" " | xargs git checkout && git pull'
-  - Handle:
-   Your branch and 'origin/main' have diverged,
-   and have 2691 and 2708 different commits each, respectively.
-     (use "git pull" if you want to integrate the remote branch with yours)
-   hint: You have divergent branches and need to specify how to reconcile them.
-   hint: You can do so by running one of the following commands sometime before
-   hint: your next pull:
-   hint:
-   hint:   git config pull.rebase false  # merge
-   hint:   git config pull.rebase true   # rebase
-   hint:   git config pull.ff only       # fast-forward only
-   hint:
-   hint: You can replace "git config" with "git config --global" to set a default
-   hint: preference for all repositories. You can also pass --rebase, --no-rebase,
-   hint: or --ff-only on the command line to override the configured default per
-   hint: invocation.
-   fatal: Need to specify how to reconcile divergent branches.
+ - Handle:
+  Your branch and 'origin/main' have diverged,
+  and have 2691 and 2708 different commits each, respectively.
+    (use "git pull" if you want to integrate the remote branch with yours)
+  hint: You have divergent branches and need to specify how to reconcile them.
+  hint: You can do so by running one of the following commands sometime before
+  hint: your next pull:
+  hint:
+  hint:   git config pull.rebase false  # merge
+  hint:   git config pull.rebase true   # rebase
+  hint:   git config pull.ff only       # fast-forward only
+  hint:
+  hint: You can replace "git config" with "git config --global" to set a default
+  hint: preference for all repositories. You can also pass --rebase, --no-rebase,
+  hint: or --ff-only on the command line to override the configured default per
+  hint: invocation.
+  fatal: Need to specify how to reconcile divergent branches.
 """
 import dataclasses as dc
+import logging
 import os
 import re
 import typing as ta
@@ -54,6 +53,9 @@ else:
     msh = lang.proxy_import('omlish.marshal')
 
 
+log = logging.getLogger(__name__)
+
+
 ##
 
 
@@ -370,6 +372,48 @@ class Cli(ap.Cli):
             for d in self.args.dir:
                 run(d)
 
+    @ap.cmd(
+        ap.arg('dir', nargs='*'),
+        aliases=['usb'],
+    )
+    def update_submodule_branches(self) -> None:
+        def run_submodule(submodule: str, cwd: str | None) -> None:
+            submodule_path = submodule if cwd is None else os.path.join(cwd, submodule)
+
+            # Get the HEAD branch from origin
+            remote_show = subprocesses.check_output(
+                'git', 'remote', 'show', 'origin',
+                cwd=submodule_path,
+            ).decode()
+            head_branch: str | None = None
+            for line in remote_show.splitlines():
+                line = line.strip()
+                if line.startswith('HEAD branch:'):
+                    head_branch = line.split(':')[1].strip()
+                    break
+
+            if not head_branch:
+                log.warning('Could not determine HEAD branch for submodule %s', submodule)
+                return
+
+            subprocesses.check_call('git', 'checkout', head_branch, cwd=submodule_path)
+            subprocesses.check_call('git', 'pull', cwd=submodule_path)
+
+        def run(cwd: str | None) -> None:
+            submodules = subprocesses.check_output(
+                'git', 'submodule', 'foreach', '-q', 'echo $name',
+                cwd=cwd,
+            ).decode().strip().splitlines()
+
+            for submodule in submodules:
+                run_submodule(submodule, cwd)
+
+        if not self.args.dir:
+            run(None)
+        else:
+            for d in self.args.dir:
+                run(d)
+
     #
 
     @ap.cmd()

omdev-0.0.0.dev249/omdev/pycharm/cli.py → omdev-0.0.0.dev251/omdev/tools/intellij.py

@@ -1,25 +1,114 @@
 """
 TODO:
+ - read .idea/ for inference?
  - PyCharm.app/Contents/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_constants.py -> USE_LOW_IMPACT_MONITORING
  - DISPLAY=":1" - ls /tmp/.X11-unix/X1 ?
   - https://unix.stackexchange.com/questions/17255/is-there-a-command-to-list-all-open-displays-on-a-machine
   - w -oush
 """
 import dataclasses as dc
+import enum
 import inspect
 import os.path
 import shlex
 import subprocess
 import sys
 import tempfile
+import typing as ta
 
 from omlish.argparse import all as ap
 from omlish.diag.pycharm import get_pycharm_version
 
+from ..cli import CliModule
+
+
+##
+
+
+class Ide(enum.Enum):
+    PYCHARM = enum.auto()
+    IDEA = enum.auto()
+    CLION = enum.auto()
+    WEBSTORM = enum.auto()
+    GOLAND = enum.auto()
+
 
 ##
 
 
+_INFER_FILE_NAME_SETS_BY_IDE: ta.Mapping[Ide, ta.AbstractSet[str]] = {
+    Ide.PYCHARM: frozenset([
+        'setup.py',
+        'setup.cfg',
+        'pyproject.toml',
+        'requirements.txt',
+        'Pipfile',
+        'poetry.lock',
+        '.python-version',
+        'wsgi.py',
+        'asgi.py',
+        'manage.py',
+    ]),
+    Ide.IDEA: frozenset([
+        'pom.xml',
+        'mvnw',
+        'build.gradle',
+        'build.gradle.kts',
+        'gradlew',
+        'module-info.java',
+        '.java-version',
+    ]),
+    Ide.CLION: frozenset([
+        'CMakeLists.txt',
+        'configure.ac',
+        'configure.in',
+        'config.h.in',
+        'vcpkg.json',
+    ]),
+    Ide.WEBSTORM: frozenset([
+        'package.json',
+        'package-lock.json',
+    ]),
+    Ide.GOLAND: frozenset([
+        'go.mod',
+        'go.sum',
+    ]),
+}
+
+
+def _infer_directory_ide(cwd: str | None) -> Ide | None:
+    if cwd is None:
+        cwd = os.getcwd()
+
+    for i, fs in _INFER_FILE_NAME_SETS_BY_IDE.items():
+        for f in fs:
+            if os.path.exists(os.path.join(cwd, f)):
+                return i
+
+    return None
+
+
+##
+
+
+def _get_ide_version(ide: Ide) -> str:
+    if ide is Ide.PYCHARM:
+        return get_pycharm_version()
+    else:
+        raise ValueError(ide)
+
+
+##
+
+
+_DARWIN_OPEN_SCRIPT_APP_BY_IDE: ta.Mapping[Ide, str] = {
+    Ide.PYCHARM: 'PyCharm',
+    Ide.CLION: 'CLion',
+    Ide.IDEA: 'IntelliJ IDEA',
+    Ide.WEBSTORM: 'WebStorm',
+    Ide.GOLAND: 'GoLand',
+}
+
 _DARWIN_OPEN_SCRIPT = """
 tell application "{app}"
     activate
@@ -32,8 +121,13 @@ return
 ##
 
 
-_LINUX_PYCHARM_WM_CLASS = 'jetbrains-pycharm.jetbrains-pycharm'
-_LINUX_CLION_WM_CLASS = 'jetbrains-clion.jetbrains-pycharm'
+_LINUX_WM_CLASS_BY_IDE: ta.Mapping[Ide, str] = {
+    Ide.PYCHARM: 'jetbrains-pycharm.jetbrains-pycharm',
+    Ide.CLION: 'jetbrains-clion.jetbrains-clion',
+    Ide.IDEA: 'jetbrains-idea.jetbrains-idea',
+    Ide.WEBSTORM: 'jetbrains-webstorm.jetbrains-webstorm',
+    Ide.GOLAND: 'jetbrains-goland.jetbrains-goland',
+}
 
 
 # sudo apt install xdotool wmctrl
@@ -63,16 +157,12 @@ def parse_wmctrl_lxp_line(l: str) -> WmctrlLine:
 ##
 
 
-class Cli(ap.Cli):
-    @ap.cmd()
-    def version(self) -> None:
-        print(get_pycharm_version())
-
+class IntellijCli(ap.Cli):
     @ap.cmd(
         ap.arg('python-exe'),
         ap.arg('args', nargs=ap.REMAINDER),
     )
-    def runhack(self) -> int:
+    def pycharm_runhack(self) -> int:
         if not os.path.isfile(exe := self.args.python_exe):
             raise FileNotFoundError(exe)
 
@@ -86,23 +176,47 @@ class Cli(ap.Cli):
         proc = subprocess.run([exe, src_file, *self.args.args], check=False)
         return proc.returncode
 
+    #
+
+    def _get_ide(
+            self,
+            *,
+            cwd: str | None = None,
+    ) -> Ide:  # noqa
+        if (ai := self.args.ide) is not None:
+            return Ide(ai)
+
+        if (ii := _infer_directory_ide(cwd)) is not None:
+            return ii
+
+        return Ide.PYCHARM
+
+    @ap.cmd(
+        ap.arg('-e', '--ide'),
+    )
+    def version(self) -> None:
+        i = self._get_ide()
+        v = _get_ide_version(i)
+        print(v)
+
     @ap.cmd(
         ap.arg('dir', nargs='?'),
-        ap.arg('-c', '--clion', action='store_true'),
+        ap.arg('-e', '--ide'),
     )
     def open(self) -> None:
         dir = os.path.abspath(self.args.dir or '.')  # noqa
+        ide = self._get_ide(cwd=dir)
 
         if (plat := sys.platform) == 'darwin':
             if '"' in dir:
                 raise ValueError(dir)
 
             scpt_src = _DARWIN_OPEN_SCRIPT.format(
-                app='CLion' if self.args.clion else 'PyCharm',
+                app=_DARWIN_OPEN_SCRIPT_APP_BY_IDE[ide],
                 dir=dir,
             )
 
-            scpt_file = tempfile.mktemp(__package__ + '-pycharm-open')  # noqa
+            scpt_file = tempfile.mktemp(__package__ + '-intellij-open')  # noqa
             with open(scpt_file, 'w') as f:
                 f.write(scpt_src)
 
@@ -114,7 +228,7 @@ class Cli(ap.Cli):
 
             wmc_out = subprocess.check_output(['wmctrl', '-lxp'], env=env).decode()
             wls = [parse_wmctrl_lxp_line(l) for l in wmc_out.splitlines()]
-            tgt_wmc = _LINUX_CLION_WM_CLASS if self.args.clion else _LINUX_PYCHARM_WM_CLASS
+            tgt_wmc = _LINUX_WM_CLASS_BY_IDE[ide]
             tgt_wl = next(wl for wl in wls if wl.wm_class == tgt_wmc)
             subprocess.check_call(['wmctrl', '-ia', tgt_wl.window_id], env=env)
 
@@ -128,7 +242,11 @@ class Cli(ap.Cli):
 
 
 def _main() -> None:
-    Cli()(exit=True)
+    IntellijCli()(exit=True)
+
+
+# @omlish-manifest
+_CLI_MODULE = CliModule(['intellij', 'ij'], __name__)
 
 
 if __name__ == '__main__':

{omdev-0.0.0.dev249 → omdev-0.0.0.dev251/omdev.egg-info}/PKG-INFO

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

{omdev-0.0.0.dev249 → omdev-0.0.0.dev251}/omdev.egg-info/SOURCES.txt

@@ -206,9 +206,6 @@ omdev/precheck/scripts.py
 omdev/ptk/__init__.py
 omdev/ptk/apps/__init__.py
 omdev/ptk/apps/ncdu.py
-omdev/pycharm/__init__.py
-omdev/pycharm/__main__.py
-omdev/pycharm/cli.py
 omdev/pyproject/__init__.py
 omdev/pyproject/__main__.py
 omdev/pyproject/cexts.py
@@ -240,6 +237,7 @@ omdev/tools/cloc.py
 omdev/tools/doc.py
 omdev/tools/docker.py
 omdev/tools/importscan.py
+omdev/tools/intellij.py
 omdev/tools/linehisto.py
 omdev/tools/mkenv.py
 omdev/tools/mkrelimp.py

{omdev-0.0.0.dev249 → omdev-0.0.0.dev251}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev249
+omlish==0.0.0.dev251
 
 [all]
 black~=25.1

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

omdev-0.0.0.dev249/omdev/pycharm/__main__.py

@@ -1,11 +0,0 @@
-from ..cli import CliModule
-
-
-# @omlish-manifest
-_CLI_MODULE = CliModule('pycharm', __name__)
-
-
-if __name__ == '__main__':
-    from .cli import _main
-
-    _main()