Merge pull request #95 from Carthage/task-description-workingdirectory

mdiep · web-flow · commit 94f46649fbdf · 2017-06-04T10:09:50.000-05:00
Add the working directory to `Task.description` if set
diff --git a/Sources/Task.swift b/Sources/Task.swift
@@ -60,7 +60,11 @@ extension String {
 
 extension Task: CustomStringConvertible {
 	public var description: String {
-		return "\(launchPath) \(arguments.map { $0.escapingWhitespaces }.joined(separator: " "))"
+		var message = "\(launchPath) \(arguments.map { $0.escapingWhitespaces }.joined(separator: " "))"
+		if let workingDirectory = workingDirectoryPath {
+			message += " (launched in \(workingDirectory))"
+		}
+		return message
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,11 @@ extension String {`
`60`	`60`
`61`	`61`	`extension Task: CustomStringConvertible {`
`62`	`62`	`public var description: String {`
`63`		`- return "\(launchPath) \(arguments.map { $0.escapingWhitespaces }.joined(separator: " "))"`
	`63`	`+ var message = "\(launchPath) \(arguments.map { $0.escapingWhitespaces }.joined(separator: " "))"`
	`64`	`+ if let workingDirectory = workingDirectoryPath {`
	`65`	`+ message += " (launched in \(workingDirectory))"`
	`66`	`+ }`
	`67`	`+ return message`
`64`	`68`	`}`
`65`	`69`	`}`
`66`	`70`