Merge pull request wp-cli#11 from goldenapples/thanj/table-output

Add isPiped() method to \cli\Table

lib/cli/Table.php

@@ -20,6 +20,18 @@ class Table {
 	protected $_width = array();
 	protected $_rows = array();
 
+	/**
+	 * Checks whether the output of the current script is a TTY or a pipe / redirect
+	 *
+	 * Returns true if STDOUT output is being redirected to a pipe or a file; false is
+	 * output is being sent directly to the terminal.
+	 *
+	 * @return 	bool
+	 */
+	protected function isPiped() {
+		return ( function_exists( 'posix_isatty' ) && !posix_isatty( STDOUT ) );
+	}
+
 	/**
 	 * Initializes the `Table` class.
 	 *
@@ -73,6 +85,11 @@ protected function checkRow(array $row) {
 	/**
 	 * Output the table to `STDOUT` using `cli\line()`.
 	 *
+	 * If STDOUT is a pipe or redirected to a file, should output simple
+	 * tab-separated text. Otherwise, renders table with ASCII table borders
+	 *
+	 * @uses cli\Table::isPiped() Determine what format to output
+	 *
 	 * @see cli\Table::renderRow()
 	 */
 	public function display() {
@@ -81,6 +98,14 @@ public function display() {
 			$borderStr .= '-' . str_repeat('-', $this->_width[$column]) . '-+';
 		}
 
+		if ( $this->isPiped() ) {
+			\cli\line($this->renderPipedRow($this->_headers));
+			foreach ($this->_rows as $row) {
+				\cli\line($this->renderPipedRow($row));
+			}
+			return;
+		}
+
 		\cli\line($borderStr);
 		\cli\line($this->renderRow($this->_headers));
 		\cli\line($borderStr);
@@ -106,6 +131,16 @@ protected function renderRow(array $row) {
 		return $render;
 	}
 
+	/**
+	 * Renders a row for piped output.
+	 *
+	 * @param array  $row  The table row.
+	 * @return string  The formatted table row.
+	 */
+	protected function renderPipedRow(array $row) {
+		return implode( "\t", array_values( $row ) );
+	}
+
 	/**
 	 * Sort the table by a column. Must be called before `cli\Table::display()`.
 	 *