Merge pull request #1 from chkpnt/master

Write file to the specified outputPath

Author: twittemb

Makefile

@@ -28,6 +28,10 @@ install: Xcodecoverageconverter
 uninstall:
 	@rm -rf "$(bindir)/xcc"
 
+.PHONY: test
+test:
+	@swift test
+
 .PHONY: clean
 distclean:
 	@rm -f $(BUILDDIR)/release

Package.swift

@@ -5,6 +5,9 @@ import PackageDescription
 
 let package = Package(
     name: "XcodeCoverageConverter",
+    platforms: [
+        .macOS(.v10_12),
+    ],
     products: [
         .executable(name: "xcc", targets: ["XcodeCoverageConverter"])
     ],

Sources/Core/Commands/GenerateCommand.swift

@@ -82,7 +82,7 @@ public extension Xccov.Commands.Generate {
             .verbose(verbose,
                      onFailure: { failure in print("The following error occured while converting to output formats, \(failure)") },
                      onSuccess: { _ in print("The payload has been exported to output formats with success") })
-            .mapEach { $0.write() }
+            .mapEach { $0.write(atPath: outputPath) }
             .map { _ in () }
     }
 }

Sources/Core/Commons/Tools/Export+Write.swift

@@ -6,7 +6,7 @@
 //
 
 public extension Export {
-    func write() -> Result<Export, Xccov.Error> {
-        self.content.write(filename: self.filename).map { self }
+    func write(atPath path: String) -> Result<Export, Xccov.Error> {
+        self.content.write(toFile: self.filename, atPath: path).map { self }
     }
 }

Sources/Core/Commons/Tools/String+Write.swift

@@ -5,9 +5,13 @@
 //  Created by Thibault Wittemberg on 2020-06-03.
 //
 
+import Foundation
+
 public extension String {
-    func write(filename: String) -> Result<Void, Xccov.Error> {
-        guard (try? self.write(toFile: filename, atomically: true, encoding: .utf8)) != nil else {
+    func write(toFile filename: String, atPath path: String) -> Result<Void, Xccov.Error> {
+        let file = NSString.path(withComponents: [path, filename])
+        guard (try? FileManager.default.createDirectory(atPath: path, withIntermediateDirectories: true)) != nil,
+              (try? self.write(toFile: file, atomically: true, encoding: .utf8)) != nil else {
             return .failure(.unableToWriteFile(self))
         }
 

Tests/CoreTests/Commands/GenerateCommandTests.swift

@@ -67,11 +67,41 @@ final class GenerateCommandTests: XCTestCase {
         XCTAssertEqual(receivedResult, Result.failure(Xccov.Error.conversionFailed("")))
     }
 
+    func testExecute_writes_cobertura_xml_to_outputPath() {
+        // Given: a json report in a temporary directory
+        let tmpDir = FileManager.default.uniqueTemporaryDirectory()
+        defer { try? FileManager.default.removeItem(at: tmpDir) }
+        _ = converterFixtureCoverageJson.write(toFile: "report.json", atPath: tmpDir.path)
+
+        // When: converting it to a cobertura-xml using the export method
+        let receivedResult = Xccov.Commands.Generate.execute(
+            jsonFile: "\(tmpDir.path)/report.json",
+            outputPath: "\(tmpDir.path)/reports/coverage/",
+            outputs: [.coberturaXml],
+            excludeTargets: [], excludePackages: [], verbose: false
+        )
+
+        // Then: a file "cobertura.xml" exists in the specified outputPath
+        XCTAssertTrue(FileManager.default.fileExists(atPath: "\(tmpDir.path)/reports/coverage/cobertura.xml"))
+        XCTAssertNoThrow(try receivedResult.get())
+    }
+
     static var allTests = [
         ("testFilename_return_expected_value_for_cobertura", testFilename_return_expected_value_for_cobertura),
         ("testConvert_to_coberturalXml_return_success_when_coverageReport_is_valid", testConvert_to_coberturalXml_return_success_when_coverageReport_is_valid),
         ("testConvert_to_failable_return_failure", testConvert_to_failable_return_failure),
         ("testConvert_to_several_outputs_return_success_when_coverageReport_is_valid", testConvert_to_several_outputs_return_success_when_coverageReport_is_valid),
         ("testConvert_to_several_outputs_return_failure_when_a_conversion_fails", testConvert_to_several_outputs_return_failure_when_a_conversion_fails),
+        ("testExecute_writes_cobertura_xml_to_outputPath", testExecute_writes_cobertura_xml_to_outputPath),
     ]
 }
+
+private extension FileManager {
+
+    func uniqueTemporaryDirectory(_ uuid: UUID = .init()) -> URL {
+        let result = self.temporaryDirectory.appendingPathComponent(uuid.uuidString)
+        try? self.createDirectory(at: result, withIntermediateDirectories: true, attributes: nil)
+        return result
+    }
+
+}