Allow passing in namespace packages to build_graph

This gets us most of the way, but we still want to include the namespace
packages in the graph too (depending on what's passed in).

Author: seddonym

src/grimp/application/usecases.py

@@ -13,7 +13,6 @@
 from ..application.ports.modulefinder import AbstractModuleFinder, FoundPackage, ModuleFile
 from ..application.ports.packagefinder import AbstractPackageFinder
 from ..domain.valueobjects import DirectImport, Module
-from .. import exceptions
 from .config import settings
 
 
@@ -84,18 +83,14 @@ def _find_packages(
         package_directories = package_finder.determine_package_directories(
             package_name=package_name, file_system=file_system
         )
-        try:
-            [package_directory] = package_directories
-        except ValueError:
-            # TODO handle multiple directories.
-            raise exceptions.NamespacePackageEncountered
-
-        found_package = module_finder.find_package(
-            package_name=package_name,
-            package_directory=package_directory,
-            file_system=file_system,
-        )
-        found_packages.add(found_package)
+        for package_directory in package_directories:
+            found_package = module_finder.find_package(
+                package_name=package_name,
+                package_directory=package_directory,
+                file_system=file_system,
+            )
+            found_packages.add(found_package)
+
     return found_packages
 
 

tests/functional/test_namespace_packages.py

@@ -1,6 +1,6 @@
 import pytest  # type: ignore
 
-from grimp import build_graph, exceptions
+from grimp import build_graph
 
 """
 For ease of reference, these are the imports of all the files:
@@ -17,14 +17,16 @@
     nestednamespace.foo.alpha.blue.one, nestednamespace.bar.beta.orange
 """
 
+YELLOW_MODULES = {"mynamespace.yellow"}
+GREEN_MODULES = {"mynamespace.green", "mynamespace.green.alpha"}
+BLUE_MODULES = {"mynamespace.blue", "mynamespace.blue.alpha", "mynamespace.blue.beta"}
 
-def test_build_graph_for_namespace():
-    with pytest.raises(exceptions.NamespacePackageEncountered):
-        build_graph("mynamespace", cache_dir=None)
 
+def test_build_graph_for_namespace():
+    graph = build_graph("mynamespace", cache_dir=None)
 
-GREEN_MODULES = {"mynamespace.green", "mynamespace.green.alpha"}
-BLUE_MODULES = {"mynamespace.blue", "mynamespace.blue.alpha", "mynamespace.blue.beta"}
+    assert graph.modules == YELLOW_MODULES | GREEN_MODULES | BLUE_MODULES
+    assert graph.count_imports()
 
 
 @pytest.mark.parametrize(
@@ -99,14 +101,42 @@ def test_import_between_namespace_children():
 
 # Nested namespaces
 
+FOO_ALPHA_BLUE_MODULES = {
+    "nestednamespace.foo.alpha.blue",
+    "nestednamespace.foo.alpha.blue.one",
+    "nestednamespace.foo.alpha.blue.two",
+}
+FOO_ALPHA_GREEN_MODULES = {
+    "nestednamespace.foo.alpha.green",
+    "nestednamespace.foo.alpha.green.one",
+    "nestednamespace.foo.alpha.green.two",
+}
+BAR_BETA_MODULES = {
+    "nestednamespace.bar.beta",
+    "nestednamespace.bar.beta.orange",
+}
+
 
 @pytest.mark.parametrize(
-    "package_name",
-    ("nestednamespace", "nestednamespace.foo", "nestednamespace.foo.alpha"),
+    "package_name, expected",
+    [
+        # TODO: include the namespace packages as modules too.
+        (
+            "nestednamespace",
+            FOO_ALPHA_BLUE_MODULES | FOO_ALPHA_GREEN_MODULES | BAR_BETA_MODULES,
+        ),
+        (
+            "nestednamespace.foo",
+            FOO_ALPHA_BLUE_MODULES | FOO_ALPHA_GREEN_MODULES,
+        ),
+        ("nestednamespace.foo.alpha", FOO_ALPHA_BLUE_MODULES | FOO_ALPHA_GREEN_MODULES),
+    ],
 )
-def test_build_graph_for_nested_namespace(package_name):
-    with pytest.raises(exceptions.NamespacePackageEncountered):
-        build_graph(package_name, cache_dir=None)
+def test_build_graph_for_nested_namespace(package_name, expected):
+    graph = build_graph(package_name, cache_dir=None)
+
+    assert graph.modules == expected
+    assert graph.count_imports()
 
 
 @pytest.mark.parametrize(

tests/unit/application/test_usecases.py

@@ -163,3 +163,48 @@ class FakePackageFinder(BaseFakePackageFinder):
             "mypackage.foo.one",
         }
         assert expected_modules == graph.modules
+
+    def test_namespace_package_passed_as_root(self):
+        file_system = FakeFileSystem(
+            contents="""
+                /path/to/mypackage/
+                    foo/
+                        __init__.py
+                        one.py
+                        two/
+                            __init__.py
+                            green.py
+                            blue.py
+                    bar/
+                        __init__.py
+                        three.py
+                /different-path/to/mypackage/
+                    foobar/
+                        __init__.py
+                        four.py
+                """,
+        )
+
+        class FakePackageFinder(BaseFakePackageFinder):
+            directory_map = {
+                "mypackage": {
+                    "/path/to/mypackage",
+                    "/different-path/to/mypackage",
+                }
+            }
+
+        with override_settings(FILE_SYSTEM=file_system, PACKAGE_FINDER=FakePackageFinder()):
+            graph = usecases.build_graph("mypackage")
+
+        assert graph.modules == {
+            # TODO "mypackage" should also be included.
+            "mypackage.foo",
+            "mypackage.foo.one",
+            "mypackage.foo.two",
+            "mypackage.foo.two.green",
+            "mypackage.foo.two.blue",
+            "mypackage.bar",
+            "mypackage.bar.three",
+            "mypackage.foobar",
+            "mypackage.foobar.four",
+        }