Add info about skipped tasks

deployphp · Nov 21, 2021 · 333baff · 333baff
1 parent 465aed4
commit 333baff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/Command/MainCommand.php b/src/Command/MainCommand.php
@@ -113,9 +113,10 @@ protected function execute(Input $input, Output $output): int
         $this->deployer->scriptManager->setHooksEnabled(!$input->getOption('no-hooks'));
         $startFrom = $input->getOption('start-from');
         if ($startFrom && !$this->deployer->tasks->has($startFrom)) {
-            throw new Exception("Task ${startFrom} does not exist.");
+            throw new Exception("Task $startFrom does not exist.");
         }
-        $tasks = $this->deployer->scriptManager->getTasks($this->getName(), $startFrom);
+        $skippedTasks = [];
+        $tasks = $this->deployer->scriptManager->getTasks($this->getName(), $startFrom, $skippedTasks);
 
         if (empty($tasks)) {
             throw new Exception('No task will be executed, because the selected hosts do not meet the conditions of the tasks');
@@ -126,6 +127,9 @@ protected function execute(Input $input, Output $output): int
             $this->validateConfig();
             $this->deployer->master->connect($hosts);
             $this->deployer->server->start();
+            foreach ($skippedTasks as $taskName) {
+                $output->writeln("<fg=yellow;options=bold>skip</> $taskName");
+            }
         }
         $exitCode = $this->deployer->master->run($tasks, $hosts, $plan);
 

diff --git a/src/Task/ScriptManager.php b/src/Task/ScriptManager.php
@@ -14,7 +14,6 @@ class ScriptManager
 {
     private $tasks;
     private $hooksEnabled = true;
-    private $startFrom = null;
     private $visitedTasks = [];
 
     public function __construct(TaskCollection $tasks)
@@ -27,7 +26,7 @@ public function __construct(TaskCollection $tasks)
      *
      * @return Task[]
      */
-    public function getTasks(string $name, ?string $startFrom = null): array
+    public function getTasks(string $name, ?string $startFrom = null, array &$skipped = []): array
     {
         $tasks = [];
         $this->visitedTasks = [];
@@ -42,6 +41,7 @@ public function getTasks(string $name, ?string $startFrom = null): array
                     if ($task->getName() === $startFrom) {
                         $skip = false;
                     } else {
+                        $skipped[] = $task->getName();
                         continue;
                     }
                 }