monkeyfs 0.2.1__tar.gz → 0.2.2__tar.gz

{monkeyfs-0.2.1 → monkeyfs-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: monkeyfs
-Version: 0.2.1
+Version: 0.2.2
 Summary: Transparent filesystem interception via monkey-patching.
 Author: ashenfad
 License-Expression: MIT

{monkeyfs-0.2.1 → monkeyfs-0.2.2}/monkeyfs/conformance.py

@@ -212,12 +212,21 @@ def _check_listing_paths(fs: Any, scratch: str) -> None:
             f"{absolute.get('probe.bin')!r}",
         )
 
-        deep = [info.path for info in fs.list_detailed(scratch, True)]
+        entries = fs.list_detailed(scratch, True)
+        deep = [info.path for info in entries]
         _require(
             f"{scratch}/nested/leaf.bin" in deep,
             f"a recursive list_detailed({scratch!r}) must name a nested entry "
             f"{scratch + '/nested/leaf.bin'!r}, got {deep!r}",
         )
+        for info in entries:
+            _require(
+                info.name == info.path.rsplit("/", 1)[-1],
+                f"list_detailed(...).name is the entry's own name, the last "
+                f"component of its path, at every depth: for path "
+                f"{info.path!r} expected {info.path.rsplit('/', 1)[-1]!r}, "
+                f"got {info.name!r}",
+            )
 
         start = fs.getcwd()
         fs.chdir(scratch)

{monkeyfs-0.2.1 → monkeyfs-0.2.2}/monkeyfs/mount.py

@@ -285,10 +285,11 @@ class MountFS:
         for name in names:
             full_abs = f"{norm}/{name}" if norm else f"/{name}"
             display = f"{user_prefix}/{name}" if user_prefix != "." else name
+            basename = name.rsplit("/", 1)[-1]
             meta = self.stat(full_abs)
             result.append(
                 FileInfo(
-                    name=name,
+                    name=basename,
                     path=display,
                     size=meta.size,
                     created_at=meta.created_at,

{monkeyfs-0.2.1 → monkeyfs-0.2.2}/monkeyfs/virtual.py

@@ -1325,7 +1325,10 @@ class VirtualFS:
             recursive: If True, list all nested files and directories.
 
         Returns:
-            List of FileInfo objects sorted by name.
+            List of FileInfo objects sorted by path relative to the queried
+            directory, so a directory precedes its contents. ``name`` is the
+            entry's own name, the last component of ``path``, at every depth;
+            it is not what the list is ordered by.
 
         Example:
             >>> files = vfs.list_detailed("/shared")
@@ -1350,7 +1353,9 @@ class VirtualFS:
             internal_path = f"{base}/{name}" if base else name
             absolute = "/" + internal_path
 
-            # Display path preserves the user's queried prefix
+            # Display path preserves the user's queried prefix; the name
+            # is the last component alone, whatever depth the entry sits at.
+            basename = name.rsplit("/", 1)[-1]
             display = f"{user_prefix}/{name}" if user_prefix != "." else name
 
             meta = self._meta_at(internal_path)
@@ -1360,7 +1365,7 @@ class VirtualFS:
                 now = self._now_iso()
                 result.append(
                     FileInfo(
-                        name=name,
+                        name=basename,
                         path=display,
                         size=0,
                         created_at=meta.created_at if meta is not None else now,
@@ -1371,7 +1376,7 @@ class VirtualFS:
             elif meta is not None:
                 result.append(
                     FileInfo(
-                        name=name,
+                        name=basename,
                         path=display,
                         size=meta.size,
                         created_at=meta.created_at,
@@ -1385,7 +1390,7 @@ class VirtualFS:
                 now = self._now_iso()
                 result.append(
                     FileInfo(
-                        name=name,
+                        name=basename,
                         path=display,
                         size=len(content),
                         created_at=now,

{monkeyfs-0.2.1 → monkeyfs-0.2.2}/monkeyfs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: monkeyfs
-Version: 0.2.1
+Version: 0.2.2
 Summary: Transparent filesystem interception via monkey-patching.
 Author: ashenfad
 License-Expression: MIT

{monkeyfs-0.2.1 → monkeyfs-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "monkeyfs"
-version = "0.2.1"
+version = "0.2.2"
 description = "Transparent filesystem interception via monkey-patching."
 readme = "README.md"
 license = "MIT"

{monkeyfs-0.2.1 → monkeyfs-0.2.2}/tests/test_directory_ops.py

@@ -466,3 +466,51 @@ class TestImplicitDirectories:
         assert vfs.list("/") == ["pkg", "top.py"]
         assert vfs.list("pkg") == ["__init__.py", "sub", "utils.py"]
         assert vfs.list("pkg/sub") == ["mod.py"]
+
+
+# -- list_detailed().name is the entry's own name at every depth ---------------
+
+
+def _nested_tree(fs):
+    fs.makedirs("/probe/sub")
+    fs.write("/probe/one.txt", b"1")
+    fs.write("/probe/sub/two.txt", b"2")
+    return fs
+
+
+def _names_and_paths(fs):
+    # The sequence as returned, not a sorted copy: every backend orders a
+    # recursive listing by path relative to the queried directory, so a
+    # directory precedes its contents, and a backend that drifts from
+    # that order fails here rather than being tidied into agreement.
+    return [(i.name, i.path) for i in fs.list_detailed("/probe", recursive=True)]
+
+
+def test_virtualfs_recursive_listing_names_are_basenames():
+    from monkeyfs import VirtualFS
+
+    assert _names_and_paths(_nested_tree(VirtualFS({}))) == [
+        ("one.txt", "/probe/one.txt"),
+        ("sub", "/probe/sub"),
+        ("two.txt", "/probe/sub/two.txt"),
+    ]
+
+
+def test_mountfs_recursive_listing_names_are_basenames():
+    from monkeyfs import MountFS, VirtualFS
+
+    assert _names_and_paths(_nested_tree(MountFS(VirtualFS({})))) == [
+        ("one.txt", "/probe/one.txt"),
+        ("sub", "/probe/sub"),
+        ("two.txt", "/probe/sub/two.txt"),
+    ]
+
+
+def test_isolatedfs_recursive_listing_names_are_basenames(tmp_path):
+    from monkeyfs import IsolatedFS
+
+    assert _names_and_paths(_nested_tree(IsolatedFS(str(tmp_path)))) == [
+        ("one.txt", "/probe/one.txt"),
+        ("sub", "/probe/sub"),
+        ("two.txt", "/probe/sub/two.txt"),
+    ]

{monkeyfs-0.2.1 → monkeyfs-0.2.2}/tests/test_open_optional.py

@@ -190,7 +190,7 @@ class TermishFS:
             meta = self.stat(full)
             entries.append(
                 FileInfo(
-                    name=name,
+                    name=posixpath.basename(name),
                     path=display,
                     size=meta.size,
                     created_at=meta.created_at,