Merge pull request #37 from mnapoli/cli-advices

Show help message when bind/type yields empty list

Author: webmozart

src/Handler/BindCommandHandler.php

@@ -80,6 +80,7 @@ public function handleList(Args $args, IO $io)
         $printBindingState = count($bindingStates) > 1;
         $printPackageName = count($packageNames) > 1;
         $printHeaders = $printBindingState || $printPackageName;
+        $printAdvice = true;
         $indentation = $printBindingState && $printPackageName ? 8
             : ($printBindingState || $printPackageName ? 4 : 0);
 
@@ -96,6 +97,8 @@ public function handleList(Args $args, IO $io)
                     continue;
                 }
 
+                $printAdvice = false;
+
                 if (!$bindingStatePrinted) {
                     $this->printBindingStateHeader($io, $bindingState);
                     $bindingStatePrinted = true;
@@ -115,6 +118,10 @@ public function handleList(Args $args, IO $io)
             }
         }
 
+        if ($printAdvice) {
+            $io->writeLine('No bindings found. Use "puli bind <artifact> <type>" to bind an artifact to a type.');
+        }
+
         return 0;
     }
 

src/Handler/TypeCommandHandler.php

@@ -73,7 +73,8 @@ public function handleList(Args $args, IO $io)
         $printStates = count($states) > 1;
         $printPackageName = count($packageNames) > 1;
         $printHeaders = $printStates || $printPackageName;
-        $printAdvice = false;
+        $printTypeAdvice = true;
+        $printBindAdvice = false;
         $indentation = $printStates && $printPackageName ? 8
             : ($printStates || $printPackageName ? 4 : 0);
 
@@ -90,12 +91,14 @@ public function handleList(Args $args, IO $io)
                     continue;
                 }
 
+                $printTypeAdvice = false;
+
                 if (!$statePrinted) {
                     $this->printBindingTypeState($io, $state);
                     $statePrinted = true;
 
                     // Only print the advice if at least one type was printed
-                    $printAdvice = true;
+                    $printBindAdvice = true;
                 }
 
                 if ($printPackageName) {
@@ -114,7 +117,10 @@ public function handleList(Args $args, IO $io)
             }
         }
 
-        if ($printAdvice) {
+        if ($printTypeAdvice) {
+            $io->writeLine('No types defined. Use "puli type --define <name>" to define a type.');
+        }
+        if ($printBindAdvice) {
             $io->writeLine('Use "puli bind <resource> <type>" to bind a resource to a type.');
         }
 

tests/Handler/BindCommandHandlerTest.php

@@ -757,6 +757,22 @@ public function testListBindingsWithParameters()
         $this->assertEmpty($this->io->fetchErrors());
     }
 
+    public function testListNoBindings()
+    {
+        $args = self::$listCommand->parseArgs(new StringArgs(''));
+
+        $statusCode = $this->handler->handleList($args, $this->io);
+
+        $expected = <<<EOF
+No bindings found. Use "puli bind <artifact> <type>" to bind an artifact to a type.
+
+EOF;
+
+        $this->assertSame(0, $statusCode);
+        $this->assertSame($expected, $this->io->fetchOutput());
+        $this->assertEmpty($this->io->fetchErrors());
+    }
+
     public function testAddResourceBindingWithRelativePath()
     {
         $args = self::$addCommand->parseArgs(new StringArgs('path Puli\Cli\Tests\Fixtures\Foo'));

tests/Handler/TypeCommandHandlerTest.php

@@ -448,6 +448,28 @@ public function testListEnabledTypesInPackage()
         $this->assertEmpty($this->io->fetchErrors());
     }
 
+    public function testListNoTypes()
+    {
+        $this->discoveryManager = $this->getMock('Puli\Manager\Api\Discovery\DiscoveryManager');
+        $this->discoveryManager->expects($this->any())
+            ->method('findTypeDescriptors')
+            ->willReturn(array());
+        $this->handler = new TypeCommandHandler($this->discoveryManager, $this->packages);
+
+        $args = self::$listCommand->parseArgs(new StringArgs(''));
+
+        $statusCode = $this->handler->handleList($args, $this->io);
+
+        $expected = <<<EOF
+No types defined. Use "puli type --define <name>" to define a type.
+
+EOF;
+
+        $this->assertSame(0, $statusCode);
+        $this->assertSame($expected, $this->io->fetchOutput());
+        $this->assertEmpty($this->io->fetchErrors());
+    }
+
     public function testDefineType()
     {
         $args = self::$defineCommand->parseArgs(new StringArgs('my/type'));