diff --git a/.editorconfig b/.editorconfig index 0824f669..37a82a08 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,7 +1,7 @@ root = true [*.{py,pyi,toml,md}] -charset = "utf-8" +charset = utf-8 end_of_line = lf indent_size = 4 indent_style = space diff --git a/docs/guide/commands.rst b/docs/guide/commands.rst index 89177a79..5596db3f 100644 --- a/docs/guide/commands.rst +++ b/docs/guide/commands.rst @@ -46,7 +46,9 @@ The following options are available for all commands: ``lint`` ^^^^^^^^ -Lint one or more paths, and print a list of lint errors. +Lint one or more paths, and print a list of lint errors. If "-" is given as the +first path, then the second given path will be used for configuration lookup +and error messages, and the input read from STDIN. .. code:: console @@ -60,7 +62,10 @@ Lint one or more paths, and print a list of lint errors. ``fix`` ^^^^^^^ -Lint one or more paths, and apply suggested fixes. +Lint one or more paths, and apply suggested fixes. If "-" is given as the +first path, then the second given path will be used for configuration lookup, +the input read from STDIN, and the fixed output printed to STDOUT (ignoring +:attr:`--interactive`). .. code:: console diff --git a/src/fixit/api.py b/src/fixit/api.py index 6fb86933..be1f588b 100644 --- a/src/fixit/api.py +++ b/src/fixit/api.py @@ -4,6 +4,7 @@ # LICENSE file in the root directory of this source tree. import logging +import sys import traceback from functools import partial from pathlib import Path @@ -16,12 +17,14 @@ from .config import collect_rules, generate_config from .engine import LintRunner from .format import format_module -from .ftypes import Config, FileContent, LintViolation, Options, Result +from .ftypes import Config, FileContent, LintViolation, Options, Result, STDIN LOG = logging.getLogger(__name__) -def print_result(result: Result, show_diff: bool = False) -> int: +def print_result( + result: Result, *, show_diff: bool = False, stderr: bool = False +) -> int: """ Print linting results in a simple format designed for human eyes. @@ -44,7 +47,9 @@ def print_result(result: Result, show_diff: bool = False) -> int: if result.violation.autofixable: message += " (has autofix)" click.secho( - f"{path}@{start_line}:{start_col} {rule_name}: {message}", fg="yellow" + f"{path}@{start_line}:{start_col} {rule_name}: {message}", + fg="yellow", + err=stderr, ) if show_diff and result.violation.diff: echo_color_precomputed_diff(result.violation.diff) @@ -53,8 +58,8 @@ def print_result(result: Result, show_diff: bool = False) -> int: elif result.error: # An exception occurred while processing a file error, tb = result.error - click.secho(f"{path}: EXCEPTION: {error}", fg="red") - click.echo(tb.strip()) + click.secho(f"{path}: EXCEPTION: {error}", fg="red", err=stderr) + click.echo(tb.strip(), err=stderr) return True else: @@ -117,6 +122,36 @@ def fixit_bytes( return None +def fixit_stdin( + path: Path, + *, + autofix: bool = False, + options: Optional[Options] = None, +) -> Generator[Result, bool, None]: + """ + Wrapper around :func:`fixit_bytes` for formatting content from STDIN. + + The resulting fixed content will be printed to STDOUT. + + Requires passing a path that represents the filesystem location matching the + contents to be linted. This will be used to resolve the ``fixit.toml`` config + file(s). + """ + path = path.resolve() + + try: + content: FileContent = sys.stdin.buffer.read() + config = generate_config(path, options=options) + + updated = yield from fixit_bytes(path, content, config=config, autofix=autofix) + if autofix: + sys.stdout.buffer.write(updated or content) + + except Exception as error: + LOG.debug("Exception while fixit_stdin", exc_info=error) + yield Result(path, violation=None, error=(error, traceback.format_exc())) + + def fixit_file( path: Path, *, @@ -177,6 +212,16 @@ def fixit_paths( Yields :class:`Result` objects for each path, lint error, or exception found. See :func:`fixit_bytes` for semantics. + If the first given path is STDIN (``Path("-")``), then content will be linted + from STDIN using :func:`fixit_stdin`. The fixed content will be written to STDOUT. + A second path argument may be given, which represents the original content's true + path name, and will be used: + - to resolve the ``fixit.toml`` configuration file(s) + - when printing status messages, diffs, or errors. + If no second path argument is given, it will default to "stdin" in the current + working directory. + Any further path names will result in a runtime error. + .. note:: Currently does not support applying individual fixes when ``parallel=True``, @@ -188,10 +233,25 @@ def fixit_paths( return expanded_paths: List[Path] = [] - for path in paths: - expanded_paths.extend(trailrunner.walk(path)) - - if len(expanded_paths) == 1 or not parallel: + is_stdin = False + stdin_path = Path("stdin") + for i, path in enumerate(paths): + if path == STDIN: + if i == 0: + is_stdin = True + else: + LOG.warning("Cannot mix stdin ('-') with normal paths, ignoring") + elif is_stdin: + if i == 1: + stdin_path = path + else: + raise ValueError("too many stdin paths") + else: + expanded_paths.extend(trailrunner.walk(path)) + + if is_stdin: + yield from fixit_stdin(stdin_path, autofix=autofix, options=options) + elif len(expanded_paths) == 1 or not parallel: for path in expanded_paths: yield from fixit_file(path, autofix=autofix, options=options) else: diff --git a/src/fixit/cli.py b/src/fixit/cli.py index bc1c5c90..b9d8bc29 100644 --- a/src/fixit/cli.py +++ b/src/fixit/cli.py @@ -109,6 +109,8 @@ def lint( ): """ lint one or more paths and return suggestions + + pass "- " for STDIN representing """ options: Options = ctx.obj @@ -142,7 +144,7 @@ def lint( "-i/-a", is_flag=True, default=True, - help="how to apply fixes; interactive by default", + help="how to apply fixes; interactive by default unless STDIN", ) @click.option("--diff", "-d", is_flag=True, help="show diff even with --automatic") @click.argument("paths", nargs=-1, type=click.Path(path_type=Path)) @@ -154,12 +156,17 @@ def fix( ): """ lint and autofix one or more files and return results + + pass "- " for STDIN representing ; + this will ignore "--interactive" and always use "--automatic" """ options: Options = ctx.obj if not paths: paths = [Path.cwd()] + is_stdin = bool(paths[0] and str(paths[0]) == "-") + interactive = interactive and not is_stdin autofix = not interactive exit_code = 0 @@ -174,7 +181,9 @@ def fix( ) for result in generator: visited.add(result.path) - if print_result(result, show_diff=interactive or diff): + # for STDIN, we need STDOUT to equal the fixed content, so + # move everything else to STDERR + if print_result(result, show_diff=interactive or diff, stderr=is_stdin): dirty.add(result.path) if autofix and result.violation and result.violation.autofixable: autofixes += 1 diff --git a/src/fixit/ftypes.py b/src/fixit/ftypes.py index 5a5d4150..3fa9ef26 100644 --- a/src/fixit/ftypes.py +++ b/src/fixit/ftypes.py @@ -32,6 +32,8 @@ T = TypeVar("T") +STDIN = Path("-") + CodeRange CodePosition diff --git a/src/fixit/tests/smoke.py b/src/fixit/tests/smoke.py index ef746eea..53d9aba6 100644 --- a/src/fixit/tests/smoke.py +++ b/src/fixit/tests/smoke.py @@ -109,6 +109,32 @@ def func(): expected_format, path.read_text(), "unexpected file output" ) + with self.subTest("linting via stdin"): + result = self.runner.invoke( + main, + ["lint", "-", path.as_posix()], + input=content, + catch_exceptions=False, + ) + + self.assertNotEqual(result.output, "") + self.assertNotEqual(result.exit_code, 0) + self.assertRegex( + result.output, + r"file\.py@\d+:\d+ NoRedundantFString: .+ \(has autofix\)", + ) + + with self.subTest("fixing with formatting via stdin"): + result = self.runner.invoke( + main, + ["fix", "-", path.as_posix()], + input=content, + catch_exceptions=False, + ) + + self.assertEqual(result.exit_code, 0) + self.assertEqual(expected_format, result.output, "unexpected stdout") + def test_this_file_is_clean(self) -> None: path = Path(__file__).resolve().as_posix() result = self.runner.invoke(main, ["lint", path], catch_exceptions=False)