jdkman 0.2.2__tar.gz → 0.2.4__tar.gz

{jdkman-0.2.2 → jdkman-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: jdkman
-Version: 0.2.2
+Version: 0.2.4
 Summary: A command-line tool for installing and managing OpenJDK distributions.
 Author: junghun.song
 Author-email: junghun.song <xunyss@gmail.com>

{jdkman-0.2.2 → jdkman-0.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "jdkman"
-version = "0.2.2"
+version = "0.2.4"
 description = "A command-line tool for installing and managing OpenJDK distributions."
 authors = [{name = "junghun.song", email = "xunyss@gmail.com"}]
 readme = "README.md"

jdkman-0.2.4/src/jdkman/autocomplete.py

@@ -0,0 +1,11 @@
+from jdkman.catalog import fetch_slugs
+from jdkman.registry import get_installed
+
+
+def autocomplete_installed(incomplete: str):
+    return list(get_installed(sort=True).keys())
+
+
+def autocomplete_slugs(incomplete: str):
+    return list(fetch_slugs(sort=True).keys())
+

{jdkman-0.2.2 → jdkman-0.2.4}/src/jdkman/cli.py

@@ -3,12 +3,13 @@ from typing import Annotated, cast
 import click
 import typer
 
+from .autocomplete import autocomplete_installed, autocomplete_slugs
 from .cli_dev import app as dev_app
 from .cli_tools import app as tools_app
 from .config import APP_VERSION, is_dev, FORCE_VERBOSE, init_dirs
 from .console import (
     update_state, log, out, table,
-    GREEN_CHECK, ORANGE_WARNING, RED_WARNING, ARGUMENT_SLUG,
+    GREEN_CHECK, ORANGE_WARNING, RED_WARNING,
     st_emp, st_div, st_nor
 )
 from .installer import install_jvm, uninstall_jvm, upgrade_jvm
@@ -16,9 +17,8 @@ from .registry import list_vendors, get_slugs, get_outdated, cleanup_cache, get_
 
 
 app = typer.Typer(
-    add_completion=False,
-    suggest_commands=True,
-    rich_markup_mode="rich",
+    add_completion=True,
+    pretty_exceptions_enable=is_dev()
 )
 app.add_typer(
     tools_app
@@ -186,7 +186,13 @@ def outdated():
 @app.command(name="setup", hidden=True, no_args_is_help=True)
 @app.command(name="add", hidden=True, no_args_is_help=True)
 @app.command(no_args_is_help=True)
-def install(distro: ARGUMENT_SLUG):
+def install(
+        distro: Annotated[str, typer.Argument(
+            metavar="<DISTRO>",
+            help="JVM distribution name to install. (e.g. zulu-21, temurin-17)",
+            autocompletion=autocomplete_slugs
+        )]
+):
     """
     Install a JVM distribution.  \\[aliases: setup, add]
 
@@ -204,7 +210,13 @@ def install(distro: ARGUMENT_SLUG):
 @app.command(name="remove", hidden=True, no_args_is_help=True)
 @app.command(name="rm", hidden=True, no_args_is_help=True)
 @app.command(no_args_is_help=True)
-def uninstall(distro: ARGUMENT_SLUG):
+def uninstall(
+        distro: Annotated[str, typer.Argument(
+            metavar="<DISTRO>",
+            help="JVM distribution name to uninstall. (e.g. zulu-21, temurin-17)",
+            autocompletion=autocomplete_installed
+        )]
+):
     """
     Remove an installed JVM distribution.  \\[aliases: remove, rm]
 
@@ -221,7 +233,13 @@ def uninstall(distro: ARGUMENT_SLUG):
 
 @app.command(name="update", hidden=True, no_args_is_help=True)
 @app.command(no_args_is_help=True)
-def upgrade(distro: ARGUMENT_SLUG):
+def upgrade(
+        distro: Annotated[str, typer.Argument(
+            metavar="<DISTRO>",
+            help="JVM distribution name to upgrade. (e.g. zulu-21, temurin-17)",
+            autocompletion=autocomplete_installed
+        )]
+):
     """
     Upgrade an installed JVM distribution.  \\[aliases: update]
 

{jdkman-0.2.2 → jdkman-0.2.4}/src/jdkman/cli_dev.py

@@ -1,10 +1,12 @@
 from collections import defaultdict
+from typing import Annotated
 
 import typer
 
+from .autocomplete import autocomplete_slugs
 from .catalog import fetch_artifacts
 from .config import CACHE_DIR
-from .console import ARGUMENT_SLUG, st_emp, st_nor
+from .console import st_emp, st_nor
 from .console import out, log, GREEN_CHECK
 from .detect import scan_unmanaged
 from .installer import download_jvm
@@ -55,7 +57,13 @@ def diff():
 
 
 @app.command()
-def download(distro: ARGUMENT_SLUG):
+def download(
+        distro: Annotated[str, typer.Argument(
+            metavar="<DISTRO>",
+            help="JVM distribution name to download. (e.g. zulu-21, temurin-17)",
+            autocompletion=autocomplete_slugs
+        )]
+):
     """
     download_jvm(get_dist(distro))
     """
@@ -67,7 +75,13 @@ def download(distro: ARGUMENT_SLUG):
 
 
 @app.command()
-def slug(distro: ARGUMENT_SLUG):
+def slug(
+        distro: Annotated[str, typer.Argument(
+            metavar="<DISTRO>",
+            help="JVM distribution name to get detail information. (e.g. zulu-21, temurin-17)",
+            autocompletion=autocomplete_slugs
+        )]
+):
     """
     get_slug(distro)
     """

{jdkman-0.2.2 → jdkman-0.2.4}/src/jdkman/cli_tools.py

@@ -2,6 +2,7 @@ from typing import Annotated
 
 import typer
 
+from .autocomplete import autocomplete_installed
 from .config import is_macos
 from .console import out, log, table, GREEN_CHECK, st_nor
 from .detect import exec_java_home
@@ -40,7 +41,8 @@ if is_macos():
 @app.command(rich_help_panel="Tools")
 def mise(
         distro: Annotated[str, typer.Argument(
-            help="JVM distribution name to register as a mise symlink. (omit to list)"
+            help="JVM distribution name to register as a mise symlink. (omit to list)",
+            autocompletion=autocomplete_installed
         )] = None
 ):
     """

{jdkman-0.2.2 → jdkman-0.2.4}/src/jdkman/config.py

@@ -65,6 +65,7 @@ INSTALL_DIR = Path.home() / "Library" / "Java" / "JavaVirtualMachines" if is_mac
 MANAGED_JVM_DB = INSTALL_DIR / f".{APP_NAME}"
 
 CUSTOM_STYLE_HELP = True
+CUSTOM_STYLE_ERROR = True
 CUSTOM_STYLE_TABLE = True
 
 # debugging

{jdkman-0.2.2 → jdkman-0.2.4}/src/jdkman/console.py

@@ -1,12 +1,13 @@
-from typing import Any, Annotated
+import os
+from typing import Any
 
 import rich.box
-import typer
 from rich.console import Console
 from rich.table import Table
 from rich.text import Text
 
-from .config import CUSTOM_STYLE_HELP, CUSTOM_STYLE_TABLE
+from .config import CUSTOM_STYLE_HELP, CUSTOM_STYLE_ERROR, CUSTOM_STYLE_TABLE
+from .style.format_error import ErrorFormatter
 from .style.format_help import HelpFormatter
 
 
@@ -27,6 +28,12 @@ if CUSTOM_STYLE_HELP:
     HelpFormatter(
         section_header_style="bold yellow",
         section_order=["commands", "arguments", "options"],
+        hidden_options={"--install-completion", "--show-completion"},
+    ).apply()
+
+if CUSTOM_STYLE_ERROR:
+    ErrorFormatter(
+        header_style="bold red",
     ).apply()
 
 
@@ -45,7 +52,7 @@ def out(*objs: Any, **kwargs: Any):
 
 
 def log(*objs: Any, **kwargs: Any):
-    if not _state["verbose"]:
+    if not _state["verbose"] or "_JDK_COMPLETE" in os.environ:
         return
     prefix = Text.from_markup("[italic bright_black]verbose[/italic bright_black] ")
     with _log_console.capture() as capture:
@@ -60,18 +67,13 @@ GREEN_CHECK = "[green]:heavy_check_mark:[/green]"
 ORANGE_WARNING = "[orange3]:warning:[/orange3]"
 RED_WARNING = "[red]:exclamation_question_mark:[/red]"
 
-def st_emp(txt: str) -> str:
-    return f"[yellow]{txt}[/yellow]"
-
-def st_div(txt: str) -> str:
-    return f"[cyan]{txt}[/cyan]"
 
-def st_nor(txt: str) -> str:
-    return f"[grey70]{txt}[/grey70]"
+def st_emp(content: Any) -> str:
+    return f"[yellow]{content}[/yellow]"
 
+def st_div(content: Any) -> str:
+    return f"[cyan]{content}[/cyan]"
 
-ARGUMENT_SLUG = Annotated[str, typer.Argument(
-    metavar="<DISTRO>",
-    help="JVM distribution name. (e.g. zulu-21, temurin-17)"
-)]
+def st_nor(content: Any) -> str:
+    return f"[grey70]{content}[/grey70]"
 

{jdkman-0.2.2 → jdkman-0.2.4}/src/jdkman/registry.py

@@ -93,7 +93,7 @@ def list_editions() -> list[str]:
     log(f"list_editions()")
 
     # mise ls-remote java | grep -o '^[a-zA-Z0-9-]*-[a-zA-Z0-9]*' | sed 's/-[0-9].*//' | sort -u | grep -v '^$'
-    return list(dict.fromkeys(re.sub(r'-\d+$', '', s) for s in fetch_slugs(sort=True).keys()))
+    return list(dict.fromkeys(re.sub(r'-\d+$', '', slug) for slug in fetch_slugs(sort=True).keys()))
 
 
 def get_slugs(include_jre: bool, include_feature: bool, major_version: str | None) -> dict[str, dict[str, Any]]:

jdkman-0.2.4/src/jdkman/style/format_error.py

@@ -0,0 +1,49 @@
+from dataclasses import dataclass
+
+import click
+import typer
+import typer.rich_utils
+from rich.padding import Padding
+from rich.text import Text
+
+
+@dataclass
+class ErrorFormatter:
+    """
+    - No Panel Box for errors
+    """
+    header_style: str = "bold red"
+
+    def apply(self) -> None:
+        """Patch typer globally with this style."""
+        typer.rich_utils.rich_format_error = self._build_formatter()
+
+    def _build_formatter(self):
+        style = self
+
+        def rich_format_error(exc: click.ClickException) -> None:
+            if exc.__class__.__name__ == "NoArgsIsHelpError":
+                return
+
+            _ru = typer.rich_utils
+            # noinspection PyProtectedMember
+            console = _ru._get_rich_console(stderr=True)
+            ctx: click.Context | None = getattr(exc, "ctx", None)
+
+            if ctx is not None:
+                console.print(ctx.get_usage())
+
+            if ctx is not None and ctx.command.get_help_option(ctx) is not None:
+                console.print(
+                    _ru.RICH_HELP.format(
+                        command_path=ctx.command_path,
+                        help_option=ctx.help_option_names[0],
+                    ),
+                    style=_ru.STYLE_ERRORS_SUGGESTION,
+                )
+
+            console.print(Padding(Text(f"{_ru.ERRORS_PANEL_TITLE}:", style=style.header_style), (0, 1, 0, 0)))
+            console.print(Padding(_ru.highlighter(exc.format_message()), (0, 1, 0, 2)))
+
+        return rich_format_error
+

{jdkman-0.2.2 → jdkman-0.2.4}/src/jdkman/style/format_help.py

@@ -27,6 +27,7 @@ class HelpFormatter:
     """
     section_header_style: str = "bold yellow"
     section_order: list[Section] = field(default_factory=lambda: list(_DEFAULT_ORDER))
+    hidden_options: set[str] = field(default_factory=set)
 
     def apply(self) -> None:
         """Patch typer globally with this style."""
@@ -97,6 +98,8 @@ class HelpFormatter:
             for param in obj.get_params(ctx):
                 if getattr(param, "hidden", False):
                     continue
+                if isinstance(param, click.Option) and style.hidden_options.intersection(param.opts):
+                    continue
                 pname = getattr(param, _ru._RICH_HELP_PANEL_NAME, None)
                 if isinstance(param, click.Argument):
                     panel_to_arguments[pname or _ru.ARGUMENTS_PANEL_TITLE].append(param)