[SR-8993] - Progress bar update crash when running tests in Xcode (#1814)

JhonnyBillM · aciidgh · commit 54a3037c4962 · 2018-10-14T14:49:03.000-07:00
* TerminalWidth defaults to 80 if it's nil or zero

* Reestructure TerminalWidth validation
diff --git a/Sources/Basic/TerminalController.swift b/Sources/Basic/TerminalController.swift
@@ -79,7 +79,12 @@ public final class TerminalController {
             return nil
         }
 
-        width = TerminalController.terminalWidth() ?? 80 // Assume default if we are not able to determine.
+        // Determine the terminal width otherwise assume a default.
+        if let terminalWidth = TerminalController.terminalWidth(), terminalWidth > 0 {
+            width = terminalWidth
+        } else {
+            width = 80
+        }
         self.stream = stream
     }
 

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,12 @@ public final class TerminalController {`
`79`	`79`	`return nil`
`80`	`80`	`}`
`81`	`81`
`82`		`- width = TerminalController.terminalWidth() ?? 80 // Assume default if we are not able to determine.`
	`82`	`+ // Determine the terminal width otherwise assume a default.`
	`83`	`+ if let terminalWidth = TerminalController.terminalWidth(), terminalWidth > 0 {`
	`84`	`+ width = terminalWidth`
	`85`	`+ } else {`
	`86`	`+ width = 80`
	`87`	`+ }`
`83`	`88`	`self.stream = stream`
`84`	`89`	`}`
`85`	`90`