omdev 0.0.0.dev271__py3-none-any.whl → 0.0.0.dev272__py3-none-any.whl

omdev/.manifests.json

@@ -63,7 +63,7 @@
     "module": ".cli.clicli",
     "attr": "_CLI_MODULE",
     "file": "omdev/cli/clicli.py",
-    "line": 156,
+    "line": 168,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "cli",

omdev/cli/clicli.py

@@ -75,6 +75,7 @@ class CliCli(ap.Cli):
     @ap.cmd(
         ap.arg('--url', default=DEFAULT_REINSTALL_URL),
         ap.arg('--local', action='store_true'),
+        ap.arg('--no-deps', action='store_true'),
         ap.arg('extra_deps', nargs='*'),
     )
     def reinstall(self) -> None:
@@ -82,11 +83,11 @@ class CliCli(ap.Cli):
 
         #
 
-        root_dists = get_root_dists()
-        deps = sorted(
-            (set(root_dists) | set(self.args.extra_deps or []))
-            - {install.DEFAULT_CLI_PKG}  # noqa
-        )
+        dep_set: set[str] = set(self.args.extra_deps or [])
+        if not self.args.no_deps:
+            root_dists = get_root_dists()
+            dep_set.update(set(root_dists))
+        deps = sorted(dep_set - {install.DEFAULT_CLI_PKG})  # noqa
 
         #
 
@@ -98,6 +99,7 @@ class CliCli(ap.Cli):
                 'pip',
                 'install',
                 '--dry-run',
+                install.DEFAULT_CLI_PKG,
                 *deps,
             ])
             print('Pip install check successful')
@@ -136,11 +138,21 @@ class CliCli(ap.Cli):
 
         if self.args.local:
             install_src = inspect.getsource(install)
+
         else:
             url = self.args.url
             parsed = urllib.parse.urlparse(url)
             if parsed.scheme not in ('https', 'file'):
                 raise RuntimeError(f'Insecure url schem: {url}')
+
+            reco_cmd = ' '.join([
+                'curl -LsSf',
+                url,
+                '| python3 -',
+                *deps,
+            ])
+            print(f'Recovery command:\n\n{reco_cmd}\n')
+
             with urllib.request.urlopen(urllib.request.Request(url)) as resp:  # noqa
                 install_src = resp.read().decode('utf-8')
 

{omdev-0.0.0.dev271.dist-info → omdev-0.0.0.dev272.dist-info}/METADATA

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

{omdev-0.0.0.dev271.dist-info → omdev-0.0.0.dev272.dist-info}/RECORD

@@ -1,4 +1,4 @@
-omdev/.manifests.json,sha256=Y0n59DYlvNfa1X0cqC5uuzEWvTGTPapn8IogdC_IuxY,10078
+omdev/.manifests.json,sha256=6ctfThA3b81KIbdc0sNzL63fepwPCfqzH7uRp0edxfc,10078
 omdev/__about__.py,sha256=zoyBmj0TF_W82x0PED8gLtrmcYTng6UePKZ_RGiQVGE,1214
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/bracepy.py,sha256=I8EdqtDvxzAi3I8TuMEW-RBfwXfqKbwp06CfOdj3L1o,2743
@@ -101,7 +101,7 @@ omdev/ci/github/inject.py,sha256=Bfu6L6omd80ei1BbmhkCzmgK1GDWPFG1sCSDzwNNrQw,558
 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=UB6K-Hdgi8Y8DP3aXr4wKQfrU-C5iZHScHBC4pZYhmU,3945
+omdev/cli/clicli.py,sha256=b3ZuzsgTIq3-OR90a2R8eI2vNYHr_S53NdLkcttPkxc,4313
 omdev/cli/install.py,sha256=C-W171YlIHt4Cfok-nWSMbHwWhqF_PFqq2HixFttYx8,4460
 omdev/cli/main.py,sha256=dxZFyzKuwRykHHhoKKUA0fUa9QsY0dgdvLHbXNuIPCY,6694
 omdev/cli/managers.py,sha256=BV98_n30Jj63OJrFgRoVZRfICxMLXEZKoEn4rMj9LV4,1160
@@ -254,9 +254,9 @@ omdev/tools/json/rendering.py,sha256=tMcjOW5edfozcMSTxxvF7WVTsbYLoe9bCKFh50qyaGw
 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=zsEkfQX0jF5bn712uqPAyBSdJt2dno1LH2oeSMNfXQI,11424
-omdev-0.0.0.dev271.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev271.dist-info/METADATA,sha256=LqJxd5Jq2MU82gIEFtg7gPZnbIs_rWV46HUC0SoraEc,1658
-omdev-0.0.0.dev271.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-omdev-0.0.0.dev271.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev271.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev271.dist-info/RECORD,,
+omdev-0.0.0.dev272.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev272.dist-info/METADATA,sha256=MXzED4goEK4ZnR5d5caw7-PxnJXkKy13TaaqvN0pLns,1658
+omdev-0.0.0.dev272.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+omdev-0.0.0.dev272.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev272.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev272.dist-info/RECORD,,