omdev 0.0.0.dev112__py3-none-any.whl → 0.0.0.dev114__py3-none-any.whl

omdev/tools/git.py

@@ -1,13 +1,17 @@
 import os
 import re
 import subprocess
+import typing as ta
 import urllib.parse
 
 from omlish import argparse as ap
 from omlish import check
 from omlish import logs
+from omlish.formats import json
 
 from ..cli import CliModule
+from ..git import GitStatusLine
+from ..git import get_git_status
 
 
 def rev_parse(rev: str) -> str:
@@ -124,6 +128,56 @@ class Cli(ap.Cli):
         else:
             print(base_rev)
 
+    @ap.command(
+        ap.arg('-v', '--verbose', action='store_true'),
+    )
+    def status(self) -> None:
+        st = get_git_status()
+
+        def gsl_dct(gsl: GitStatusLine) -> ta.Mapping[str, ta.Any]:
+            return {
+                'x': gsl.x.name,
+                'y': gsl.y.name,
+                'a': gsl.a,
+                **({'b': gsl.b} if gsl.b is not None else {}),
+            }
+
+        def gsl_dct_lst(gsls: ta.Iterable[GitStatusLine]) -> ta.Sequence[ta.Mapping[str, ta.Any]]:
+            return [gsl_dct(gsl) for gsl in sorted(gsls, key=lambda gsl: gsl.a)]
+
+        if self.args.verbose:
+            dct = {
+                'by_x': {x.name: gsl_dct_lst(lst) for x, lst in st.by_x.items()},
+                'by_y': {y.name: gsl_dct_lst(lst) for y, lst in st.by_x.items()},
+
+                'by_a': {a: gsl_dct(gsl) for a, gsl in sorted(st.by_a.items(), key=lambda t: t[0])},
+                'by_b': {b: gsl_dct(gsl) for b, gsl in sorted(st.by_b.items(), key=lambda t: t[0])},
+
+                'has_unmerged': st.has_unmerged,
+                'has_staged': st.has_staged,
+                'has_dirty': st.has_dirty,
+            }
+
+            print(json.dumps_pretty(dct))
+
+        else:
+            print(json.dumps_pretty([gsl_dct(gsl) for gsl in st]))
+
+    @ap.command(
+        ap.arg('-m', '--message', default='--'),
+        aliases=['acp'],
+    )
+    def add_commit_push(self) -> None:
+        st = get_git_status()
+
+        if st.has_dirty:
+            subprocess.check_call(['git', 'add', '.'])
+
+        if st.has_staged or st.has_dirty:
+            subprocess.check_call(['git', 'commit', '-m', self.args.message])
+
+        subprocess.check_call(['git', 'push'])
+
 
 # @omlish-manifest
 _CLI_MODULE = CliModule('git', __name__)

omdev/tools/pip.py

