adding more tests, refactoring

Author: nikolay-e

.flake8

@@ -0,0 +1,2 @@
+[flake8]
+max-line-length = 130

.github/workflows/cd.yml

@@ -1,3 +1,4 @@
+# .github/workflows/ci.yml
 name: TreeMapper CI
 
 on:
@@ -8,13 +9,57 @@ on:
       - main
 
 jobs:
+  # --- Задание для проверки качества кода ---
+  lint-type-check:
+    name: Lint & Type Check
+    runs-on: ubuntu-latest # Достаточно одной ОС/версии Python
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v3
+
+      - name: Set up Python 3.11 # Используем одну из последних версий для проверок
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+
+      - name: Cache pip Dependencies
+        uses: actions/cache@v3
+        with:
+          # Используем setup.cfg для ключа кэша
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-lint-pip-${{ hashFiles('**/setup.cfg') }}
+          restore-keys: |
+            ${{ runner.os }}-lint-pip-
+
+      - name: Install Linters and Type Checker
+        run: |
+          python -m pip install --upgrade pip
+          # Устанавливаем только dev-зависимости из setup.cfg
+          pip install .[dev]
+          # Если нужные пакеты не в [dev], добавьте: pip install flake8 black isort mypy types-PyYAML
+
+      - name: Run Linters and Formatters Check
+        run: |
+          flake8 src tests
+          black --check src tests
+          isort --check-only src tests
+
+      - name: Run Type Checker (Mypy)
+        run: |
+          # Mypy может требовать установленных зависимостей для корректной проверки
+          mypy src tests
+
+  # --- Задание для тестов на CPython ---
   test:
+    needs: lint-type-check # Запускаем тесты ПОСЛЕ проверки качества кода
     strategy:
+      fail-fast: false # Не отменять другие тесты при падении одного
       matrix:
-        os: [ ubuntu-latest, ubuntu-20.04, ubuntu-22.04, macos-latest, windows-latest ]
-        python-version: [ 3.9, '3.10', '3.11' ]
+        os: [ ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, macos-latest, windows-latest ]
+        python-version: [ 3.9, '3.10', '3.11', '3.12' ]
 
     runs-on: ${{ matrix.os }}
+    # continue-on-error: ${{ matrix.experimental || false }} # Опционально для 3.13
 
     steps:
       - name: Checkout Code
@@ -29,33 +74,46 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.cfg') }}
+          # Ключ кэша включает ОС, версию Python и хэш setup.cfg
+          key: ${{ runner.os }}-pip-${{ matrix.python-version }}-${{ hashFiles('**/setup.cfg') }}
           restore-keys: |
+            ${{ runner.os }}-pip-${{ matrix.python-version }}-
             ${{ runner.os }}-pip-
 
       - name: Install Dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -r requirements.txt
-          pip install -e .
+          # Устанавливаем пакет и dev-зависимости из setup.cfg
+          pip install -e .[dev]
 
-      - name: Build with PyInstaller
-        run: |
-          python -m PyInstaller --clean -y --dist ./dist/${{ runner.os }} --workpath /tmp treemapper.spec
-
-      - name: Build with python -m build
-        run: |
-          python -m build
+      # --- Шаги сборки PyInstaller и build УДАЛЕНЫ ---
 
-      - name: Run Tests
+      - name: Run Tests with Coverage
         run: |
-          pytest
+          # Запускаем pytest с генерацией отчета покрытия в формате XML
+          pytest -v --cov=src/treemapper --cov-report=xml
+
+      - name: Upload coverage reports to Codecov
+        # Запускаем только для одной комбинации, чтобы не дублировать отчеты
+        if: matrix.os == 'ubuntu-latest' && matrix.python-version == '3.11'
+        uses: codecov/codecov-action@v4
+        # Не требует токена для публичных репозиториев на github.com
+        # env:
+        #   CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} # Для приватных репо
+        with:
+           files: ./coverage.xml # Файл отчета, созданный pytest-cov
+           fail_ci_if_error: true
+           verbose: true
 
+  # --- Задание для тестов на PyPy ---
   test-pypy:
+    needs: lint-type-check # Запускаем тесты ПОСЛЕ проверки качества кода
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        python-version: [ pypy-3.9 ]
+        # Добавлена версия PyPy 3.10 (проверьте доступность в actions/setup-python)
+        python-version: [ pypy-3.9, pypy-3.10 ]
 
     steps:
       - name: Checkout Code
@@ -70,21 +128,19 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/.cache/pip
-          key: pypy-pip-${{ hashFiles('**/setup.cfg') }}
+          key: pypy-${{ matrix.python-version }}-pip-${{ hashFiles('**/setup.cfg') }}
           restore-keys: |
-            pypy-pip-
+            pypy-${{ matrix.python-version }}-pip-
 
       - name: Install Dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -r requirements.txt
-          pip install -e .
-          pip install build pytest
+          # Устанавливаем с dev зависимостями из setup.cfg
+          pip install -e .[dev]
+          # build и pytest теперь должны быть в [dev]
 
