robotcode-plugin 2.8.0.dev677__py3-none-any.whl → 2.9.0.dev51__py3-none-any.whl

robotcode/plugin/__init__.py

@@ -41,6 +41,7 @@ __all__ = [
     "UnknownError",
     "hookimpl",
     "pass_application",
+    "show_error",
 ]
 
 F = TypeVar("F", bound=Callable[..., Any])
@@ -83,6 +84,8 @@ class CommonConfig:
     colored_output: ColoredOutput = ColoredOutput.AUTO
     default_paths: Optional[Sequence[str]] = None
     launcher_script: Optional[str] = None
+    wrapper: Optional[str] = None
+    no_wrapper: bool = False
     output_format: Optional[OutputFormat] = None
     pager: Optional[bool] = None
     log_enabled: bool = False
@@ -528,4 +531,27 @@ class Application:
             sys.path = self._syspath
 
 
+def show_error(app: Application, error: click.ClickException, file: Optional[IO[Any]] = None) -> None:
+    """Write a Click error as robotcode writes the errors it reports, `[ ERROR ] <message>`
+    (`Application.error`), instead of Click's `Error: <message>`.
+
+    A usage error with a context gets Click's usage line and hint to `--help` first. An
+    error that writes itself in a form of its own, such as Click's help for a command
+    called without arguments, is written by its `show`.
+    """
+    if type(error).show not in (click.ClickException.show, click.UsageError.show):
+        error.show(file)
+        return
+
+    if isinstance(error, click.UsageError) and error.ctx is not None:
+        ctx = error.ctx
+        hint = ""
+        if ctx.command.get_help_option(ctx) is not None:
+            help_option = max(ctx.command.get_help_option_names(ctx), key=len)
+            hint = f"Try '{ctx.command_path} {help_option}' for help.\n"
+        click.echo(f"{ctx.get_usage()}\n{hint}", file=file, err=True, color=ctx.color)
+
+    app.error(error.format_message(), file=file)
+
+
 pass_application = click.make_pass_decorator(Application, ensure=True)

robotcode/plugin/__version__.py

@@ -1 +1 @@
-__version__ = "2.8.0-dev.677"
+__version__ = "2.9.0-dev.51"

robotcode/plugin/click_helper/wrappable.py

@@ -1,5 +1,14 @@
+import os
+import shlex
+import subprocess
+import sys
+from typing import TYPE_CHECKING, Any, Optional, Sequence
+
 import click
 
+if TYPE_CHECKING:
+    from robotcode.plugin import Application
+
 # Set in the environment once a wrapper has been applied to the process tree.
 # Prevents infinite re-exec recursion and lets an outer layer (e.g. the VS Code
 # debug launcher applying its own wrapper) suppress the CLI/profile re-exec.
@@ -16,6 +25,12 @@ def wrappable(cmd: click.Command) -> click.Command:
     example, need to run inside a specific X11/Wayland session). Commands that
     do not execute Robot Framework - language server, discovery, libdoc, … -
     must NOT be marked.
