Merge pull request #42 from dllh/master

Force an integer for the return of Shell::columns(). In cases such as a ...

Author: jlogsdon

lib/cli/Shell.php

@@ -25,7 +25,7 @@ class Shell {
 	 */
 	static public function columns() {
 		if (stripos(PHP_OS, 'indows') === false) {
-			return exec('/usr/bin/env tput cols');
+			return (int) exec('/usr/bin/env tput cols');
 		}
 		return 80; // default width of cmd window on Windows OS, maybe force using MODE CON COLS=XXX?
 	}

lib/cli/progress/Bar.php

@@ -56,6 +56,9 @@ public function display($finish = false) {
 
 		$size = Shell::columns();
 		$size -= strlen($msg . $timing);
+		if ( $size < 0 ) {
+			$size = 0;
+		}
 
 		$bar = str_repeat($this->_bars[0], floor($_percent * $size)) . $this->_bars[1];
 		// substr is needed to trim off the bar cap at 100%