add some colors

IonBazan · IonBazan · commit 3007b7f48ba2 · 2021-03-09T00:26:12.000+08:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -9,6 +9,7 @@ jobs:
       matrix:
         operating-system: [ubuntu-latest]
         php-versions:
+          - '5.3'
           - '5.4'
           - '5.5'
           - '5.6'
@@ -17,15 +18,13 @@ jobs:
           - '7.2'
           - '7.3'
           - '7.4'
+          - '8.0'
         include:
           - php-versions: '5.3'
             composer-flags: '--prefer-lowest'
             operating-system: ubuntu-latest
-          - php-versions: '7.4'
-            operating-system: windows-latest
           - php-versions: '8.0'
-            composer-flags: '--ignore-platform-reqs'
-            operating-system: ubuntu-latest
+            operating-system: windows-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -34,6 +33,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: json
+          coverage: xdebug
       - name: Get composer cache directory
         id: composer-cache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
diff --git a/README.md b/README.md
@@ -10,41 +10,41 @@
 
 Generates packages changes report in Markdown format by comparing `composer.lock` files. Compares with last-commited changes by default.
 
-![preview](preview.gif)
+![preview](preview.png)
 
 ## Example output
 
-| Prod Packages                      | Base    | Target  |
-|------------------------------------|---------|---------|
-| psr/event-dispatcher               | New     | 1.0.0   |
-| symfony/deprecation-contracts      | New     | v2.1.2  |
-| symfony/event-dispatcher           | v2.8.52 | v5.1.2  |
-| symfony/event-dispatcher-contracts | New     | v2.1.2  |
-| symfony/polyfill-php80             | New     | v1.17.1 |
-| php                                | New     | >=5.3   |
+| Prod Packages                      | Action   | Base    | Target  |
+|------------------------------------|----------|---------|---------|
+| psr/event-dispatcher               | New      | -       | 1.0.0   |
+| symfony/deprecation-contracts      | New      | -       | v2.1.2  |
+| symfony/event-dispatcher           | Upgraded | v2.8.52 | v5.1.2  |
+| symfony/event-dispatcher-contracts | New      | -       | v2.1.2  |
+| symfony/polyfill-php80             | New      | -       | v1.17.1 |
+| php                                | New      | -       | >=5.3   |
 
-| Dev Packages                       | Base  | Target  |
-|------------------------------------|-------|---------|
-| phpunit/php-code-coverage          | 8.0.2 | 7.0.10  |
-| phpunit/php-file-iterator          | 3.0.2 | 2.0.2   |
-| phpunit/php-text-template          | 2.0.1 | 1.2.1   |
-| phpunit/php-timer                  | 5.0.0 | 2.1.2   |
-| phpunit/php-token-stream           | 4.0.2 | 3.1.1   |
-| phpunit/phpunit                    | 9.2.5 | 8.5.8   |
-| sebastian/code-unit-reverse-lookup | 2.0.1 | 1.0.1   |
-| sebastian/comparator               | 4.0.2 | 3.0.2   |
-| sebastian/diff                     | 4.0.1 | 3.0.2   |
-| sebastian/environment              | 5.1.1 | 4.2.3   |
-| sebastian/exporter                 | 4.0.1 | 3.1.2   |
-| sebastian/global-state             | 4.0.0 | 3.0.0   |
-| sebastian/object-enumerator        | 4.0.1 | 3.0.3   |
-| sebastian/object-reflector         | 2.0.1 | 1.1.1   |
-| sebastian/recursion-context        | 4.0.1 | 3.0.0   |
-| sebastian/resource-operations      | 3.0.1 | 2.0.1   |
-| sebastian/type                     | 2.1.0 | 1.1.3   |
-| sebastian/version                  | 3.0.0 | 2.0.1   |
-| phpunit/php-invoker                | 3.0.1 | Removed |
-| sebastian/code-unit                | 1.0.3 | Removed |
+| Dev Packages                       | Action     | Base  | Target |
+|------------------------------------|------------|-------|--------|
+| phpunit/php-code-coverage          | Downgraded | 8.0.2 | 7.0.10 |
+| phpunit/php-file-iterator          | Downgraded | 3.0.2 | 2.0.2  |
+| phpunit/php-text-template          | Downgraded | 2.0.1 | 1.2.1  |
+| phpunit/php-timer                  | Downgraded | 5.0.0 | 2.1.2  |
+| phpunit/php-token-stream           | Downgraded | 4.0.2 | 3.1.1  |
+| phpunit/phpunit                    | Downgraded | 9.2.5 | 8.5.8  |
+| sebastian/code-unit-reverse-lookup | Downgraded | 2.0.1 | 1.0.1  |
+| sebastian/comparator               | Downgraded | 4.0.2 | 3.0.2  |
+| sebastian/diff                     | Downgraded | 4.0.1 | 3.0.2  |
+| sebastian/environment              | Downgraded | 5.1.1 | 4.2.3  |
+| sebastian/exporter                 | Downgraded | 4.0.1 | 3.1.2  |
+| sebastian/global-state             | Downgraded | 4.0.0 | 3.0.0  |
+| sebastian/object-enumerator        | Downgraded | 4.0.1 | 3.0.3  |
+| sebastian/object-reflector         | Downgraded | 2.0.1 | 1.1.1  |
+| sebastian/recursion-context        | Downgraded | 4.0.1 | 3.0.0  |
+| sebastian/resource-operations      | Downgraded | 3.0.1 | 2.0.1  |
+| sebastian/type                     | Downgraded | 2.1.0 | 1.1.3  |
+| sebastian/version                  | Downgraded | 3.0.0 | 2.0.1  |
+| phpunit/php-invoker                | Removed    | 3.0.1 | -      |
+| sebastian/code-unit                | Removed    | 1.0.3 | -      |
 
 # Installation
 
diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
         "composer-plugin-api": "^1.1 || ^2.0"
     },
     "require-dev": {
-        "composer/composer": "^1.1 || ^2.0@dev",
+        "composer/composer": "^1.1 || ^2.0",
         "symfony/console": "^2.3 || ^3.0 || ^4.0 || ^5.0",
         "symfony/phpunit-bridge": "^4.2 || ^5.0"
     },
diff --git a/preview.gif b/preview.gif
diff --git a/preview.png b/preview.png
diff --git a/src/Command/DiffCommand.php b/src/Command/DiffCommand.php
@@ -89,7 +89,7 @@ private function getFormatter(InputInterface $input, OutputInterface $output)
         switch ($input->getOption('format')) {
             case 'mdlist':
                 return new MarkdownListFormatter($output, $urlGenerators);
-            case 'mdtable':
+            // case 'mdtable':
             default:
                 return new MarkdownTableFormatter($output, $urlGenerators);
         }
diff --git a/src/Formatter/Helper/OutputHelper.php b/src/Formatter/Helper/OutputHelper.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace IonBazan\ComposerDiff\Formatter\Helper;
+
+use Symfony\Component\Console\Formatter\OutputFormatterInterface;
+
+class OutputHelper
+{
+    /**
+     * @param string $string
+     *
+     * @return int
+     */
+    public static function strlenWithoutDecoration(OutputFormatterInterface $formatter, $string)
+    {
+        return strlen(static::removeDecoration($formatter, $string));
+    }
+
+    /**
+     * @param string $string
+     *
+     * @return string
+     */
+    public static function removeDecoration(OutputFormatterInterface $formatter, $string)
+    {
+        $isDecorated = $formatter->isDecorated();
+        $formatter->setDecorated(false);
+        $string = preg_replace("/\033\[[^m]*m/", '', $formatter->format($string));
+        $formatter->setDecorated($isDecorated);
+
+        return $string;
+    }
+}
diff --git a/src/Formatter/Helper/Table.php b/src/Formatter/Helper/Table.php
@@ -4,7 +4,7 @@
 
 use Symfony\Component\Console\Output\OutputInterface;
 
