modwire-cli 1.0.1__tar.gz → 1.1.0__tar.gz

{modwire_cli-1.0.1 → modwire_cli-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modwire-cli
-Version: 1.0.1
+Version: 1.1.0
 Summary: Command-line interface for the Modwire ecosystem.
 Project-URL: Homepage, https://github.com/modwire/modwire-cli
 Project-URL: Repository, https://github.com/modwire/modwire-cli
@@ -56,6 +56,12 @@ and analyses the current directory. Override either path when needed:
 modwire --language typescript --dot-dir path/to/.modwire --architecture-root path/to/source
 ```
 
+Use `--summary` for a compact module → layer map that omits individual source files:
+
+```sh
+modwire --language python --summary
+```
+
 To check this repository's architecture:
 
 ```sh

{modwire_cli-1.0.1 → modwire_cli-1.1.0}/README.md

@@ -21,6 +21,12 @@ and analyses the current directory. Override either path when needed:
 modwire --language typescript --dot-dir path/to/.modwire --architecture-root path/to/source
 ```
 
+Use `--summary` for a compact module → layer map that omits individual source files:
+
+```sh
+modwire --language python --summary
+```
+
 To check this repository's architecture:
 
 ```sh

{modwire_cli-1.0.1 → modwire_cli-1.1.0}/src/modwire_cli/__main__.py

@@ -22,6 +22,11 @@ def run(argv: Sequence[str]) -> int:
     parser.add_argument("--dot-dir", type=Path, default=Path(".modwire"))
     parser.add_argument("--architecture-root", type=Path, default=Path("."))
     parser.add_argument("--language", required=True)
+    parser.add_argument(
+        "--summary",
+        action="store_true",
+        help="Render modules with their non-empty layers, without individual files.",
+    )
     arguments = parser.parse_args(argv)
 
     container = create_sync_container(
@@ -33,6 +38,7 @@ def run(argv: Sequence[str]) -> int:
             dot_dir=arguments.dot_dir,
             architecture_root=arguments.architecture_root,
             language=arguments.language,
+            summary=arguments.summary,
         )
     finally:
         container.close()

{modwire_cli-1.0.1 → modwire_cli-1.1.0}/src/modwire_cli/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '1.0.1'
-__version_tuple__ = version_tuple = (1, 0, 1)
+__version__ = version = '1.1.0'
+__version_tuple__ = version_tuple = (1, 1, 0)
 
 __commit_id__ = commit_id = None

{modwire_cli-1.0.1 → modwire_cli-1.1.0}/src/modwire_cli/facade.py

@@ -23,8 +23,9 @@ class FitnessFacade:
         dot_dir: Path,
         architecture_root: Path,
         language: str,
+        summary: bool = False,
     ) -> int:
         config = self.config_service.load(dot_dir)
         code_map = self.extraction_service.load(architecture_root, language)
         reports = Modwire().architecture(config).report(code_map)
-        return self.pipeline_runner.run(reports)
+        return self.pipeline_runner.run(reports, summary=summary)

{modwire_cli-1.0.1 → modwire_cli-1.1.0}/src/modwire_cli/pipeline/context.py

@@ -11,6 +11,7 @@ from rich.console import Console
 class ReportPipelineContext:
     reports: tuple[ReportNode, ...]
     console: Console
+    summary: bool = False
     failed: bool = False
 
     def has_report(self, report_type: type[ReportNode]) -> bool:

{modwire_cli-1.0.1 → modwire_cli-1.1.0}/src/modwire_cli/pipeline/runner.py

@@ -17,8 +17,8 @@ class ReportPipelineRunner:
     steps: Mapping[Hashable, ReportPipelineStep]
     console: Console
 
-    def run(self, reports: tuple[ReportNode, ...]) -> int:
-        context = ReportPipelineContext(reports=reports, console=self.console)
+    def run(self, reports: tuple[ReportNode, ...], *, summary: bool = False) -> int:
+        context = ReportPipelineContext(reports=reports, console=self.console, summary=summary)
         result = self.process(context)
         return int(result.failed)
 

{modwire_cli-1.0.1 → modwire_cli-1.1.0}/src/modwire_cli/pipeline/steps/map_tree.py

@@ -16,11 +16,27 @@ class MapTree(ReportPipelineStep):
     def process(self, context: ReportPipelineContext) -> ReportPipelineContext:
         report = context.report(MapReport)
         tree = Tree("Architecture Map")
-        self._add_groups(tree, "Modules", report.modules)
-        self._add_groups(tree, "Layers", report.layers)
+        if context.summary:
+            self._add_summary(tree, report.modules, report.layers)
+        else:
+            self._add_groups(tree, "Modules", report.modules)
+            self._add_groups(tree, "Layers", report.layers)
         context.console.print(tree)
         return context
 
