Tweak console helpers.

* Add clearing line to progress::output(). This makes usage easier. * Move argument shifting to __call(). I feel this would end up in each of the helpers. Better to have the argument shifting in the wrapper method. * Fix mistakes in ProgressHelper.
cakephp · May 23, 2015 · 3d27a4c · 3d27a4c
1 parent 352136c
commit 3d27a4c
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 30 deletions.
diff --git a/src/Console/ConsoleIo.php b/src/Console/ConsoleIo.php
@@ -399,7 +399,10 @@ public function helper($name, array $settings = [])
      */
     public function __call($method, $args)
     {
-        $helper = $this->helper($method, $args);
+        $helper = $this->helper($method);
+        if (count($args) === 1 && isset($args[0]) && is_array($args[0])) {
+            $args = $args[0];
+        }
         return $helper->output($args);
     }
 }
diff --git a/src/Shell/Helper/ProgressHelper.php b/src/Shell/Helper/ProgressHelper.php
@@ -62,7 +62,7 @@ public function output($args)
         if (isset($args[0])) {
             $args['callback'] = $args[0];
         }
-        if (!$args['callback'] || !is_callable($args[0])) {
+        if (!$args['callback'] || !is_callable($args['callback'])) {
             throw new RuntimeException('Callback option must be a callable.');
         }
         $this->init($args);
@@ -72,6 +72,7 @@ public function output($args)
             $callback($this);
             $this->draw();
         }
+        $this->_io->out('');
     }
 
     /**
@@ -100,7 +101,7 @@ public function init(array $args = [])
      */
     public function increment($num = 1)
     {
-        $this->_progress = max(0, $this->_progress + $num);
+        $this->_progress = min(max(0, $this->_progress + $num), $this->_total);
     }
 
     /**

diff --git a/src/Shell/Helper/TableHelper.php b/src/Shell/Helper/TableHelper.php
@@ -83,9 +83,6 @@ protected function _render($row, $widths)
      */
     public function output($rows)
     {
-        if (count($rows) === 1) {
-            $rows = $rows[0];
-        }
         $widths = $this->_calculateWidths($rows);
 
         $this->_rowSeparator($widths);

diff --git a/tests/TestCase/Console/ConsoleIoTest.php b/tests/TestCase/Console/ConsoleIoTest.php
@@ -380,9 +380,14 @@ public function testHelper()
      */
     public function testHelperCall()
     {
-        $this->out->expects($this->once())
+        $this->out->expects($this->at(0))
+            ->method('write')
+            ->with('It works!well ish');
+        $this->out->expects($this->at(1))
             ->method('write')
             ->with('It works!well ish');
-        $helper = $this->io->simple('well', 'ish');
+
+        $this->io->simple('well', 'ish');
+        $this->io->simple(['well', 'ish']);
     }
 }
diff --git a/tests/TestCase/Shell/Helper/ProgressHelperTest.php b/tests/TestCase/Shell/Helper/ProgressHelperTest.php
@@ -70,6 +70,7 @@ public function testOutputSuccess()
             '===========================================================>                 80%',
             '',
             '==========================================================================> 100%',
+            '',
         ];
         $this->assertEquals($expected, $this->stub->messages());
     }

diff --git a/tests/TestCase/Shell/Helper/TableHelperTest.php b/tests/TestCase/Shell/Helper/TableHelperTest.php
@@ -63,28 +63,6 @@ public function testOutput()
         $this->assertEquals($expected, $this->stub->messages());
     }
 
-    /**
-     * Test output array shifting
-     *
-     * @return voi
-     */
-    public function testOutputShifting()
-    {
-        $data = [
-            ['Header 1', 'Header', 'Long Header'],
-            ['short', 'Longish thing', 'short'],
-        ];
-        $this->helper->output([$data]);
-        $expected = [
-            '+----------+---------------+-------------+',
-            '| Header 1 | Header        | Long Header |',
-            '+----------+---------------+-------------+',
-            '| short    | Longish thing | short       |',
-            '+----------+---------------+-------------+',
-        ];
-        $this->assertEquals($expected, $this->stub->messages());
-    }
-
     /**
      * Test output with multibyte characters
      *