-class MarkdownTable
+class Table
 {
     /**
      * @var OutputInterface
@@ -122,7 +122,9 @@ private function renderHorizontalLine()
      */
     private function prepareCell(array $row, $column)
     {
-        return str_pad($row[$column], $this->getColumnWidth($column));
+        $cleanLength = OutputHelper::strlenWithoutDecoration($this->output->getFormatter(), $row[$column]);
+
+        return sprintf('%s%s', $row[$column], str_repeat(' ', $this->getColumnWidth($column) - $cleanLength));
     }
 
     /**
@@ -139,7 +141,7 @@ private function getColumnWidth($column)
         $lengths = array();
 
         foreach (array_merge(array($this->headers), $this->rows) as $row) {
-            $lengths[] = strlen($row[$column]);
+            $lengths[] = OutputHelper::strlenWithoutDecoration($this->output->getFormatter(), $row[$column]);
         }
 
         return $this->columnWidths[$column] = max($lengths);
diff --git a/src/Formatter/MarkdownTableFormatter.php b/src/Formatter/MarkdownTableFormatter.php
@@ -6,7 +6,7 @@
 use Composer\DependencyResolver\Operation\OperationInterface;
 use Composer\DependencyResolver\Operation\UninstallOperation;
 use Composer\DependencyResolver\Operation\UpdateOperation;
-use IonBazan\ComposerDiff\Formatter\Helper\MarkdownTable;
+use IonBazan\ComposerDiff\Formatter\Helper\Table;
 
 class MarkdownTableFormatter extends MarkdownFormatter
 {
@@ -31,8 +31,8 @@ public function render(array $operations, $title, $withUrls)
             $rows[] = $row;
         }
 
-        $table = new MarkdownTable($this->output);
-        $headers = array($title, 'Base', 'Target');
+        $table = new Table($this->output);
+        $headers = array($title, 'Action', 'Base', 'Target');
 
         if ($withUrls) {
             $headers[] = 'Link';
@@ -50,14 +50,16 @@ private function getTableRow(OperationInterface $operation)
         if ($operation instanceof InstallOperation) {
             return array(
                 $operation->getPackage()->getName(),
-                'New',
+                '<fg=green>New</>',
+                '-',
                 $operation->getPackage()->getFullPrettyVersion(),
             );
         }
 
         if ($operation instanceof UpdateOperation) {
             return array(
                 $operation->getInitialPackage()->getName(),
+                self::isUpgrade($operation) ? '<fg=cyan>Upgraded</>' : '<fg=yellow>Downgraded</>',
                 $operation->getInitialPackage()->getFullPrettyVersion(),
                 $operation->getTargetPackage()->getFullPrettyVersion(),
             );
@@ -66,8 +68,9 @@ private function getTableRow(OperationInterface $operation)
         if ($operation instanceof UninstallOperation) {
             return array(
                 $operation->getPackage()->getName(),
+                '<fg=red>Removed</>',
                 $operation->getPackage()->getFullPrettyVersion(),
-                'Removed',
+                '-',
             );
         }
 
diff --git a/tests/Command/DiffCommandTest.php b/tests/Command/DiffCommandTest.php
@@ -42,51 +42,53 @@ public function outputDataProvider()
         return array(
             'Markdown table' => array(
                 <<<OUTPUT
-| Prod Packages | Base  | Target  |
-|---------------|-------|---------|
-| a/package-1   | New   | 1.0.0   |
-| a/package-2   | 1.0.0 | 1.2.0   |
-| a/package-3   | 0.1.1 | Removed |
-| a/package-4   | 0.1.1 | Removed |
-| a/package-5   | 0.1.1 | Removed |
-| a/package-6   | 0.1.1 | Removed |
+| Prod Packages | Action   | Base  | Target |
+|---------------|----------|-------|--------|
+| a/package-1   | New      | -     | 1.0.0  |
+| a/package-2   | Upgraded | 1.0.0 | 1.2.0  |
+| a/package-3   | Removed  | 0.1.1 | -      |
+| a/package-4   | Removed  | 0.1.1 | -      |
+| a/package-5   | Removed  | 0.1.1 | -      |
+| a/package-6   | Removed  | 0.1.1 | -      |
 
 
 OUTPUT
                 ,
                 array(
                     '--no-dev' => null,
+                    '-f' => 'mdtable',
                 ),
             ),
             'Markdown with URLs' => array(
                 <<<OUTPUT
-| Prod Packages | Base  | Target  | Link                                       |
-|---------------|-------|---------|--------------------------------------------|
-| a/package-1   | New   | 1.0.0   | [Compare](github.com/releases/tag/1.0.0)   |
-| a/package-2   | 1.0.0 | 1.2.0   | [Compare](github.com/compare/1.0.0..1.2.0) |
-| a/package-3   | 0.1.1 | Removed | [Compare](github.com/releases/tag/0.1.1)   |
-| a/package-4   | 0.1.1 | Removed | [Compare](gitlab.org/tags/0.1.1)           |
-| a/package-5   | 0.1.1 | Removed | [Compare](gitlab2.org/tags/0.1.1)          |
-| a/package-6   | 0.1.1 | Removed |                                            |
+| Prod Packages | Action   | Base  | Target | Link                                       |
+|---------------|----------|-------|--------|--------------------------------------------|
+| a/package-1   | New      | -     | 1.0.0  | [Compare](github.com/releases/tag/1.0.0)   |
+| a/package-2   | Upgraded | 1.0.0 | 1.2.0  | [Compare](github.com/compare/1.0.0..1.2.0) |
+| a/package-3   | Removed  | 0.1.1 | -      | [Compare](github.com/releases/tag/0.1.1)   |
+| a/package-4   | Removed  | 0.1.1 | -      | [Compare](gitlab.org/tags/0.1.1)           |
+| a/package-5   | Removed  | 0.1.1 | -      | [Compare](gitlab2.org/tags/0.1.1)          |
+| a/package-6   | Removed  | 0.1.1 | -      |                                            |
 
 
 OUTPUT
             ,
                 array(
                     '--no-dev' => null,
                     '-l' => null,
+                    '-f' => 'anything',
                 ),
             ),
             'Markdown with URLs and custom gitlab domains' => array(
                 <<<OUTPUT
-| Prod Packages | Base  | Target  | Link                                       |
-|---------------|-------|---------|--------------------------------------------|
-| a/package-1   | New   | 1.0.0   | [Compare](github.com/releases/tag/1.0.0)   |
-| a/package-2   | 1.0.0 | 1.2.0   | [Compare](github.com/compare/1.0.0..1.2.0) |
-| a/package-3   | 0.1.1 | Removed | [Compare](github.com/releases/tag/0.1.1)   |
-| a/package-4   | 0.1.1 | Removed | [Compare](gitlab.org/tags/0.1.1)           |
-| a/package-5   | 0.1.1 | Removed | [Compare](gitlab2.org/tags/0.1.1)          |
-| a/package-6   | 0.1.1 | Removed | [Compare](gitlab3.org/tags/0.1.1)          |
+| Prod Packages | Action   | Base  | Target | Link                                       |
+|---------------|----------|-------|--------|--------------------------------------------|
+| a/package-1   | New      | -     | 1.0.0  | [Compare](github.com/releases/tag/1.0.0)   |
+| a/package-2   | Upgraded | 1.0.0 | 1.2.0  | [Compare](github.com/compare/1.0.0..1.2.0) |
+| a/package-3   | Removed  | 0.1.1 | -      | [Compare](github.com/releases/tag/0.1.1)   |
+| a/package-4   | Removed  | 0.1.1 | -      | [Compare](gitlab.org/tags/0.1.1)           |
+| a/package-5   | Removed  | 0.1.1 | -      | [Compare](gitlab2.org/tags/0.1.1)          |
+| a/package-6   | Removed  | 0.1.1 | -      | [Compare](gitlab3.org/tags/0.1.1)          |
 
 
 OUTPUT
diff --git a/tests/Formatter/Helper/OutputHelperTest.php b/tests/Formatter/Helper/OutputHelperTest.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace IonBazan\ComposerDiff\Tests\Formatter\Helper;
+
+use IonBazan\ComposerDiff\Formatter\Helper\OutputHelper;
+use IonBazan\ComposerDiff\Tests\TestCase;
+
+class OutputHelperTest extends TestCase
+{
+    /**
+     * @param string $expected
+     * @param string $decorated
+     *
+     * @dataProvider decoratedTextProvider
+     */
+    public function testItRemovesDecoration($expected, $formatted, $decorated)
+    {
+        $formatter = $this->getMockBuilder('Symfony\Component\Console\Formatter\OutputFormatterInterface')->getMock();
+        $formatter->expects($this->once())->method('isDecorated')->willReturn(true);
+        $formatter->expects($this->once())->method('format')->with($decorated)->willReturn($expected);
+        $formatter->expects($this->exactly(2))->method('setDecorated')->withConsecutive(array(false), array(true));
+
+        $this->assertSame($expected, OutputHelper::removeDecoration($formatter, $decorated));
+    }
+
+    public function testItSetsPreviousDecorationStatus()
+    {
+        $formatter = $this->getMockBuilder('Symfony\Component\Console\Formatter\OutputFormatterInterface')->getMock();
+        $formatter->expects($this->once())->method('isDecorated')->willReturn(false);
+        $formatter->expects($this->once())->method('format')->with('<green>test</green>')->willReturn('test');
+        $formatter->expects($this->exactly(2))->method('setDecorated')->withConsecutive(array(false), array(false));
+
+        $this->assertSame('test', OutputHelper::removeDecoration($formatter, '<green>test</green>'));
+    }
+
+    public function decoratedTextProvider()
+    {
+        return array(
+            'no formatting' => array('test1', 'test1', 'test1'),
+            'simple formatting' => array('test1', 'test1', '<fg=green>test1</>'),
+            'some formatted characters' => array('test1', "\033[30mtest1", '<fg=green>test1</>'),
+        );
+    }
+}
diff --git a/tests/Formatter/MarkdownTableFormatterTest.php b/tests/Formatter/MarkdownTableFormatterTest.php
diff --git a/tests/Integration/DiffCommandTest.php b/tests/Integration/DiffCommandTest.php

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ private function getFormatter(InputInterface $input, OutputInterface $output)`
`89`	`89`	`switch ($input->getOption('format')) {`
`90`	`90`	`case 'mdlist':`
`91`	`91`	`return new MarkdownListFormatter($output, $urlGenerators);`
`92`		`- case 'mdtable':`
	`92`	`+ // case 'mdtable':`
`93`	`93`	`default:`
`94`	`94`	`return new MarkdownTableFormatter($output, $urlGenerators);`
`95`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`use Symfony\Component\Console\Output\OutputInterface;`
`6`	`6`
`7`		`-class MarkdownTable`
	`7`	`+class Table`
`8`	`8`	`{`
`9`	`9`	`/**`
`10`	`10`	`* @var OutputInterface`
`@@ -122,7 +122,9 @@ private function renderHorizontalLine()`
`122`	`122`	`*/`
`123`	`123`	`private function prepareCell(array $row, $column)`
`124`	`124`	`{`
`125`		`- return str_pad($row[$column], $this->getColumnWidth($column));`
	`125`	`+ $cleanLength = OutputHelper::strlenWithoutDecoration($this->output->getFormatter(), $row[$column]);`
	`126`	`+`
	`127`	`+ return sprintf('%s%s', $row[$column], str_repeat(' ', $this->getColumnWidth($column) - $cleanLength));`
`126`	`128`	`}`
`127`	`129`
`128`	`130`	`/**`
`@@ -139,7 +141,7 @@ private function getColumnWidth($column)`
`139`	`141`	`$lengths = array();`
`140`	`142`
`141`	`143`	`foreach (array_merge(array($this->headers), $this->rows) as $row) {`
`142`		`- $lengths[] = strlen($row[$column]);`
	`144`	`+ $lengths[] = OutputHelper::strlenWithoutDecoration($this->output->getFormatter(), $row[$column]);`
`143`	`145`	`}`
`144`	`146`
`145`	`147`	`return $this->columnWidths[$column] = max($lengths);`