gulp-cli 1.1.7__tar.gz → 1.1.8__tar.gz

{gulp_cli-1.1.7/src/gulp_cli.egg-info → gulp_cli-1.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gulp-cli
-Version: 1.1.7
+Version: 1.1.8
 Summary: Command-line client for gULP
 Author-email: Mentat <info@mentat.is>
 Requires-Python: >=3.12

{gulp_cli-1.1.7 → gulp_cli-1.1.8}/src/gulp_cli/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '1.1.7'
-__version_tuple__ = version_tuple = (1, 1, 7)
+__version__ = version = '1.1.8'
+__version_tuple__ = version_tuple = (1, 1, 8)
 
-__commit_id__ = commit_id = 'g5f188bb2b'
+__commit_id__ = commit_id = 'g6f1fa3720'

{gulp_cli-1.1.7 → gulp_cli-1.1.8}/src/gulp_cli/commands/ingest.py

@@ -280,6 +280,29 @@ def _resolve_glob_base(pattern_path: Path) -> Path:
     return base_dir.resolve()
 
 
+def _safe_archive_name(path: str) -> str:
+    """Return a ZIP entry path without roots or dot-directory components."""
+    return "/".join(
+        _zip_path_part(part)
+        for part in path.replace("\\", "/").split("/")
+        if part not in ("", ".", "..")
+    )
+
+
+def _zip_path_part(part: str) -> str:
+    if re.fullmatch(r"[A-Za-z]:", part):
+        return part[0]
+    return part
+
+
+def _preserved_archive_name(source_path: Path) -> str:
+    try:
+        absolute_path = source_path.resolve()
+    except OSError:
+        absolute_path = Path(os.path.abspath(source_path))
+    return _safe_archive_name(str(absolute_path))
+
+
 def _build_zip_from_sources(
     output_zip: Path,
     sources: list[tuple[Path, Path]],
@@ -297,21 +320,9 @@ def _build_zip_from_sources(
     total_entries = 0
     entries_added = 0
 
-    def _safe_archive_name(path: str) -> str:
-        """Return a ZIP entry path without dot-directory components."""
-        return "/".join(
-            part
-            for part in path.replace("\\", "/").split("/")
-            if part not in ("", ".", "..")
-        )
-
     def _archive_name_for_path(source_path: Path, base_dir: Path) -> str:
         if preserve_path:
-            try:
-                rel_path = os.path.relpath(source_path, Path.cwd())
-            except ValueError:
-                rel_path = source_path.name
-            return _safe_archive_name(rel_path)
+            return _preserved_archive_name(source_path)
         try:
             rel_path = source_path.relative_to(base_dir)
         except ValueError:

{gulp_cli-1.1.7 → gulp_cli-1.1.8/src/gulp_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gulp-cli
-Version: 1.1.7
+Version: 1.1.8
 Summary: Command-line client for gULP
 Author-email: Mentat <info@mentat.is>
 Requires-Python: >=3.12

gulp_cli-1.1.8/src/gulp_cli.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "1.1.8",
+  "distance": 0,
+  "node": "g6f1fa372096bd3824cc9172417c6b33f5fcebbc1",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-06-24"
+}

{gulp_cli-1.1.7 → gulp_cli-1.1.8}/tests/test_zip_create.py

@@ -12,6 +12,7 @@ import typer
 from gulp_cli.commands.ingest import (
     _build_zip_from_sources,
     _expand_source_patterns,
+    _safe_archive_name,
     ingest_zip_create,
 )
 from gulp_cli.config import set_runtime_config_dir
@@ -87,40 +88,27 @@ def test_build_zip_from_sources_preserves_path_when_requested(
     )
 
     assert archived_count == 1
-    assert archived_entries == ["samples/nested/data.json"]
+    assert archived_entries == [_safe_archive_name(str(source_file.resolve()))]
     assert len(created_archives) == 1
 
     with zipfile.ZipFile(created_archives[0]) as archive:
-        assert archive.namelist() == ["samples/nested/data.json"]
+        assert archive.namelist() == archived_entries
 
 
 @pytest.mark.parametrize(
-    "rel_path",
-    ["./samples/nested/data.json", ".\\samples\\nested\\data.json"],
+    ("path", "expected"),
+    [
+        ("./samples/nested/data.json", "samples/nested/data.json"),
+        (".\\samples\\nested\\data.json", "samples/nested/data.json"),
+        ("../../../samples/nested/data.json", "samples/nested/data.json"),
+        ("C:\\samples\\nested\\data.json", "C/samples/nested/data.json"),
+        ("\\\\server\\share\\samples\\nested\\data.json", "server/share/samples/nested/data.json"),
+    ],
 )
-def test_build_zip_from_sources_strips_current_dir_paths_when_preserving(
-    tmp_path: Path, monkeypatch, rel_path: str
+def test_safe_archive_name_strips_roots_and_dot_paths(
+    path: str, expected: str
 ) -> None:
-    source_file = tmp_path / "data.json"
-    source_file.write_text('{"value": 1}', encoding="utf-8")
-    monkeypatch.setattr(
-        "gulp_cli.commands.ingest.os.path.relpath",
-        lambda _source_path, _cwd: rel_path,
-    )
-
-    output_zip = tmp_path / "out.zip"
-    archived_count, archived_entries, created_archives = _build_zip_from_sources(
-        output_zip,
-        [(source_file, tmp_path)],
-        preserve_path=True,
-    )
-
-    expected = "samples/nested/data.json"
-    assert archived_count == 1
-    assert archived_entries == [expected]
-
-    with zipfile.ZipFile(created_archives[0]) as archive:
-        assert archive.namelist() == [expected]
+    assert _safe_archive_name(path) == expected
 
 
 def test_build_zip_from_sources_strips_parent_paths_when_preserving(
@@ -141,7 +129,7 @@ def test_build_zip_from_sources_strips_parent_paths_when_preserving(
         preserve_path=True,
     )
 
-    expected = "samples/win_evtx/2-system-Microsoft-Windows-LiveId%4Operational.evtx"
+    expected = _safe_archive_name(str(source_file.resolve()))
     assert archived_count == 1
     assert archived_entries == [expected]
 

gulp_cli-1.1.7/src/gulp_cli.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "1.1.7",
-  "distance": 0,
-  "node": "g5f188bb2b8862aa3c0a6ca011bef91125feed6a5",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-06-23"
-}