fluidattacks_core_filesystem 13.0.0__tar.gz → 14.0.0__tar.gz

{fluidattacks_core_filesystem-13.0.0 → fluidattacks_core_filesystem-14.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: fluidattacks_core_filesystem
-Version: 13.0.0
+Version: 14.0.0
 Summary: Fluid Attacks Core Filesystem Library
 Author-email: Development <development@fluidattacks.com>
 License: MPL-2.0

{fluidattacks_core_filesystem-13.0.0 → fluidattacks_core_filesystem-14.0.0}/fluidattacks_core/filesystem/defaults.py

@@ -28,6 +28,9 @@ class WorkspaceSpec(TypedDict):
     claims: frozenset[str]
 
 
+BUNDLE_DIR_GLOBS = ["*.xcodeproj", "*.xcworkspace"]
+
+
 WORKSPACE_MARKERS: dict[str, WorkspaceSpec] = {
     "gradle": {
         "declares": frozenset({"settings.gradle", "settings.gradle.kts"}),

{fluidattacks_core_filesystem-13.0.0 → fluidattacks_core_filesystem-14.0.0}/fluidattacks_core/filesystem/partitioning.py

@@ -9,7 +9,7 @@ from fnmatch import fnmatch
 from pathlib import Path
 from typing import TYPE_CHECKING
 
-from .defaults import EXTENDED_EXCLUDE_DIRS
+from .defaults import BUNDLE_DIR_GLOBS, EXTENDED_EXCLUDE_DIRS
 from .detection import (
     declared_workspaces,
     detect_anchor_language,
@@ -86,23 +86,45 @@ def _claiming_kinds(dir_path: Path, workspaces: Mapping[Path, frozenset[str]]) -
     return frozenset(kinds)
 
 
+def _is_bundle_name(name: str) -> bool:
+    return any(fnmatch(name, pattern) for pattern in BUNDLE_DIR_GLOBS)
+
+
+def _within_bundle(dir_path: Path, root_path: Path) -> bool:
+    current = dir_path
+    while current != root_path:
+        if _is_bundle_name(current.name):
+            return True
+        if current == current.parent:
+            return False
+        current = current.parent
+    return False
+
+
 def _anchor_names(
     dir_path: Path,
     filenames: Sequence[str],
     workspaces: Mapping[Path, frozenset[str]],
+    root_path: Path,
 ) -> tuple[str, ...]:
+    if _within_bundle(dir_path, root_path):
+        return ()
     kinds = _claiming_kinds(dir_path, workspaces)
     if not kinds:
         return tuple(filenames)
     return tuple(name for name in filenames if not is_claimed_manifest(name, kinds))
 
 
-def _discover_potential_parts(listing: DirListing) -> tuple[PotentialPart, ...]:
+def _discover_potential_parts(listing: DirListing, root_path: Path) -> tuple[PotentialPart, ...]:
     workspaces = _workspace_kinds_by_dir(listing)
     return tuple(
         (dir_path, _find_config_files(dir_path, filenames), language.value)
         for dir_path, filenames in listing
-        if (language := detect_anchor_language(_anchor_names(dir_path, filenames, workspaces)))
+        if (
+            language := detect_anchor_language(
+                _anchor_names(dir_path, filenames, workspaces, root_path)
+            )
+        )
         is not None
     )
 
@@ -223,7 +245,7 @@ def _build_single_root_tree(root_path: Path, listing: DirListing) -> PartTree:
 
 
 def decide_part_tree(root_path: Path, listing: DirListing) -> PartTree:
-    potential_parts = _discover_potential_parts(listing)
+    potential_parts = _discover_potential_parts(listing, root_path)
     if not potential_parts:
         return _build_single_root_tree(root_path, listing)
 

{fluidattacks_core_filesystem-13.0.0 → fluidattacks_core_filesystem-14.0.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fluidattacks_core_filesystem"
-version = "13.0.0"
+version = "14.0.0"
 description = "Fluid Attacks Core Filesystem Library"
 authors = [{ name = "Development", email = "development@fluidattacks.com" }]
 license = { text = "MPL-2.0" }

{fluidattacks_core_filesystem-13.0.0 → fluidattacks_core_filesystem-14.0.0}/tests/test_partitioning.py

@@ -53,7 +53,7 @@ def test_config_files_are_found_by_name_and_glob() -> None:
 
 
 def test_only_directories_holding_a_manifest_become_parts() -> None:
-    discovered = _discover_potential_parts(_LISTING)
+    discovered = _discover_potential_parts(_LISTING, _ROOT)
     assert [(path, language) for path, _, language in discovered] == [
         (_ROOT, "Python"),
         (_ROOT / "web", "JavaScript"),
@@ -61,7 +61,7 @@ def test_only_directories_holding_a_manifest_become_parts() -> None:
 
 
 def test_a_lone_hint_does_not_make_a_potential_part() -> None:
-    assert _discover_potential_parts(((_ROOT / "tools", ("mypy.ini", "tox.ini")),)) == ()
+    assert _discover_potential_parts(((_ROOT / "tools", ("mypy.ini", "tox.ini")),), _ROOT) == ()
 
 
 def test_hierarchy_nests_parts_under_their_nearest_ancestor() -> None:
@@ -288,6 +288,39 @@ def test_a_gradle_module_without_a_settings_file_anchors_alone() -> None:
     assert sorted(tree.parts) == [".", "deployment/acceptance-test"]
 
 
+def test_an_xcode_bundle_does_not_anchor_beside_its_project() -> None:
+    listing = (
+        (_ROOT, ("pubspec.yaml",)),
+        (_ROOT / "app" / "ios", ("Podfile",)),
+        (_ROOT / "app" / "ios" / "Runner.xcodeproj", ("project.pbxproj",)),
+        (_ROOT / "app" / "ios" / "Runner.xcworkspace", ("project.pbxproj",)),
+    )
+
+    assert sorted(decide_part_tree(_ROOT, listing).parts) == [".", "app/ios"]
+
+
+def test_a_manifest_nested_inside_a_bundle_does_not_anchor() -> None:
+    listing = (
+        (_ROOT, ("Podfile",)),
+        (_ROOT / "Runner.xcodeproj", ("project.pbxproj",)),
+        (_ROOT / "Runner.xcodeproj" / "project.xcworkspace", ("Package.swift",)),
+    )
+
+    assert sorted(decide_part_tree(_ROOT, listing).parts) == ["."]
+
+
+def test_a_root_named_like_a_bundle_still_anchors() -> None:
+    root = Path("/Thing.xcodeproj")
+
+    assert sorted(decide_part_tree(root, ((root, ("project.pbxproj",)),)).parts) == ["."]
+
+
+def test_a_swift_package_outside_a_bundle_still_anchors() -> None:
+    listing = ((_ROOT, ("README",)), (_ROOT / "lib", ("Package.swift",)))
+
+    assert sorted(decide_part_tree(_ROOT, listing).parts) == [".", "lib"]
+
+
 def _write(root: Path, files: list[str]) -> None:
     for name in files:
         path = root / name

{fluidattacks_core_filesystem-13.0.0 → fluidattacks_core_filesystem-14.0.0}/uv.lock

@@ -178,7 +178,7 @@ wheels = [
 
 [[package]]
 name = "fluidattacks-core-filesystem"
-version = "13.0.0"
+version = "14.0.0"
 source = { editable = "." }
 
 [package.dev-dependencies]