Merge pull request #116 from wp-cli/colors

Fix reverse (inverse) and white (grey).

Author: danielbachhuber

lib/cli/Colors.php

@@ -231,7 +231,7 @@ static public function getColors() {
 			'%p' => array('color' => 'magenta'),
 			'%m' => array('color' => 'magenta'),
 			'%c' => array('color' => 'cyan'),
-			'%w' => array('color' => 'grey'),
+			'%w' => array('color' => 'white'),
 			'%k' => array('color' => 'black'),
 			'%n' => array('color' => 'reset'),
 			'%Y' => array('color' => 'yellow', 'style' => 'bright'),
@@ -241,7 +241,7 @@ static public function getColors() {
 			'%P' => array('color' => 'magenta', 'style' => 'bright'),
 			'%M' => array('color' => 'magenta', 'style' => 'bright'),
 			'%C' => array('color' => 'cyan', 'style' => 'bright'),
-			'%W' => array('color' => 'grey', 'style' => 'bright'),
+			'%W' => array('color' => 'white', 'style' => 'bright'),
 			'%K' => array('color' => 'black', 'style' => 'bright'),
 			'%N' => array('color' => 'reset', 'style' => 'bright'),
 			'%3' => array('background' => 'yellow'),
@@ -250,11 +250,11 @@ static public function getColors() {
 			'%1' => array('background' => 'red'),
 			'%5' => array('background' => 'magenta'),
 			'%6' => array('background' => 'cyan'),
-			'%7' => array('background' => 'grey'),
+			'%7' => array('background' => 'white'),
 			'%0' => array('background' => 'black'),
 			'%F' => array('style' => 'blink'),
 			'%U' => array('style' => 'underline'),
-			'%8' => array('style' => 'inverse'),
+			'%8' => array('style' => 'reverse'),
 			'%9' => array('style' => 'bright'),
 			'%_' => array('style' => 'bright')
 		);

tests/test-colors.php

@@ -0,0 +1,27 @@
+<?php
+
+use cli\Colors;
+
+class testsColors extends PHPUnit_Framework_TestCase {
+
+	/**
+     * @dataProvider dataColors
+	 */ 
+	function testColors( $str, $color ) {
+		$colored = Colors::color( $color );
+		$this->assertSame( Colors::colorize( $str ), Colors::color( $color ) );
+		if ( in_array( 'reset', $color ) ) {
+			$this->assertTrue( false !== strpos( $colored, '[0m' ) );
+		} else {
+			$this->assertTrue( false === strpos( $colored, '[0m' ) );
+		}
+	}
+
+	function dataColors() {
+		$ret = array();
+		foreach ( Colors::getColors() as $str => $color ) {
+			$ret[] = array( $str, $color );
+		}
+		return $ret;
+	}
+}