omdev 0.0.0.dev270__tar.gz → 0.0.0.dev272__tar.gz

{omdev-0.0.0.dev270/omdev.egg-info → omdev-0.0.0.dev272}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev270
+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.dev270
+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.dev270 → omdev-0.0.0.dev272}/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-0.0.0.dev270 → omdev-0.0.0.dev272}/omdev/cc/cli.py

@@ -43,6 +43,7 @@ from .cdeps import process_marshaled_cdep
 class Cli(ap.Cli):
     @ap.cmd(
         ap.arg('--cwd'),
+        ap.arg('--cc'),
         ap.arg('src-file'),
         ap.arg('args', nargs=ap.REMAINDER),
     )
@@ -96,7 +97,7 @@ class Cli(ap.Cli):
         src_file_name = os.path.basename(src_file)
 
         sh_parts: list[str] = [
-            'clang++',
+            self.args.cc or 'clang++',
         ]
 
         for inc_dir in include_dirs:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev270
+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.dev270
+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.dev270 → omdev-0.0.0.dev272}/omdev.egg-info/requires.txt

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

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