omdev 0.0.1__tar.gz → 0.0.2__tar.gz

{omdev-0.0.1/omdev.egg-info → omdev-0.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.1
+Version: 0.0.2
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.1
+Requires-Dist: omlish==0.0.2
 Provides-Extra: all
 Requires-Dist: black~=26.3; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"

{omdev-0.0.1 → omdev-0.0.2}/omdev/.omlish-manifests.json

@@ -39,7 +39,7 @@
     "module": ".cli.clicli",
     "attr": "_CLI_MODULE",
     "file": "omdev/cli/clicli.py",
-    "line": 263,
+    "line": 322,
     "value": {
       "!.cli.types.CliModule": {
         "name": "cli",

{omdev-0.0.1 → omdev-0.0.2}/omdev/cli/clicli.py

@@ -90,6 +90,69 @@ class CliCli(ap.Cli):
 
     #
 
+    def _build_deps(
+            self,
+            *,
+            no_deps: bool = False,
+            extra_deps: ta.Sequence[str] | None = None,
+    ) -> ta.Sequence[str]:
+        dep_set: set[str] = set(extra_deps or [])
+        if not no_deps:
+            root_dists = get_root_dists()
+            dep_set.update(set(root_dists))
+        return sorted(dep_set - {install.DEFAULT_CLI_PKG})
+
+    @ap.cmd(name='deps')
+    def deps_cmd(self) -> None:
+        print('\n'.join(self._build_deps()))
+
+    #
+
+    def _build_recovery_command(
+            self,
+            target_version: str,
+            *,
+            url: str | None = None,
+            deps: ta.Sequence[str] | None = None,
+    ) -> str:
+        if url is None:
+            url = DEFAULT_REINSTALL_URL
+        if deps is None:
+            deps = self._build_deps()
+
+        parsed = urllib.parse.urlparse(url)
+        if parsed.scheme not in ('https', 'file'):
+            raise RuntimeError(f'Insecure url schem: {url}')
+
+        reco_cmd = ' '.join([
+            'curl -LsSf',
+            f"'{url}'" if (qu := shlex.quote(url)) == url else qu,
+            f'| python3 - --version {shlex.quote(target_version)}',
+            *deps,
+        ])
+
+        return reco_cmd
+
+    @ap.cmd(
+        ap.arg('--url', default=DEFAULT_REINSTALL_URL),
+        ap.arg('--no-deps', action='store_true'),
+        ap.arg('--version'),
+        ap.arg('extra_deps', nargs='*'),
+    )
+    def recovery(self) -> None:
+        reco_cmd = self._build_recovery_command(
+            self.args.version or __about__.__version__,
+            url=self.args.url,
+            deps=self._build_deps(
+                no_deps=self.args.no_deps,
+                extra_deps=self.args.extra_deps,
+            ),
+        )
+
+        print(reco_cmd)
+
+    #
+
     @dc.dataclass()
     class ReinstallWouldNotUpgradeError(Exception):
         current_version: str
@@ -136,11 +199,10 @@ class CliCli(ap.Cli):
 
         #
 
-        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
+        deps = self._build_deps(
+            no_deps=self.args.no_deps,
+            extra_deps=self.args.extra_deps,
+        )
 
         #
 
@@ -233,16 +295,13 @@ class CliCli(ap.Cli):
 
         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',
-                f"'{url}'" if (qu := shlex.quote(url)) == url else qu,
-                f'| python3 - --version {shlex.quote(target_version)}',
-                *deps,
-            ])
+
+            reco_cmd = self._build_recovery_command(
+                target_version,
+                url=url,
+                deps=deps,
+            )
+
             print(f'Recovery command:\n\n{reco_cmd}\n')
 
             with urllib.request.urlopen(urllib.request.Request(url)) as resp:  # noqa

{omdev-0.0.1 → omdev-0.0.2}/omdev/cli/install.py

@@ -85,7 +85,6 @@ class UvxInstallManager(InstallManager):
             'uv', 'tool',
             'install',
             '--refresh',
-            '--prerelease=allow',
             f'--python={opts.py_ver}',
             _format_install_cli_pkg(opts),
             *itertools.chain.from_iterable(['--with', e] for e in (opts.extras or [])),

{omdev-0.0.1 → omdev-0.0.2/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.1
+Version: 0.0.2
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.1
+Requires-Dist: omlish==0.0.2
 Provides-Extra: all
 Requires-Dist: black~=26.3; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"

{omdev-0.0.1 → omdev-0.0.2}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.1
+omlish==0.0.2
 
 [all]
 black~=26.3

{omdev-0.0.1 → omdev-0.0.2}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.14'
-version = '0.0.1'
+version = '0.0.2'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,7 +24,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.1',
+    'omlish == 0.0.2',
 ]
 
 [project.optional-dependencies]