@@ -3,34 +3,20 @@ TODO:
  - https://github.com/pypa/pip/blob/420435903ff2fc694d6950a47b896427ecaed78f/src/pip/_internal/req/req_file.py ?
 """
 import contextlib
-import importlib.metadata
-import io
 import os.path
 import sys
 import typing as ta
-import urllib.request
 
 from omlish import argparse as ap
-from omlish import check
-from omlish import lang
 from omlish import marshal as msh
 from omlish.formats import json
 
 from ..cli import CliModule
 from ..packaging import marshal as _  # noqa
-from ..packaging.names import canonicalize_name
 from ..packaging.requires import ParsedRequirement
-from ..packaging.requires import RequiresVariable
 from ..packaging.requires import parse_requirement
-
-
-if ta.TYPE_CHECKING:
-    import xml.etree.ElementTree as ET  # noqa
-else:
-    ET = lang.proxy_import('xml.etree.ElementTree')
-
-
-PYPI_URL = 'https://pypi.org/'
+from ..pip import get_root_dists
+from ..pip import lookup_latest_package_version
 
 
 class Cli(ap.Cli):
@@ -38,12 +24,14 @@ class Cli(ap.Cli):
         ap.arg('package'),
     )
     def lookup_latest_version(self) -> None:
-        pkg_name = check.non_empty_str(self.args.package)
-        with urllib.request.urlopen(f'{PYPI_URL}rss/project/{pkg_name}/releases.xml') as resp:  # noqa
-            rss = resp.read()
-        doc = ET.parse(io.BytesIO(rss))  # noqa
-        latest = check.not_none(doc.find('./channel/item/title')).text
-        print(latest)
+        print(lookup_latest_package_version(self.args.package))
+
+    @ap.command(
+        ap.arg('path', nargs='*'),
+    )
+    def list_root_dists(self) -> None:
+        for d in get_root_dists(paths=self.args.path):
+            print(d)
 
     @ap.command(
         ap.arg('file'),
@@ -69,38 +57,6 @@ class Cli(ap.Cli):
             with open(self.args.file, 'w') as f:
                 f.write(new_src)
 
-    @ap.command(
-        ap.arg('path', nargs='*'),
-    )
-    def list_root_dists(self) -> None:
-        # FIXME: track req extras - tuple[str, str] with ('pkg', '') as 'bare'?
-        paths = self.args.path or sys.path
-
-        dists: set[str] = set()
-        reqs_by_use: dict[str, set[str]] = {}
-        uses_by_req: dict[str, set[str]] = {}
-        for dist in importlib.metadata.distributions(paths=paths):
-            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)
-                continue
-
-            dists.add(dist_cn)
-            for req_str in dist.requires or []:
-                req = parse_requirement(req_str)
-
-                if any(v.value == 'extra' for m in req.marker or [] if isinstance(v := m[0], RequiresVariable)):
-                    continue
-
-                req_cn = canonicalize_name(req.name)
-                reqs_by_use.setdefault(dist_cn, set()).add(req_cn)
-                uses_by_req.setdefault(req_cn, set()).add(dist_cn)
-
-        for d in sorted(dists):
-            if not uses_by_req.get(d):
-                print(d)
-
     @ap.command(
         ap.arg('files', nargs='*'),
         ap.arg('-r', '--follow-requirements', action='store_true'),

{omdev-0.0.0.dev112.dist-info → omdev-0.0.0.dev114.dist-info}/METADATA

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

{omdev-0.0.0.dev112.dist-info → omdev-0.0.0.dev114.dist-info}/RECORD

@@ -1,12 +1,13 @@
-omdev/.manifests.json,sha256=CttiykwDkNVtWsqk7xCLY0o7eUxPVTJvfS5enx6xg5g,7479
+omdev/.manifests.json,sha256=asjeEXptONz5RkbuMIgHMDGB8QlWRazdWpFEVMznbPM,7479
 omdev/__about__.py,sha256=n5x-SO70OgbDQFzQ1d7sZDVMsnkQc4PxQZPFaIQFa0E,1281
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/bracepy.py,sha256=I8EdqtDvxzAi3I8TuMEW-RBfwXfqKbwp06CfOdj3L1o,2743
 omdev/classdot.py,sha256=YOvgy6x295I_8NKBbBlRVd3AN7Osirm_Lqt4Wj0j9rY,1631
 omdev/cmake.py,sha256=Diy2ry65806dQP125DAstD3w46z_wszMH7PwC2-6iik,4578
 omdev/findimports.py,sha256=2t8QP852saEEJFeXySEzhi_nxRSxghlkXz2jVdvy08M,2392
-omdev/git.py,sha256=riM2KqSpQPC3N89uipd7Vm3kVgv4EYYDBU9tV1Z8juM,2208
+omdev/git.py,sha256=B3gnqL75OZqwMvANdZL3cyah6izdM5bZfPJhG134lD0,10520
 omdev/imgur.py,sha256=il12R3t19tALolteYCZywvcdQUEOcgvPyUYgWtKiqt4,2993
+omdev/pip.py,sha256=gRg07NCEjTquOQwnKKgXqfn_YGElO5Pi7hmrAh-AVvQ,2105
 omdev/revisions.py,sha256=U657hf4zeEN32y3g4CzqCAodx_HlfkHj2cIIKALNFDo,5009
 omdev/secrets.py,sha256=bcquaBIDKqX4UIKOzUuKrX7nxVCenj67rRHIMIrd9bk,540
 omdev/tokens.py,sha256=GusxQ1Cd_eiScuR8XTTtc9QFhOgYviYGBZmFnn3Hj7s,756
@@ -60,7 +61,7 @@ omdev/cexts/_distutils/compilers/unixccompiler.py,sha256=o1h8QuyupLntv4F21_XjzAZ
 omdev/cli/__init__.py,sha256=V_l6VP1SZMlJbO-8CJwSuO9TThOy2S_oaPepNYgIrbE,37
 omdev/cli/__main__.py,sha256=mOJpgc07o0r5luQ1DlX4tk2PqZkgmbwPbdzJ3KmtjgQ,138
 omdev/cli/_pathhack.py,sha256=kxqb2kHap68Lkh8b211rDbcgj06hidBiAKA3f9posyc,2119
-omdev/cli/clicli.py,sha256=oD54mXX-j9UeeCIW2640m8ip5LtAqQvT0hJRbl1zmf8,2874
+omdev/cli/clicli.py,sha256=OOxlCg7yoV1f8X9MUzl-k26p3PRSqJmGD6TrimYPFv8,2923
 omdev/cli/install.py,sha256=C-W171YlIHt4Cfok-nWSMbHwWhqF_PFqq2HixFttYx8,4460
 omdev/cli/main.py,sha256=nD3bW3MkI0KuDSLpX_PTnl-lBnm4hIxVqczvvMHtupo,7058
 omdev/cli/managers.py,sha256=BV98_n30Jj63OJrFgRoVZRfICxMLXEZKoEn4rMj9LV4,1160
@@ -108,7 +109,7 @@ omdev/ptk/apps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/ptk/apps/ncdu.py,sha256=dOkEJoc2Wjv1u_Uge7Vpei_LvXldoPP5833Eia355tc,4548
 omdev/pycharm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/pycharm/__main__.py,sha256=hUPp11D024eMdT86BxXiRVtF7AGBk5W6Zn8_mEHSksY,163
-omdev/pycharm/cli.py,sha256=XDR3fYUnGdK2oys3IKs7QrGbYwXUiMba16DNXdMVlAA,2209
+omdev/pycharm/cli.py,sha256=WyUlFuG4jAmd7pB5tnZJ54FH1y1orDX3sjB1EWgbmmQ,2343
 omdev/pyproject/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/pyproject/__main__.py,sha256=gn3Rl1aYPYdiTtEqa9ifi0t-e4ZwPY0vhJ4UXvYdJDY,165
 omdev/pyproject/cexts.py,sha256=x13piOOnNrYbA17qZLDVuR0p1sqhgEwpk4FtImX-klM,4281
@@ -122,7 +123,7 @@ omdev/scripts/execrss.py,sha256=mR0G0wERBYtQmVIn63lCIIFb5zkCM6X_XOENDFYDBKc,651
 omdev/scripts/exectime.py,sha256=sFb376GflU6s9gNX-2-we8hgH6w5MuQNS9g6i4SqJIo,610
 omdev/scripts/importtrace.py,sha256=Jbo3Yk2RAbE8_tJ97iTcVNpoxCJxrRb2tl1W_CV3NG0,14067
 omdev/scripts/interp.py,sha256=U6mU2RPZjwcBhn4Vl4SrAyDUFcf7bBxBnPY5FHCxosw,72496
-omdev/scripts/pyproject.py,sha256=RNWsO9-cu6MUXuWFT1Y200euUu6WcAC4orwGEUoGVWA,165526
+omdev/scripts/pyproject.py,sha256=e2Ncxiju1GinYaXa_PJ3qAyiOApWepS-_uWjcKcJwtw,173682
 omdev/scripts/slowcat.py,sha256=lssv4yrgJHiWfOiHkUut2p8E8Tq32zB-ujXESQxFFHY,2728
 omdev/scripts/tmpexec.py,sha256=WTYcf56Tj2qjYV14AWmV8SfT0u6Y8eIU6cKgQRvEK3c,1442
 omdev/toml/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
@@ -131,20 +132,20 @@ omdev/toml/writer.py,sha256=lk3on3YXVbWuLJa-xsOzOhs1bBAT1vXqw4mBbluZl_w,3040
 omdev/tools/__init__.py,sha256=iVJAOQ0viGTQOm0DLX4uZLro-9jOioYJGLg9s0kDx1A,78
 omdev/tools/doc.py,sha256=mv9XfitzqXl3vFHSenv01xHCxWf8g03rUAb_sqoty98,2556
 omdev/tools/docker.py,sha256=k2BrVvFYwyGov064CPHd_HWo9aqR1zHc2UeEsVwPth4,6827
-omdev/tools/git.py,sha256=IARrfL9R9BHpmTBia3svbPeCzf_4qlCCbOsLpohsfUI,4184
+omdev/tools/git.py,sha256=sj3I8chXVzcZQyBIP8trq5_96EOXNTmu5YPOWePkR9A,5995
 omdev/tools/importscan.py,sha256=QeGjR3UGcuuuDUiisFuAXWHlcKJScGxGEcU6tfOh2CM,4069
 omdev/tools/mkrelimp.py,sha256=wsJAjTIf3nqcSfnT9TkDpS1VUOoM9W2Az5tZdWuzyLM,4054
 omdev/tools/notebook.py,sha256=M8Xi_gfZdlahnyFLtp0RBgYZPSHWQStMMDYZc71Zync,3494
-omdev/tools/pip.py,sha256=_O7WAACQ1F1ffH4ogZHcppT4P8VQxWQchJMLn9FvsJc,5073
+omdev/tools/pip.py,sha256=cRYKRCjuMI9SR1CBORBbOCePyildLiCIMCECvBDY61E,3471
 omdev/tools/prof.py,sha256=8ZU9x_Dq8eT2ZFwU9sJpDIvxcIn9qBc8y2ELKPb5e5M,1382
 omdev/tools/qr.py,sha256=tm68lPwEAkEwIL2sUKPKBYfwwPtjVWG1DBZwur8_jY8,1737
 omdev/tools/sqlrepl.py,sha256=tmFZh80-xsGM62dyQ7_UGLebChrj7IHbIPYBWDJMgVk,5741
 omdev/tools/pawk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/pawk/__main__.py,sha256=VCqeRVnqT1RPEoIrqHFSu4PXVMg4YEgF4qCQm90-eRI,66
 omdev/tools/pawk/pawk.py,sha256=Eckymn22GfychCQcQi96BFqRo_LmiJ-EPhC8TTUJdB4,11446
-omdev-0.0.0.dev112.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev112.dist-info/METADATA,sha256=VeCQ5RyISLmbtXUOxqiBvvzJW3kHbcsb8l6KjNrg0C8,1810
-omdev-0.0.0.dev112.dist-info/WHEEL,sha256=a7TGlA-5DaHMRrarXjVbQagU3Man_dCnGIWMJr5kRWo,91
-omdev-0.0.0.dev112.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev112.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev112.dist-info/RECORD,,
+omdev-0.0.0.dev114.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev114.dist-info/METADATA,sha256=AuvmLYtU1KklORHYLnpp8MhgEiwN4CPvzsiuxKhdwkQ,1810
+omdev-0.0.0.dev114.dist-info/WHEEL,sha256=a7TGlA-5DaHMRrarXjVbQagU3Man_dCnGIWMJr5kRWo,91
+omdev-0.0.0.dev114.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev114.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev114.dist-info/RECORD,,