-      - name: Build with python -m build
-        run: |
-          python -m build
+      # --- Шаг сборки build УДАЛЕН ---
 
       - name: Run Tests
         run: |
-          pytest
+          pytest -v # Запускаем тесты без покрытия для PyPy, если оно не настроено

.github/workflows/ci.yml

@@ -1,3 +1,9 @@
 [build-system]
 requires = ["setuptools>=45", "wheel"]
-build-backend = "setuptools.build_meta"
+build-backend = "setuptools.build_meta"
+
+[tool.black]
+line-length = 130
+
+[tool.flake8]
+max-line-length = 130

pyproject.toml

@@ -18,12 +18,28 @@ package_dir =
 packages = find:
 python_requires = >=3.9
 install_requires =
-    pathspec
-    pyyaml
+    pathspec>=0.9
+    pyyaml>=5.4
 
 [options.packages.find]
 where = src
 
 [options.entry_points]
 console_scripts =
-    treemapper = treemapper.treemapper:main
+    treemapper = treemapper.treemapper:main
+
+[options.extras_require]
+dev =
+    pytest>=7.0
+    pytest-cov>=3.0
+    build>=0.10
+    twine>=4.0
+    pyinstaller>=5.0
+    flake8>=5.0
+    black>=23.0
+    isort>=5.10
+    mypy>=1.0
+    types-PyYAML
+    pyyaml
+    pathspec
+    autoflake

requirements.txt

@@ -1,2 +0,0 @@
-from .treemapper import main
-from .version import __version__

setup.cfg

@@ -1,55 +1,88 @@
+# src/treemapper/cli.py
 import argparse
 import sys
 from pathlib import Path
-from typing import Tuple
+from typing import Optional, Tuple  # <--- Добавлен Optional
 
 
-def parse_args() -> Tuple[Path, Path, Path, bool, int]:
+# ---> ИЗМЕНЕНИЕ: Заменяем | None на Optional[...] <---
+def parse_args() -> Tuple[Path, Optional[Path], Optional[Path], bool, int]:
     """Parse command line arguments."""
     parser = argparse.ArgumentParser(
+        prog="treemapper",
         description="Generate a YAML representation of a directory structure.",
-        formatter_class=argparse.ArgumentDefaultsHelpFormatter)
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter,
+    )
 
-    parser.add_argument(
-        "directory",
-        nargs="?",
-        default=".",
-        help="The directory to analyze")
+    parser.add_argument("directory", nargs="?", default=".", help="The directory to analyze")
 
     parser.add_argument(
-        "-i", "--ignore-file",
+        "-i",
+        "--ignore-file",
         default=None,
-        help="Path to the custom ignore file (optional)")
+        help="Path to the custom ignore file (optional)",
+    )
 
     parser.add_argument(
-        "-o", "--output-file",
+        "-o",
+        "--output-file",
         default="./directory_tree.yaml",
-        help="Path to the output YAML file")
+        help="Path to the output YAML file",
+    )
 
     parser.add_argument(
         "--no-default-ignores",
         action="store_true",
-        help="Disable all default ignores (including .gitignore and .treemapperignore)")
+        help="Disable default ignores (.treemapperignore, .gitignore, output file)",
+    )
 
     parser.add_argument(
-        "-v", "--verbosity",
+        "-v",
+        "--verbosity",
         type=int,
         choices=range(0, 4),
         default=2,
         metavar="[0-3]",
-        help="Set verbosity level (0: ERROR, 1: WARNING, 2: INFO, 3: DEBUG)")
+        help="Set verbosity level (0: ERROR, 1: WARNING, 2: INFO, 3: DEBUG)",
+    )
 
     args = parser.parse_args()
 
-    root_dir = Path(args.directory).resolve()
-    if not root_dir.is_dir():
-        print(f"Error: The path '{root_dir}' is not a valid directory.")
+    try:
+        root_dir = Path(args.directory).resolve(strict=True)
+        if not root_dir.is_dir():
+            print(
+                f"Error: The path '{root_dir}' is not a valid directory.",
+                file=sys.stderr,
+            )
+            sys.exit(1)
+    except FileNotFoundError:
+        print(
+            f"Error: The directory '{args.directory}' does not exist.",
+            file=sys.stderr,
+        )
+        sys.exit(1)
+    except Exception as e:
+        print(
+            f"Error resolving directory path '{args.directory}': {e}",
+            file=sys.stderr,
+        )
         sys.exit(1)
 
     output_file = Path(args.output_file)
     if not output_file.is_absolute():
         output_file = Path.cwd() / output_file
 
-    ignore_file = Path(args.ignore_file) if args.ignore_file else None
+    ignore_file_path: Optional[Path] = None  # Используем Optional для ясности
+    if args.ignore_file:
+        ignore_file_path = Path(args.ignore_file)
+        if not ignore_file_path.is_absolute():
+            ignore_file_path = Path.cwd() / ignore_file_path
 
-    return root_dir, ignore_file, output_file, args.no_default_ignores, args.verbosity
+    return (
+        root_dir,
+        ignore_file_path,
+        output_file,
+        args.no_default_ignores,
+        args.verbosity,
+    )