Fixes #10 xcparse doesn't support space in file names & paths (#11)

Change Description: These changes make it so that our calls to xcresulttool & other command line tools will properly escape the file path in order to support paths with spaces. Test Plan/Testing Performed: Created a folder in /tmp with xcresults named with spaces as well as destination paths that included spaces in the path & ran xcparse. Additionally tried the interactive paths. Need to add a better testing framework with some sample xcresults so this can be automated.
ChargePoint · Oct 2, 2019 · 676436e · 676436e
1 parent c3ed1b3
commit 676436e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/Sources/xcparse/XCPParser.swift b/Sources/xcparse/XCPParser.swift
@@ -36,7 +36,7 @@ class XCPParser {
     }
 
     func extractScreenshots(xcresultPath : String, destination : String) throws {
-        let xcresultJSON : String = console.shellCommand("xcrun xcresulttool get --path \(xcresultPath) --format json")
+        let xcresultJSON : String = console.shellCommand("xcrun xcresulttool get --path \"\(xcresultPath)\" --format json")
         let xcresultJSONData = Data(xcresultJSON.utf8)
 
         var json : [String:AnyObject]
@@ -60,7 +60,7 @@ class XCPParser {
 
         var summaryRefIDs: [String] = []
         for testRefID in testReferenceIDs {
-            let testJSONString : String = console.shellCommand("xcrun xcresulttool get --path \(xcresultPath) --format json --id \(testRefID)")
+            let testJSONString : String = console.shellCommand("xcrun xcresulttool get --path \"\(xcresultPath)\" --format json --id \(testRefID)")
             let testRefData = Data(testJSONString.utf8)
 
             let testJSON = try! JSONSerialization.jsonObject(with: testRefData, options: []) as? [String:AnyObject]
@@ -102,7 +102,7 @@ class XCPParser {
         var screenshotRefIDs: [String] = []
         var screenshotNames: [String] = []
         for summaryRefID in summaryRefIDs {
-            let testJSONString : String = console.shellCommand("xcrun xcresulttool get --path \(xcresultPath) --format json --id \(summaryRefID)")
+            let testJSONString : String = console.shellCommand("xcrun xcresulttool get --path \"\(xcresultPath)\" --format json --id \(summaryRefID)")
             let summaryRefData = Data(testJSONString.utf8)
 
 //            let testJSON = try! JSONSerialization.jsonObject(with: summaryRefData, options: []) as? [String:AnyObject]
@@ -121,15 +121,15 @@ class XCPParser {
                 }
             }
         }
-        let dir = console.shellCommand("mkdir \(destination)/testScreenshots/")
+        let dir = console.shellCommand("mkdir \"\(destination)\"/testScreenshots/")
         for i in 0...screenshotRefIDs.count-1 {
-            let save = console.shellCommand("xcrun xcresulttool get --path \(xcresultPath) --format raw --id \(screenshotRefIDs[i]) > \(destination)/testScreenshots/\(screenshotNames[i])")
+            let save = console.shellCommand("xcrun xcresulttool get --path \"\(xcresultPath)\" --format raw --id \(screenshotRefIDs[i]) > \"\(destination)/testScreenshots/\(screenshotNames[i])\"")
         }
 
     }
 
     func extractCoverage(xcresultPath : String, destination : String) throws {
-        let xcresultJSON : String = console.shellCommand("xcrun xcresulttool get --path \(xcresultPath) --format json")
+        let xcresultJSON : String = console.shellCommand("xcrun xcresulttool get --path \"\(xcresultPath)\" --format json")
         let xcresultJSONData = Data(xcresultJSON.utf8)
 
         var json : [String:AnyObject]
@@ -150,7 +150,7 @@ class XCPParser {
             }
         }
         for id in coverageReferenceIDs {
-            let result = console.shellCommand("xcrun xcresulttool export --path \(xcresultPath) --id \(id) --output-path \(destination)/action.xccovreport --type file")
+            let result = console.shellCommand("xcrun xcresulttool export --path \"\(xcresultPath)\" --id \(id) --output-path \"\(destination)/action.xccovreport\" --type file")
         }
     }
 

diff --git a/xcparse.xcodeproj/xcshareddata/xcschemes/xcparse.xcscheme b/xcparse.xcodeproj/xcshareddata/xcschemes/xcparse.xcscheme
@@ -60,6 +60,16 @@
             ReferencedContainer = "container:xcparse.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = "-s /tmp/xcparse/Test-Xcode11\ With\ Spaces.xcresult /tmp/xcparse/My\ Folder\ With\ Spaces"
+            isEnabled = "NO">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "-x /tmp/xcparse/Test-Xcode11\ With\ Spaces.xcresult /tmp/xcparse/My\ Folder\ With\ Spaces"
+            isEnabled = "NO">
+         </CommandLineArgument>
+      </CommandLineArguments>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"