etlplus 0.4.6__tar.gz → 0.4.7__tar.gz

{etlplus-0.4.6 → etlplus-0.4.7}/.pre-commit-config.yaml

@@ -159,7 +159,11 @@ repos:
     rev: v1.19.0
     hooks:
       - id: mypy
-        args: [--ignore-missing-imports, --install-types, --non-interactive]
+        args:
+          - --cache-dir=.mypy_cache/pre-commit
+          - --ignore-missing-imports
+          - --install-types
+          - --non-interactive
 
   - repo: https://github.com/pycqa/flake8
     rev: 7.3.0

{etlplus-0.4.6/etlplus.egg-info → etlplus-0.4.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: etlplus
-Version: 0.4.6
+Version: 0.4.7
 Summary: A Swiss Army knife for simple ETL operations
 Home-page: https://github.com/Dagitali/ETLPlus
 Author: ETLPlus Team

{etlplus-0.4.6 → etlplus-0.4.7}/etlplus/cli/main.py

@@ -10,10 +10,12 @@ This module exposes :func:`main` for the console script as well as
 from __future__ import annotations
 
 import argparse
+import contextlib
 import sys
 from collections.abc import Sequence
 from typing import Literal
 
+import click
 import typer
 
 from .. import __version__
@@ -68,6 +70,32 @@ class _FormatAction(argparse.Action):
 # SECTION: INTERNAL FUNCTIONS =============================================== #
 
 
+def _add_boolean_flag(
+    parser: argparse.ArgumentParser,
+    *,
+    name: str,
+    help_text: str,
+) -> None:
+    """Add a toggle that also supports the ``--no-`` prefix via 3.13.
+
+    Parameters
+    ----------
+    parser : argparse.ArgumentParser
+        Parser receiving the flag.
+    name : str
+        Primary flag name without leading dashes.
+    help_text : str
+        Help text rendered in ``--help`` output.
+    """
+
+    parser.add_argument(
+        f'--{name}',
+        action=argparse.BooleanOptionalAction,
+        default=False,
+        help=help_text,
+    )
+
+
 def _add_config_option(
     parser: argparse.ArgumentParser,
     *,
@@ -129,32 +157,6 @@ def _add_format_options(
     )
 
 
-def _add_boolean_flag(
-    parser: argparse.ArgumentParser,
-    *,
-    name: str,
-    help_text: str,
-) -> None:
-    """Add a toggle that also supports the ``--no-`` prefix via 3.13.
-
-    Parameters
-    ----------
-    parser : argparse.ArgumentParser
-        Parser receiving the flag.
-    name : str
-        Primary flag name without leading dashes.
-    help_text : str
-        Help text rendered in ``--help`` output.
-    """
-
-    parser.add_argument(
-        f'--{name}',
-        action=argparse.BooleanOptionalAction,
-        default=False,
-        help=help_text,
-    )
-
-
 def _cli_description() -> str:
     return '\n'.join(
         [
@@ -188,6 +190,93 @@ def _cli_epilog() -> str:
     )
 
 
+def _emit_context_help(
+    ctx: click.Context | None,
+) -> bool:
+    """
+    Mirror Click help output for the provided context onto stderr.
+
+    Parameters
+    ----------
+    ctx : click.Context | None
+        The Click context to emit help for.
+
+    Returns
+    -------
+    bool
+        ``True`` when help was emitted, ``False`` when ``ctx`` was ``None``.
+    """
+    if ctx is None:
+        return False
+
+    with contextlib.redirect_stdout(sys.stderr):
+        ctx.get_help()
+    return True
+
+
+def _emit_root_help(
+    command: click.Command,
+) -> None:
+    """
+    Print the root ``etlplus`` help text to stderr.
+
+    Parameters
+    ----------
+    command : click.Command
+        The root Typer/Click command.
+    """
+    ctx = command.make_context('etlplus', [], resilient_parsing=True)
+    try:
+        _emit_context_help(ctx)
+    finally:
+        ctx.close()
+
+
+def _is_illegal_option_error(
+    exc: click.exceptions.UsageError,
+) -> bool:
+    """
+    Return ``True`` when usage errors stem from invalid options.
+
+    Parameters
+    ----------
+    exc : click.exceptions.UsageError
+        The usage error to inspect.
+
+    Returns
+    -------
+    bool
+        ``True`` when the error indicates illegal options.
+    """
+    return isinstance(
+        exc,
+        (
+            click.exceptions.BadOptionUsage,
+            click.exceptions.NoSuchOption,
+        ),
+    )
+
+
+def _is_unknown_command_error(
+    exc: click.exceptions.UsageError,
+) -> bool:
+    """
+    Return ``True`` when a :class:`UsageError` indicates bad subcommand.
+
+    Parameters
+    ----------
+    exc : click.exceptions.UsageError
+        The usage error to inspect.
+
+    Returns
+    -------
+    bool
+        ``True`` when the error indicates an unknown command.
+    """
+    message = getattr(exc, 'message', None) or str(exc)
+    return message.startswith('No such command ')
+
+
 # SECTION: FUNCTIONS ======================================================== #
 
 
@@ -422,6 +511,9 @@ def main(
 
     Raises
     ------
+    click.exceptions.UsageError
+        Re-raises Typer/Click usage errors after printing help for unknown
+        commands.
     SystemExit
         Re-raises SystemExit exceptions to preserve exit codes.
 
@@ -442,6 +534,19 @@ def main(
         )
         return int(result or 0)
 
+    except click.exceptions.UsageError as exc:
+        if _is_unknown_command_error(exc):
+            typer.echo(f'Error: {exc}', err=True)
+            _emit_root_help(command)
+            return int(getattr(exc, 'exit_code', 2))
+        if _is_illegal_option_error(exc):
+            typer.echo(f'Error: {exc}', err=True)
+            if not _emit_context_help(exc.ctx):
+                _emit_root_help(command)
+            return int(getattr(exc, 'exit_code', 2))
+
+        raise
+
     except typer.Exit as exc:
         return int(exc.exit_code)
 

{etlplus-0.4.6 → etlplus-0.4.7/etlplus.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: etlplus
-Version: 0.4.6
+Version: 0.4.7
 Summary: A Swiss Army knife for simple ETL operations
 Home-page: https://github.com/Dagitali/ETLPlus
 Author: ETLPlus Team

{etlplus-0.4.6 → etlplus-0.4.7}/tests/unit/cli/test_u_cli_main.py

@@ -60,6 +60,7 @@ class TestCreateParser:
 
     def test_extract_parser_sets_handler_and_format_flag(self) -> None:
         """Extract parser should bind handlers and flag explicit formats."""
+        # pylint: disable=protected-access
 
         parser = cli_main_module.create_parser()
         namespace = parser.parse_args(
@@ -74,7 +75,6 @@ class TestCreateParser:
 
     def test_list_parser_supports_boolean_flags(self) -> None:
         """List parser should surface boolean flag wiring."""
-
         parser = cli_main_module.create_parser()
         namespace = parser.parse_args(
             ['list', '--config', 'pipelines.yml', '--targets', '--transforms'],
@@ -95,7 +95,6 @@ class TestMain:
         monkeypatch: pytest.MonkeyPatch,
     ) -> None:
         """Test that the command return value is normalized into an ``int``."""
-
         captured: dict[str, object] = {}
 
         def _action(**kwargs: object) -> object:
@@ -161,7 +160,8 @@ class TestMain:
         monkeypatch: pytest.MonkeyPatch,
     ) -> None:
         """
-        ``typer.Abort`` should surface as a generic failure (exit code 1).
+        Test that ``typer.Abort`` propagates as a generic failure (exit code
+        1).
         """
 
         def _action(**kwargs: object) -> object:  # noqa: ARG001
@@ -175,7 +175,7 @@ class TestMain:
         self,
         monkeypatch: pytest.MonkeyPatch,
     ) -> None:
-        """``typer.Exit`` should propagate its exit code."""
+        """Test that ``typer.Exit`` propagates its exit code."""
 
         def _action(**kwargs: object) -> object:  # noqa: ARG001
             raise typer.Exit(17)
@@ -188,14 +188,52 @@ class TestMain:
         """Test that no args prints help and exits with exit code 0."""
         assert cli_main([]) == 0
 
+    def test_unknown_subcommand_emits_usage(
+        self,
+        capsys: pytest.CaptureFixture[str],
+    ) -> None:
+        """Test that illegal subcommands show help and exit with code 2."""
+        exit_code = cli_main(['definitely-not-real'])
+        captured = capsys.readouterr()
+
+        assert exit_code == 2
+        assert 'No such command' in captured.err
+        assert 'Usage:' in captured.err
+
+    def test_unknown_root_option_emits_usage(
+        self,
+        capsys: pytest.CaptureFixture[str],
+    ) -> None:
+        """Test that Unknown root options echo usage details to stderr."""
+
+        exit_code = cli_main(['--definitely-not-real-option'])
+        captured = capsys.readouterr()
+
+        assert exit_code == 2
+        assert 'No such option' in captured.err
+        assert 'Usage:' in captured.err
+
+    def test_unknown_subcommand_option_emits_usage(
+        self,
+        capsys: pytest.CaptureFixture[str],
+    ) -> None:
+        """Test that unknown subcommand options surface usage help."""
+
+        exit_code = cli_main(['extract', '--definitely-not-real-option'])
+        captured = capsys.readouterr()
+
+        assert exit_code == 2
+        assert 'No such option' in captured.err
+        assert 'Usage:' in captured.err
+
     def test_value_error_returns_exit_code_1(
         self,
         monkeypatch: pytest.MonkeyPatch,
         capsys: pytest.CaptureFixture[str],
     ) -> None:
         """
-        Test that :class:`ValueError` from a command maps to exit code 1."""
-
+        Test that :class:`ValueError` from a command maps to exit code 1.
+        """
         monkeypatch.setattr(
             cli_app_module,
             'cmd_extract',