Merge pull request #63 from Carthage/fix-task-description

mdiep · web-flow · commit cc4b2e2f7e2d · 2016-07-05T08:38:23.000-04:00
Quote whitespace-containing arguments in Task.description
diff --git a/ReactiveTask/Task.swift b/ReactiveTask/Task.swift
@@ -46,9 +46,19 @@ public struct Task {
 	}
 }
 
+private extension String {
+	var escaped: String {
+		if rangeOfCharacterFromSet(.whitespaceCharacterSet()) != nil {
+			return "\"\(self)\""
+		} else {
+			return self
+		}
+	}
+}
+
 extension Task: CustomStringConvertible {
 	public var description: String {
-		return "\(launchPath) \(arguments.joinWithSeparator(" "))"
+		return "\(launchPath) \(arguments.map { $0.escaped }.joinWithSeparator(" "))"
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -46,9 +46,19 @@ public struct Task {`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
	`49`	`+private extension String {`
	`50`	`+ var escaped: String {`
	`51`	`+ if rangeOfCharacterFromSet(.whitespaceCharacterSet()) != nil {`
	`52`	`+ return "\"\(self)\""`
	`53`	`+ } else {`
	`54`	`+ return self`
	`55`	`+ }`
	`56`	`+ }`
	`57`	`+}`
	`58`	`+`
`49`	`59`	`extension Task: CustomStringConvertible {`
`50`	`60`	`public var description: String {`
`51`		`- return "\(launchPath) \(arguments.joinWithSeparator(" "))"`
	`61`	`+ return "\(launchPath) \(arguments.map { $0.escaped }.joinWithSeparator(" "))"`
`52`	`62`	`}`
`53`	`63`	`}`
`54`	`64`