+    def _add_summary(
+        self,
+        tree: Tree,
+        modules: tuple[ArchitectureGroup, ...],
+        layers: tuple[ArchitectureGroup, ...],
+    ) -> None:
+        for module in modules:
+            module_branch = tree.add(module.name)
+            module_source_ids = set(module.source_ids)
+            for layer in layers:
+                if module_source_ids.intersection(layer.source_ids):
+                    module_branch.add(layer.name)
+
     def _add_groups(
         self,
         tree: Tree,

modwire_cli-1.1.0/tests/test_cli.py

@@ -0,0 +1,122 @@
+from __future__ import annotations
+
+import subprocess
+import sys
+from pathlib import Path
+from textwrap import dedent
+
+
+def test_cli_succeeds_for_a_valid_project(tmp_path: Path) -> None:
+    write_project(tmp_path, max_functions_per_file=1)
+
+    result = run_modwire(tmp_path)
+
+    assert result.returncode == 0, result.stderr
+    assert "Architecture checks passed." in result.stdout
+
+
+def test_cli_returns_failure_for_a_shape_violation(tmp_path: Path) -> None:
+    write_project(tmp_path, max_functions_per_file=0)
+
+    result = run_modwire(tmp_path)
+
+    assert result.returncode == 1
+    assert "Shape violations:" in result.stdout
+    assert "max_functions_per_file" in result.stdout
+
+
+def test_cli_summary_renders_non_empty_layers_beneath_modules(tmp_path: Path) -> None:
+    write_layered_project(tmp_path)
+
+    result = run_modwire(tmp_path, "--summary")
+
+    assert result.returncode == 0, result.stderr
+    assert "orders" in result.stdout
+    for layer in ("wiring", "adapters", "use_cases", "ports", "domain"):
+        assert layer in result.stdout
+    assert "bootstrap.py" not in result.stdout
+    assert "repository.py" not in result.stdout
+
+
+def test_cli_keeps_detailed_map_by_default(tmp_path: Path) -> None:
+    write_layered_project(tmp_path)
+
+    result = run_modwire(tmp_path)
+
+    assert result.returncode == 0, result.stderr
+    assert "bootstrap.py" in result.stdout
+    assert "repository.py" in result.stdout
+
+
+def run_modwire(project_root: Path, *arguments: str) -> subprocess.CompletedProcess[str]:
+    executable = Path(sys.executable).with_name("modwire")
+    return subprocess.run(
+        [str(executable), "--language", "python", *arguments],
+        cwd=project_root,
+        check=False,
+        capture_output=True,
+        text=True,
+    )
+
+
+def write_project(project_root: Path, *, max_functions_per_file: int) -> None:
+    dot_dir = project_root / ".modwire"
+    source_dir = project_root / "src"
+    dot_dir.mkdir()
+    source_dir.mkdir()
+    (source_dir / "example.py").write_text("def example() -> None:\n    pass\n")
+    (dot_dir / "architecture.yaml").write_text(
+        dedent(
+            f"""\
+            boundaries:
+              tags:
+                - name: package
+                  match: src
+              flow:
+                module_tag: package
+                analyzers:
+                  - module-boundaries
+            shape:
+              max_functions_per_file: {max_functions_per_file}
+            """
+        )
+    )
+
+
+def write_layered_project(project_root: Path) -> None:
+    dot_dir = project_root / ".modwire"
+    source_dir = project_root / "src" / "orders"
+    dot_dir.mkdir()
+    for layer, filename in (
+        ("wiring", "bootstrap.py"),
+        ("adapters", "repository.py"),
+        ("use_cases", "place_order.py"),
+        ("ports", "order_repository.py"),
+        ("domain", "order.py"),
+    ):
+        layer_dir = source_dir / layer
+        layer_dir.mkdir(parents=True)
+        (layer_dir / filename).write_text("pass\n")
+    (dot_dir / "architecture.yaml").write_text(
+        dedent(
+            """\
+            boundaries:
+              tags:
+                - name: module
+                  match: src/*
+                - name: wiring
+                  match: src/*/wiring
+                - name: adapters
+                  match: src/*/adapters
+                - name: use_cases
+                  match: src/*/use_cases
+                - name: ports
+                  match: src/*/ports
+                - name: domain
+                  match: src/*/domain
+              flow:
+                module_tag: module
+                layers: [wiring, adapters, use_cases, ports, domain]
+            """
+        )
+    )

modwire_cli-1.0.1/tests/test_cli.py

@@ -1,60 +0,0 @@
-from __future__ import annotations
-
-import subprocess
-import sys
-from pathlib import Path
-from textwrap import dedent
-
-
-def test_cli_succeeds_for_a_valid_project(tmp_path: Path) -> None:
-    write_project(tmp_path, max_functions_per_file=1)
-
-    result = run_modwire(tmp_path)
-
-    assert result.returncode == 0, result.stderr
-    assert "Architecture checks passed." in result.stdout
-
-
-def test_cli_returns_failure_for_a_shape_violation(tmp_path: Path) -> None:
-    write_project(tmp_path, max_functions_per_file=0)
-
-    result = run_modwire(tmp_path)
-
-    assert result.returncode == 1
-    assert "Shape violations:" in result.stdout
-    assert "max_functions_per_file" in result.stdout
-
-
-def run_modwire(project_root: Path) -> subprocess.CompletedProcess[str]:
-    executable = Path(sys.executable).with_name("modwire")
-    return subprocess.run(
-        [str(executable), "--language", "python"],
-        cwd=project_root,
-        check=False,
-        capture_output=True,
-        text=True,
-    )
-
-
-def write_project(project_root: Path, *, max_functions_per_file: int) -> None:
-    dot_dir = project_root / ".modwire"
-    source_dir = project_root / "src"
-    dot_dir.mkdir()
-    source_dir.mkdir()
-    (source_dir / "example.py").write_text("def example() -> None:\n    pass\n")
-    (dot_dir / "architecture.yaml").write_text(
-        dedent(
-            f"""\
-            boundaries:
-              tags:
-                - name: package
-                  match: src
-              flow:
-                module_tag: package
-                analyzers:
-                  - module-boundaries
-            shape:
-              max_functions_per_file: {max_functions_per_file}
-            """
-        )
-    )