Fix paths by copying inputs into staging directory

Author: finestructure

Tests/DocUploadBundleTests/TempDir.swift renamed to Sources/DocUploadBundle/TempDir.swift

@@ -32,3 +32,8 @@ func withTempDir<T>(body: (String) async throws -> T) async throws -> T {
     let tmp = try TempDir()
     return try await body(tmp.path)
 }
+
+func withTempDir<T>(body: (String) throws -> T) throws -> T {
+    let tmp = try TempDir()
+    return try body(tmp.path)
+}

Sources/DocUploadBundle/Zipper.swift

@@ -34,14 +34,24 @@ public enum Zipper {
                     throw Error.generic(reason: "\(error)")
                 }
 
-            case let .zipTool(cwd):
+            case .zipTool:
                 do {
-                    let process = Process()
-                    process.executableURL = zip
-                    process.arguments = ["-q", "-r", outputPath.path] + inputPaths.map(\.lastPathComponent)
-                    process.currentDirectoryURL = cwd.map(URL.init(fileURLWithPath:))
-                    try process.run()
-                    process.waitUntilExit()
+                    try withTempDir { tempDir in
+                        let tempURL = URL(fileURLWithPath: tempDir)
+                        // Copy inputs to tempDir
+                        for source in inputPaths {
+                            let target = tempURL.appendingPathComponent(source.lastPathComponent)
+                            try FileManager.default.copyItem(at: source, to: target)
+                        }
+
+                        // Run zip
+                        let process = Process()
+                        process.executableURL = zip
+                        process.arguments = ["-q", "-r", outputPath.path] + inputPaths.map(\.lastPathComponent)
+                        process.currentDirectoryURL = tempURL
+                        try process.run()
+                        process.waitUntilExit()
+                    }
                 } catch {
                     throw Error.generic(reason: "\(error)")
                 }

Tests/DocUploadBundleTests/ZipTests.swift

@@ -21,7 +21,7 @@ final class ZipTests: XCTestCase {
 
     func test_unzip() async throws {
         // Test basic unzip behaviour we expect from the library we use
-        try await withTempDir { tempDir in
+        try withTempDir { tempDir in
             let tempURL = URL(fileURLWithPath: tempDir)
             let zipFile = fixtureUrl(for: "out.zip")
             let outDir = tempURL.appendingPathComponent("out")
@@ -41,7 +41,7 @@ final class ZipTests: XCTestCase {
 
     func test_zip_roundtrip() async throws {
         // Test basic zip roundtrip
-        try await withTempDir { tempDir in
+        try withTempDir { tempDir in
             //  temp
             let tempURL = URL(fileURLWithPath: tempDir)
 
@@ -92,7 +92,7 @@ final class ZipTests: XCTestCase {
         try XCTSkipIf(!FileManager.default.fileExists(atPath: Zipper.zip.path))
 
         // Test basic zip roundtrip with the shellTool method
-        try await withTempDir { tempDir in
+        try withTempDir { tempDir in
             //  temp
             let tempURL = URL(fileURLWithPath: tempDir)
 
@@ -139,4 +139,41 @@ final class ZipTests: XCTestCase {
         }
     }
 
+    func test_zip_roundtrip_shellTool_relative_paths() async throws {
+        try XCTSkipIf(!FileManager.default.fileExists(atPath: Zipper.zip.path))
+
+        // Test basic zip roundtrip with the shellTool method and relative paths
+        try withTempDir { tempDir in
+            // DocBundle components
+            // metadataURL: tempDir/metadata.json
+            // sourceURL:   tempDir/.docs/owner/repo/ref
+            // should be zipped as
+            //   - metadata.json
+            //   - ref
+            // at the top level as relative paths.
+            let tempURL = URL(fileURLWithPath: tempDir)
+            let metadataURL = tempURL.appendingPathComponent("metadata.json")
+            try "metadata".write(to: metadataURL, atomically: true, encoding: .utf8)
+            let sourceURL = tempURL.appendingPathComponent("docs/owner/repo/ref")
+            try FileManager.default.createDirectory(at: sourceURL, withIntermediateDirectories: true)
+            let indexHTML = sourceURL.appendingPathComponent("index.html")
+            try "index".write(to: indexHTML, atomically: true, encoding: .utf8)
+
+            // MUT
+            let zipFile = tempURL.appendingPathComponent("out.zip")
+            try Zipper.zip(paths: [metadataURL, sourceURL], to: zipFile, method: .zipTool(workingDirectory: tempDir))
+
+            do {  // validate
+                let unzipDir = tempURL.appendingPathComponent("unzip")
+                try Zipper.unzip(from: zipFile, to: unzipDir)
+                let metadataURL = unzipDir.appendingPathComponent("metadata.json")
+                let indexHTML = unzipDir.appendingPathComponent("ref/index.html")
+                XCTAssert(FileManager.default.fileExists(atPath: metadataURL.path))
+                XCTAssert(FileManager.default.fileExists(atPath: indexHTML.path))
+                XCTAssertEqual(try String(contentsOf: metadataURL), "metadata")
+                XCTAssertEqual(try String(contentsOf: indexHTML), "index")
+            }
+        }
+    }
+
 }