Style and restoration of ZipBuilder buildRoot option

Author: paulb777

ZipBuilder/Sources/FirebaseReleaser/Push.swift

@@ -31,8 +31,9 @@ struct Push {
       let warningsOK = pod.allowWarnings ? " --allow-warnings" : ""
 
       Shell.executeCommand("pod repo push --skip-tests --use-json \(warningsOK) \(cpdcLocation) " +
-                            pod.skipImportValidation() + " \(pod.podspecName()) " + "--sources=sso://cpdc-internal/firebase.git,https://cdn.cocoapods.org",
-                           workingDir: gitRoot)
+        pod.skipImportValidation() + " \(pod.podspecName()) " +
+        "--sources=sso://cpdc-internal/firebase.git,https://cdn.cocoapods.org",
+        workingDir: gitRoot)
     }
   }
 

ZipBuilder/Sources/Utils/FileManager+Utils.swift

@@ -110,15 +110,21 @@ public extension FileManager {
 
   static let unique: String = timeStamp()
 
+  /// Allow clients to override default location for temporary directory creation
+  static var buildRoot: URL?
+  static func registerBuildRoot(buildRoot: URL) {
+    FileManager.buildRoot = buildRoot
+  }
+
   /// Returns a deterministic path of a temporary directory for the given name. Note: This does
   /// *not* create the directory if it doesn't exist, merely generates the name for creation.
   func temporaryDirectory(withName name: String) -> URL {
     // Get access to the temporary directory. This could be passed in via `LaunchArgs`, or use the
     // default temporary directory.
     let tempDir: URL
-//    if let root = LaunchArgs.shared.buildRoot {
-//      tempDir = root
-//    } else
+    if let root = FileManager.buildRoot {
+      tempDir = root
+    } else
     if #available(OSX 10.12, *) {
       tempDir = temporaryDirectory
     } else {

ZipBuilder/Sources/Utils/ShellUtils.swift

@@ -120,7 +120,7 @@ public extension Shell {
           print("Could not get data from pipe for command \(command): \(pipe.availableData)")
           return
         }
-        if (line != "") {
+        if line != "" {
           output.append(line)
         }
         print(line)

ZipBuilder/Sources/ZipBuilder/LaunchArgs.swift

@@ -15,6 +15,7 @@
  */
 
 import Foundation
+import Utils
 
 /// Describes an object that can check if a file eists in the filesystem. Used to allow for better
 /// testing with FileManager.
@@ -331,6 +332,7 @@ struct LaunchArgs {
       }
 
       self.buildRoot = url.standardizedFileURL
+      FileManager.registerBuildRoot(buildRoot: url.standardizedFileURL)
     } else {
       // No argument was passed in.
       buildRoot = nil