Merge pull request #6 from Yelp/maxr/dont_use_tmp

Use NSTemporaryDirectory() instead of /tmp/Salsa

Author: mrabiciu

Example/generate_sketch

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 echo "Building project and exporting view snapshots"
-xcodebuild test -workspace SalsaExample.xcworkspace/ -scheme SalsaExample -destination 'platform=iOS Simulator,name=iPhone 7,OS=11.3'
+xcodebuild test -workspace SalsaExample.xcworkspace/ -scheme SalsaExample -destination 'platform=iOS Simulator,name=iPhone 8'
 if [ $? -ne 0 ]; then
 	echo "Failed to export view snapshots"
 	exit 1

SalsaCompiler/SalsaCompiler/SketchJson/Page+SketchJson.swift

@@ -11,7 +11,7 @@ import Foundation
 extension Page: SketchJsonConvertable {
   func toSketchJson() -> [String: Any] {
     guard let id = IdentifierStore.identifier(forPageNamed: name) else {
-      fatalError("Couldn't get id for page: \(name)")
+      exit(withMessage: "Couldn't get id for page: \(name)")
     }
     return Layer.makeBaseSketchJson().merging(with: [
       "do_objectID": id,

SalsaCompiler/SalsaCompiler/SketchJson/SymbolInstance+SketchJson.swift

@@ -11,7 +11,7 @@ import Foundation
 extension SymbolInstance {
   override func toSketchJson() -> [String : Any] {
     guard let symbolID = IdentifierStore.identifier(forSymbolNamed: name) else {
-      fatalError("Could not find symbol named: \(name)")
+      exit(withMessage: "Could not find symbol named: \(name)")
     }
     return super.toSketchJson().merging(with: [
       "_class": "symbolInstance",

SalsaCompiler/SalsaCompiler/SketchJson/SymbolMaster+SketchJson.swift

@@ -11,7 +11,7 @@ import Foundation
 extension SymbolMaster {
   override func toSketchJson() -> [String : Any] {
     guard let symbolID = IdentifierStore.identifier(forSymbolNamed: name) else {
-      fatalError("Could not find symbol named: \(name)")
+      exit(withMessage: "Could not find symbol named: \(name)")
     }
     return super.toSketchJson().merging(with: [
       "_class": "symbolMaster",

SalsaCompiler/SalsaCompiler/SketchJson/Text+SketchJson.swift

@@ -10,7 +10,9 @@ import Cocoa
 
 extension Text {
   override func toSketchJson() -> [String: Any] {
-    guard let firstSegment = segments.first else { fatalError("Can't initialize text with no text segments") }
+    guard let firstSegment = segments.first else {
+      exit(withMessage: "Can't initialize text with no text segments")
+    }
     var constraints: [ResizingConstraint] = {
       switch firstSegment.style.alignment {
       case .left: return [.left]
@@ -73,7 +75,7 @@ extension Text {
       let paragraphStyle: NSMutableParagraphStyle = NSMutableParagraphStyle()
       paragraphStyle.alignment = segment.style.alignment.nsTextAlignment()
       guard let font = NSFont(name: segment.style.fontDescriptor, size: segment.style.fontSize) else {
-        fatalError("Could not find font: \(segment.style.fontDescriptor)")
+        exit(withMessage: "Could not find font: \(segment.style.fontDescriptor)")
       }
 
       // Sketch creates attributed strings with a custom attribute for font
@@ -256,7 +258,7 @@ extension Text.Style.Alignment {
 extension Text.SharedStyle: SketchJsonConvertable {
   func toSketchJson() -> [String: Any] {
     guard let id = IdentifierStore.identifier(forTextStyle: textStyle) else {
-      fatalError("Failed to get identifier for shared style named: \(name)")
+      exit(withMessage: "Failed to get identifier for shared style named: \(name)")
     }
     return [
       "_class": "sharedStyle",

SalsaCompiler/SalsaCompiler/main.swift

@@ -50,113 +50,123 @@ let exportFile: URL = {
 
 
 // Find a name for the working directory
-let workingDirectory: String = {
+let workingDirectory: URL = {
+  let tempDir = URL(fileURLWithPath: NSTemporaryDirectory())
   while true {
-    let directory = "/tmp/Salsa/\(UUID().uuidString)"
-    if !FileManager.default.fileExists(atPath: directory) {
+    let directory = tempDir.appendingPathComponent(UUID().uuidString, isDirectory: true)
+    if !FileManager.default.fileExists(atPath: directory.path) {
       return directory
     }
   }
 }()
 
+func cleanupWorkingDirectory() {
+  try? FileManager.default.removeItem(at: workingDirectory)
+}
+
+func exit(withMessage message: String) -> Never {
+  cleanupWorkingDirectory()
+  fatalError(message)
+}
+
 // Create the working directory
 do {
-  try FileManager.default.createDirectory(atPath: workingDirectory, withIntermediateDirectories: true, attributes: nil)
+  try FileManager.default.createDirectory(at: workingDirectory, withIntermediateDirectories: true, attributes: nil)
 } catch {
-  fatalError("Failed to create directory: \(workingDirectory)")
+  exit(withMessage: "Failed to create directory: \(workingDirectory.path)")
 }
 
 // Clone images into the working directory
 do {
-  try FileManager.default.copyItem(atPath: imagesDirectory.path, toPath: "\(workingDirectory)/images")
+  try FileManager.default.copyItem(at: imagesDirectory, to: workingDirectory.appendingPathComponent("images", isDirectory: true))
 } catch {
-  fatalError("Failed to clone images directory: \(imagesDirectory)")
+  exit(withMessage: "Failed to clone images directory: \(imagesDirectory.path)")
 }
 
 // Read in the input file
 let json = parseJsonFile(at: filePath.path)
 guard let document = Document(json: json) else {
-  fatalError("Failed to parse \(filePath.lastPathComponent)")
+  exit(withMessage: "Failed to parse \(filePath.lastPathComponent)")
 }
 
 // Create /pages/ directory
-let pagesPath = "\(workingDirectory)/pages/"
+let pagesDirectory = workingDirectory.appendingPathComponent("pages", isDirectory: true)
 do {
-  try FileManager.default.createDirectory(atPath: pagesPath, withIntermediateDirectories: true, attributes: nil)
+  try FileManager.default.createDirectory(at: pagesDirectory, withIntermediateDirectories: true, attributes: nil)
 } catch {
-  fatalError("Failed to create directory: \(pagesPath)")
+  exit(withMessage: "Failed to create directory: \(pagesDirectory.path)")
 }
 
 // Configure identifiers for shared objects
 IdentifierStore.configure(with: document)
 
 // Convert pages to json and save them to disk
 document.pages.enumerated().forEach { index, page in
-  guard let pageID = IdentifierStore.identifier(forPageNamed: page.name) else { fatalError("Failed to create page \(index + 1)")  }
+  guard let pageID = IdentifierStore.identifier(forPageNamed: page.name) else { exit(withMessage: "Failed to create page \(index + 1)")  }
   do {
-    let url = NSURL.fileURL(withPath: "\(workingDirectory)/pages/\(pageID).json")
-    guard let pageJsonString = page.simplified().toSketchJson().toJsonString() else { fatalError("Failed to parse page \(index + 1)") }
+    let url = pagesDirectory.appendingPathComponent("\(pageID).json")
+    guard let pageJsonString = page.simplified().toSketchJson().toJsonString() else { exit(withMessage: "Failed to parse page \(index + 1)") }
     try pageJsonString.write(to: url, atomically: false, encoding: String.Encoding.utf8)
   } catch {
-    fatalError("Failed to save page \(index + 1)")
+    exit(withMessage: "Failed to save page \(index + 1)")
   }
 }
 
 // Create document.json
-guard let documentJson = document.toSketchJson(pageIds: document.pages.reversed().flatMap { IdentifierStore.identifier(forPageNamed: $0.name) }).toJsonString() else {
-  fatalError("Failed to convert document to json")
+guard let documentJson = document.toSketchJson(pageIds: document.pages.reversed().compactMap { IdentifierStore.identifier(forPageNamed: $0.name) }).toJsonString() else {
+  exit(withMessage: "Failed to convert document to json")
 }
 
 // Save document.json to disk
 do {
-  let url = NSURL.fileURL(withPath: "\(workingDirectory)/document.json")
+  let url = workingDirectory.appendingPathComponent("document.json")
   try documentJson.write(to: url, atomically: false, encoding: String.Encoding.utf8)
 } catch {
-  fatalError("Failed to save document.json to disk")
+  exit(withMessage: "Failed to save document.json to disk")
 }
 
 // Create meta.json
 guard let metaData = makeMetaData().toJsonString() else {
-  fatalError("Failed to generate meta.json")
+  exit(withMessage: "Failed to generate meta.json")
 }
 
 // Save meta.json to disk
 do {
-  let url = NSURL.fileURL(withPath: "\(workingDirectory)/meta.json")
+  let url = workingDirectory.appendingPathComponent("meta.json")
   try metaData.write(to: url, atomically: false, encoding: String.Encoding.utf8)
 } catch {
-  fatalError("Failed to save meta.json")
+  exit(withMessage: "Failed to save meta.json")
 }
 
 // Sketch requires that this file exists but it doesn't need to contain anything
 // Its used to recover your position and state in the document on subsequent launches
 do {
-  let url = NSURL.fileURL(withPath: "\(workingDirectory)/user.json")
+  let url = workingDirectory.appendingPathComponent("user.json")
   try [String: Any]().toJsonString()!.write(to: url, atomically: false, encoding: String.Encoding.utf8)
 } catch {
-  fatalError("Failed to save user.json")
+  exit(withMessage: "Failed to save user.json")
 }
 
 
-let exportDirectory = exportFile.deletingLastPathComponent().path
+let exportDirectory = exportFile.deletingLastPathComponent()
 let exportFileName = exportFile.lastPathComponent
 
 // Create the export directory if it doesn't exist
-if !FileManager.default.fileExists(atPath: exportDirectory) {
+if !FileManager.default.fileExists(atPath: exportDirectory.path) {
   do {
-    try FileManager.default.createDirectory(atPath: exportDirectory, withIntermediateDirectories: true, attributes: nil)
+    try FileManager.default.createDirectory(at: exportDirectory, withIntermediateDirectories: true, attributes: nil)
   } catch {
-    fatalError("Failed to create directory: \(exportDirectory)")
+    exit(withMessage: "Failed to create directory: \(exportDirectory.path)")
   }
 }
 
 // Swift doesn't come with zipping utilities. Instead of adding one as a dependency we just use bash to zip our exported files into a sketch file
-guard bash(command: "zip", arguments: ["-r", "\(exportDirectory)/\(exportFileName)", "./"], directory: workingDirectory).returnCode == 0 else {
-  fatalError("Failed to create zipped .sketch file. Do you have zip installed?")
+guard bash(command: "zip", arguments: ["-r", "\(exportDirectory.path)/\(exportFileName)", "./"], directory: workingDirectory.path).returnCode == 0 else {
+  exit(withMessage: "Failed to create zipped .sketch file. Do you have zip installed?")
 }
 
 // Clean up our working directory
-try? FileManager.default.removeItem(atPath: workingDirectory)
+cleanupWorkingDirectory()
 
 print("(☞ﾟヮﾟ)☞ Generated \(exportFile.path) ☜(ﾟヮﾟ☜)")