+
+    The re-execution happens when the command loads its configuration with
+    `load_robot_profile` or `handle_robot_options` of `robotcode.runner.cli.robot`,
+    so a marked command must do that first, before it starts a server, an
+    interpreter or a debugger. A marked command that loads its configuration in
+    another way runs without the wrapper.
     """
     setattr(cmd, _WRAPPABLE_ATTR, True)
     return cmd
@@ -24,3 +39,72 @@ def wrappable(cmd: click.Command) -> click.Command:
 def is_wrappable(cmd: click.Command) -> bool:
     """Return whether `cmd` was marked with :func:`wrappable`."""
     return bool(getattr(cmd, _WRAPPABLE_ATTR, False))
+
+
+def invoked_command_is_wrappable(ctx: click.Context) -> bool:
+    """Return whether the command that the root group invokes is marked with :func:`wrappable`.
+
+    A command that such a command runs itself, such as `robot` in `debug`, belongs to it.
+    """
+    root = ctx.find_root()
+    sub_name = root.invoked_subcommand
+    if not sub_name or not isinstance(root.command, click.Group):
+        return False
+    # Aliases resolve to the same command object, so this is alias-safe and needs
+    # no central name list.
+    sub_cmd = root.command.get_command(root, sub_name)
+    return sub_cmd is not None and is_wrappable(sub_cmd)
+
+
+def run_under_wrapper(app: "Application", profile_wrapper: Optional[Sequence[Any]]) -> None:
+    """Re-execute this process through the configured ``wrapper`` command.
+
+    A wrappable command calls this once it has loaded its configuration, before it
+    starts anything. ``--wrapper`` overrides the ``wrapper`` of the profile
+    (``profile_wrapper``); ``--no-wrapper`` disables wrapping for this run. The
+    guard env var prevents infinite recursion and lets an outer layer suppress the
+    re-exec by setting it itself. Returns when no wrapper applies or for a dry run.
+    """
+    if app.config.no_wrapper or os.environ.get(WRAPPER_APPLIED_ENV):
+        return
+
+    # `--wrapper` overrides the profile's `wrapper`. The evaluated profile turns
+    # StringExpression entries into plain strings.
+    if app.config.wrapper:
+        wrapper = shlex.split(app.config.wrapper)
+    elif profile_wrapper:
+        wrapper = [str(w) for w in profile_wrapper]
+    else:
+        return
+
+    # A dry run must not start the wrapper: it would set up and tear down the
+    # real environment. Show it instead; the command itself then prints its own
+    # dry-run output.
+    if app.config.dry:
+        app.echo(f"Dry run, not executing the wrapper. Would run robotcode under: {' '.join(wrapper)}")
+        return
+
+    # Rebuild the invocation the way this process was actually started, so the
+    # re-exec finds robotcode even when it runs from a bundled path (VS Code) and
+    # is not installed in the interpreter. `launcher_script` is set only when we
+    # were started through a bundled entry (its `__main__` sets it) or an explicit
+    # `--launcher-script`; otherwise robotcode is importable directly and
+    # `-m robotcode.cli` is correct. We deliberately do NOT consult the
+    # ROBOTCODE_BUNDLED_ROBOTCODE_MAIN env var: VS Code sets it in every terminal,
+    # so a directly started robotcode would be diverted to the bundled copy.
+    # Mirrors the debug launcher's `debugger_script` handling.
+    entry = [str(app.config.launcher_script)] if app.config.launcher_script else ["-m", "robotcode.cli"]
+    command = [*wrapper, sys.executable, *entry, *sys.argv[1:]]
+    app.verbose(lambda: "Running under wrapper: " + " ".join(command))
+
+    # Run robotcode again under the wrapper; the guard env stops the spawned
+    # robotcode from wrapping a second time. On POSIX we replace this process with
+    # execvp (no extra process); Windows has no such exec, so there we spawn the
+    # command, wait, and forward its exit code.
+    os.environ[WRAPPER_APPLIED_ENV] = "1"
+    try:
+        if sys.platform == "win32":
+            sys.exit(subprocess.run(command).returncode)
+        os.execvp(command[0], command)
+    except OSError as e:
+        raise click.ClickException(f"Failed to execute wrapper command {wrapper!r}: {e}") from e

{robotcode_plugin-2.8.0.dev677.dist-info → robotcode_plugin-2.9.0.dev51.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: robotcode-plugin
-Version: 2.8.0-dev.677
+Version: 2.9.0-dev.51
 Summary: Some classes for RobotCode plugin management
 Project-URL: Donate, https://opencollective.com/robotcode
 Project-URL: Documentation, https://github.com/robotcodedev/robotcode#readme

{robotcode_plugin-2.8.0.dev677.dist-info → robotcode_plugin-2.9.0.dev51.dist-info}/RECORD

@@ -1,5 +1,5 @@
-robotcode/plugin/__init__.py,sha256=GZc3LUHnoIcvYlSZjS1zA1SV0p1WY4GWwkN89QVIKgw,17381
-robotcode/plugin/__version__.py,sha256=0xyLlet74gxp40f05fA-fjXhAr2XdtEik3UuIJs6yAM,30
+robotcode/plugin/__init__.py,sha256=h6lXt0W8_c72vw6M4GY_0pFEZuBbFSvf6ZPAoCK5n00,18546
+robotcode/plugin/__version__.py,sha256=68lI1Ud2IVxiSKwJTXlHsfwV7s6ASsCia4CPMEdJ8Ls,29
 robotcode/plugin/_agent_detection.py,sha256=PVsBAxy_Xn_uefTBpBAGE-q3Z5CUxbhwp_z4Dcb_RL4,3606
 robotcode/plugin/manager.py,sha256=ARNXtSbQTRktsbNQGLeU1fwtsK7GdstHa6OJaXuadrU,1098
 robotcode/plugin/py.typed,sha256=bWew9mHgMy8LqMu7RuqQXFXLBxh2CRx0dUbSx-3wE48,27
@@ -8,7 +8,7 @@ robotcode/plugin/click_helper/aliases.py,sha256=NJZKyF6GOro52fjp728OZfqZ9EptNhiJ
 robotcode/plugin/click_helper/exit_codes.py,sha256=k5ih_20gKkuEWpOhyig2_g11ZywrjPoiZHzH9pV2obs,854
 robotcode/plugin/click_helper/options.py,sha256=eAU05TfOq93wVWkiYqw7BV6RrXAp1xw9jT6DsPRdZ_Y,11430
 robotcode/plugin/click_helper/types.py,sha256=UAno_G-0uNdPfapGCvECwd0yghdEZXMMv4DIlUAKKsw,3679
-robotcode/plugin/click_helper/wrappable.py,sha256=28FzkR4OO5lSi3_e35AKKZHQD2fD7Dr1DM4xkI_PrPg,1009
-robotcode_plugin-2.8.0.dev677.dist-info/METADATA,sha256=68GL39gjhjYVYcExbiGgFHJLNDkzBxBr10bDMJwJ-Tc,2844
-robotcode_plugin-2.8.0.dev677.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-robotcode_plugin-2.8.0.dev677.dist-info/RECORD,,
+robotcode/plugin/click_helper/wrappable.py,sha256=dYC6hYvtPRnjDzC-k7fiIsgoLRnwS-ACLWf0COnMPl4,5009
+robotcode_plugin-2.9.0.dev51.dist-info/METADATA,sha256=SqmX5dBAKwhQ44AEiSm2HTcFdglm_RWBTaZgKtjir1c,2843
+robotcode_plugin-2.9.0.dev51.dist-info/WHEEL,sha256=2iZrJkDIkeDh0k9SikKMqFuRP-ua6mb4Ir1AsER4BEw,87
+robotcode_plugin-2.9.0.dev51.dist-info/RECORD,,

{robotcode_plugin-2.8.0.dev677.dist-info → robotcode_plugin-2.9.0.dev51.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.32.4
+Generator: hatchling 1.33.0
 Root-Is-Purelib: true
 Tag: py3-none-any