Add more ruff rules (#406)

pyproject.toml

@@ -62,18 +62,23 @@ unfixable = [
     "ERA", # do not autoremove commented out code
 ]
 extend-select = [
-    "B",   # flake8-bugbear
-    "C4",  # flake8-comprehensions
-    "ERA", # flake8-eradicate/eradicate
-    "I",   # isort
-    "N",   # pep8-naming
-    "PIE", # flake8-pie
-    "PGH", # pygrep
-    "RUF", # ruff checks
-    "SIM", # flake8-simplify
-    "TCH", # flake8-type-checking
-    "TID", # flake8-tidy-imports
-    "UP",  # pyupgrade
+    "B",    # flake8-bugbear
+    "C4",   # flake8-comprehensions
+    "ERA",  # flake8-eradicate/eradicate
+    "I",    # isort
+    "N",    # pep8-naming
+    "PIE",  # flake8-pie
+    "PGH",  # pygrep
+    "PTH",  # flake8-use-pathlib
+    "ISC",  # flake8-implicit-string-concat
+    "RET",  # flake8-return
+    "FLY",  # flynt
+    "PERF", # perflint
+    "RUF",  # ruff checks
+    "SIM",  # flake8-simplify
+    "TCH",  # flake8-type-checking
+    "TID",  # flake8-tidy-imports
+    "UP",   # pyupgrade
 ]
 
 [tool.ruff.lint.flake8-tidy-imports]

src/cleo/color.py

@@ -69,8 +69,7 @@ def set(self) -> str:
         if self._background:
             codes.append(self._background)
 
-        for option in self._options.values():
-            codes.append(str(option["set"]))
+        codes.extend(str(option["set"]) for option in self._options.values())
 
         if not codes:
             return ""
@@ -86,8 +85,7 @@ def unset(self) -> str:
         if self._background:
             codes.append("49")
 
-        for option in self._options.values():
-            codes.append(str(option["unset"]))
+        codes.extend(str(option["unset"]) for option in self._options.values())
 
         if not codes:
             return ""

src/cleo/descriptors/text_descriptor.py

@@ -261,8 +261,7 @@ def _get_column_width(self, commands: Sequence[Command | str]) -> int:
             if isinstance(command, Command):
                 assert command.name is not None
                 widths.append(len(command.name))
-                for alias in command.aliases:
-                    widths.append(len(alias))
+                widths.extend(len(alias) for alias in command.aliases)
             else:
                 widths.append(len(command))
 

src/cleo/io/inputs/input.py

@@ -100,11 +100,11 @@ def bind(self, definition: Definition) -> None:
         self._parse()
 
     def validate(self) -> None:
-        missing_arguments = []
-
-        for argument in self._definition.arguments:
-            if argument.name not in self._arguments and argument.is_required():
-                missing_arguments.append(argument.name)
+        missing_arguments = [
+            argument.name
+            for argument in self._definition.arguments
+            if argument.name not in self._arguments and argument.is_required()
+        ]
 
         if missing_arguments:
             raise CleoMissingArgumentsError(

src/cleo/io/outputs/section_output.py

@@ -76,7 +76,8 @@ def add_content(self, content: str) -> None:
 
     def _write(self, message: str, new_line: bool = False) -> None:
         if not self.is_decorated():
-            return super()._write(message, new_line=new_line)
+            super()._write(message, new_line=new_line)
+            return
 
         erased_content = self._pop_stream_content_until_current_section()
 

src/cleo/ui/exception_trace/component.py

@@ -325,15 +325,13 @@ def _render_trace(self, io: IO | Output, frames: FrameCollection) -> None:
                     i -= len(collection) * (collection.repetitions + 1)
 
                 for frame in collection:
-                    relative_file_path = self._get_relative_file_path(frame.filename)
-                    relative_file_path_parts = relative_file_path.split(os.sep)
-                    relative_file_path = (
-                        f"<fg=default;options=dark>{Formatter.escape(os.sep)}</>".join(
-                            relative_file_path_parts[:-1]
-                            + [
-                                "<fg=default;options=bold>"
-                                f"{relative_file_path_parts[-1]}</>"
-                            ]
+                    relative_file_path_parts = self._get_relative_file_path(
+                        frame.filename
+                    ).parts
+                    relative_file_path = f"<fg=default;options=dark>{Formatter.escape(os.sep)}</>".join(
+                        (
+                            *relative_file_path_parts[:-1],
+                            f"<fg=default;options=bold>{relative_file_path_parts[-1]}</>",
                         )
                     )
                     self._render_line(
@@ -388,11 +386,11 @@ def _render_line(
         io.write_line(f"{indent * ' '}{line}")
 
     @staticmethod
-    def _get_relative_file_path(filepath: str) -> str:
+    def _get_relative_file_path(filepath: str) -> Path:
         if cwd := Path.cwd():
             filepath = filepath.replace(f"{cwd}{os.sep}", "")
 
         if home := Path("~").expanduser():
             filepath = filepath.replace(f"{home}{os.sep}", f"~{os.sep}")
 
-        return filepath
+        return Path(filepath)

src/cleo/ui/progress_bar.py

@@ -40,7 +40,7 @@ class ProgressBar(Component):
         "verbose": " %current%/%max% [%bar%] %percent:3s%% %elapsed:-6s%",
         "verbose_nomax": " %current% [%bar%] %elapsed:6s%",
         "very_verbose": (
-            " %current%/%max% [%bar%] %percent:3s%%" " %elapsed:6s%/%estimated:-6s%"
+            " %current%/%max% [%bar%] %percent:3s%% %elapsed:6s%/%estimated:-6s%"
         ),
         "very_verbose_nomax": " %current% [%bar%] %elapsed:6s%",
         "debug": " %current%/%max% [%bar%] %percent:3s%% %elapsed:6s%/%estimated:-6s%",

src/cleo/ui/progress_indicator.py

@@ -190,7 +190,7 @@ def _determine_best_format(self) -> str:
                 return self.VERY_VERBOSE
 
             return self.VERY_VERBOSE_NO_ANSI
-        elif self._io.is_verbose():
+        if self._io.is_verbose():
             if decorated:
                 return self.VERY_VERBOSE
 

src/cleo/ui/table.py

@@ -526,7 +526,7 @@ def _fill_next_rows(self, rows: Rows, line: int) -> Rows:
 
                 unmerged_rows = placeholder
 
-                for unmerged_row_key, _ in unmerged_rows.items():
+                for unmerged_row_key in unmerged_rows:
                     value = ""
                     if unmerged_row_key - line < len(lines):
                         value = lines[unmerged_row_key - line]
@@ -650,7 +650,7 @@ def _calculate_column_widths(self, rows: Rows) -> None:
                             for position, content in enumerate(content_columns):
                                 try:
                                     row_[i + position] = content
-                                except IndexError:
+                                except IndexError:  # noqa: PERF203
                                     row_.append(content)
 
                 lengths.append(self._get_cell_width(row_, column))

tests/commands/completion/test_completions_command.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
-import os
-
+from pathlib import Path
 from typing import TYPE_CHECKING
 
 import pytest
@@ -17,6 +16,8 @@
 if TYPE_CHECKING:
     from pytest_mock import MockerFixture
 
+FIXTURES_PATH = Path(__file__).parent / "fixtures"
+
 
 app = Application()
 app.add(HelloCommand())
@@ -48,11 +49,7 @@ def test_bash(mocker: MockerFixture) -> None:
     tester = CommandTester(command)
     tester.execute("bash")
 
-    with open(
-        os.path.join(os.path.dirname(__file__), "fixtures", "bash.txt"),
-        encoding="utf-8",
-    ) as f:
-        expected = f.read()
+    expected = (FIXTURES_PATH / "bash.txt").read_text(encoding="utf-8")
 
     assert expected == tester.io.fetch_output().replace("\r\n", "\n")
 
@@ -73,10 +70,7 @@ def test_zsh(mocker: MockerFixture) -> None:
     tester = CommandTester(command)
     tester.execute("zsh")
 
-    with open(
-        os.path.join(os.path.dirname(__file__), "fixtures", "zsh.txt"), encoding="utf-8"
-    ) as f:
-        expected = f.read()
+    expected = (FIXTURES_PATH / "zsh.txt").read_text(encoding="utf-8")
 
     assert expected == tester.io.fetch_output().replace("\r\n", "\n")
 
@@ -97,10 +91,6 @@ def test_fish(mocker: MockerFixture) -> None:
     tester = CommandTester(command)
     tester.execute("fish")
 
-    with open(
-        os.path.join(os.path.dirname(__file__), "fixtures", "fish.txt"),
-        encoding="utf-8",
-    ) as f:
-        expected = f.read()
+    expected = (FIXTURES_PATH / "fish.txt").read_text(encoding="utf-8")
 
     assert expected == tester.io.fetch_output().replace("\r\n", "\n")

tests/ui/exception_trace/test_frame.py

@@ -2,6 +2,8 @@
 
 import inspect
 
+from pathlib import Path
+
 from cleo.ui.exception_trace.frame import Frame
 from tests.ui.exception_trace.helpers import nested_exception
 from tests.ui.exception_trace.helpers import simple_exception
@@ -17,15 +19,12 @@ def test_frame() -> None:
         same_frame = Frame(frame_info)
         assert frame_info.frame == frame.frame
 
-    assert frame.lineno == 12
+    assert frame.lineno == 14
     assert frame.filename == __file__
     assert frame.function == "test_frame"
     assert frame.line == "        simple_exception()\n"
-
-    with open(__file__, encoding="utf-8") as f:
-        assert f.read() == frame.file_content
-
-    assert repr(frame) == f"<Frame {__file__}, test_frame, 12>"
+    assert Path(__file__).read_text(encoding="utf-8") == frame.file_content
+    assert repr(frame) == f"<Frame {__file__}, test_frame, 14>"
 
     try:
         nested_exception()

tests/ui/test_exception_trace.py

@@ -90,7 +90,7 @@ def test_render_debug_better_error_message_recursion_error() -> None:
     expected = rf"""^
   Stack trace:
 
-  \d+  {re.escape(trace._get_relative_file_path(__file__))}:{lineno} in test_render_debug_better_error_message_recursion_error
+  \d+  {re.escape(str(trace._get_relative_file_path(__file__)))}:{lineno} in test_render_debug_better_error_message_recursion_error
          {lineno - 2}\│ 
          {lineno - 1}\│     try:
       →  {lineno + 0}\│         recursion.recursion_error\(\)
@@ -99,7 +99,7 @@ def test_render_debug_better_error_message_recursion_error() -> None:
 
   ...  Previous frame repeated \d+ times
 
-  \s*\d+  {re.escape(trace._get_relative_file_path(recursion.__file__))}:2 in recursion_error
+  \s*\d+  {re.escape(str(trace._get_relative_file_path(recursion.__file__)))}:2 in recursion_error
           1\│ def recursion_error\(\) -> None:
       →   2\│     recursion_error\(\)
           3\│ 
@@ -108,7 +108,7 @@ def test_render_debug_better_error_message_recursion_error() -> None:
 
   maximum recursion depth exceeded
 
-  at {re.escape(trace._get_relative_file_path(recursion.__file__))}:2 in recursion_error
+  at {re.escape(str(trace._get_relative_file_path(recursion.__file__)))}:2 in recursion_error
         1\│ def recursion_error\(\) -> None:
     →   2\│     recursion_error\(\)
         3\│ 

tests/ui/test_progress_bar.py

@@ -326,21 +326,21 @@ def test_non_decorated_output(io: BufferedIO) -> None:
 
     bar.finish()
 
-    expected = "\n".join(
-        [
-            "   0/200 [>---------------------------]   0%",
-            "  20/200 [==>-------------------------]  10%",
-            "  40/200 [=====>----------------------]  20%",
-            "  60/200 [========>-------------------]  30%",
-            "  80/200 [===========>----------------]  40%",
-            " 100/200 [==============>-------------]  50%",
-            " 120/200 [================>-----------]  60%",
-            " 140/200 [===================>--------]  70%",
-            " 160/200 [======================>-----]  80%",
-            " 180/200 [=========================>--]  90%",
-            " 200/200 [============================] 100%",
-        ]
-    )
+    output = [
+        "   0/200 [>---------------------------]   0%",
+        "  20/200 [==>-------------------------]  10%",
+        "  40/200 [=====>----------------------]  20%",
+        "  60/200 [========>-------------------]  30%",
+        "  80/200 [===========>----------------]  40%",
+        " 100/200 [==============>-------------]  50%",
+        " 120/200 [================>-----------]  60%",
+        " 140/200 [===================>--------]  70%",
+        " 160/200 [======================>-----]  80%",
+        " 180/200 [=========================>--]  90%",
+        " 200/200 [============================] 100%",
+    ]
+
+    expected = "\n".join(output)
 
     assert expected == io.fetch_error()
 

tests/ui/test_question.py

@@ -3,6 +3,7 @@
 import os
 import subprocess
 
+from pathlib import Path
 from typing import TYPE_CHECKING
 
 import pytest
@@ -15,7 +16,7 @@
 
 
 def has_tty_available() -> bool:
-    with open(os.devnull, "w", encoding="utf-8") as devnull:
+    with Path(os.devnull).open("w", encoding="utf-8") as devnull:
         exit_code = subprocess.call(["stty", "2"], stdout=devnull, stderr=devnull)
 
     return exit_code == 0