deployer refactoring

automatephp · Mar 10, 2024 · 1c5c230 · 1c5c230
1 parent 2d1010d
commit 1c5c230
Show file tree

Hide file tree

Showing 19 changed files with 341 additions and 579 deletions.
diff --git a/src/Automate/Command/BaseCommand.php b/src/Automate/Command/BaseCommand.php
@@ -17,7 +17,6 @@
 use Automate\Model\Project;
 use Automate\VariableResolver;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 abstract class BaseCommand extends Command
@@ -26,11 +25,7 @@ abstract class BaseCommand extends Command
 
     protected function getLogger(SymfonyStyle $io): LoggerInterface
     {
-        $verbosity = $io->getVerbosity() > OutputInterface::VERBOSITY_NORMAL
-            ? LoggerInterface::VERBOSITY_DEBUG
-            : LoggerInterface::VERBOSITY_NORMAL;
-
-        return new ConsoleLogger($io, $verbosity);
+        return new ConsoleLogger($io);
     }
 
     protected function resolveVariables(SymfonyStyle $io, Project $project, Platform $platform): void

diff --git a/src/Automate/Command/CheckCommand.php b/src/Automate/Command/CheckCommand.php
@@ -11,8 +11,9 @@
 
 namespace Automate\Command;
 
-use Automate\Context\SSHContext;
 use Automate\Loader;
+use Automate\Workflow\Context;
+use Automate\Workflow\Session;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -45,11 +46,13 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $logger = $this->getLogger($io);
 
         try {
-            $context = new SSHContext($project, $platform, $logger, $platform->getDefaultBranch());
+            $context = new Context($project, $platform, $logger, $platform->getDefaultBranch());
 
             $context->connect();
             $logger->section('Check git access');
-            $context->run('git ls-remote '.$project->getRepository(), false, null, false);
+            $context->exec(function (Session $session) use ($project) {
+                $session->exec('git ls-remote '.$project->getRepository(), false);
+            });
         } catch (\Exception $exception) {
             $io->error($exception->getMessage());
 

diff --git a/src/Automate/Command/DeployCommand.php b/src/Automate/Command/DeployCommand.php
@@ -11,9 +11,9 @@
 
 namespace Automate\Command;
 
-use Automate\Context\SSHContext;
 use Automate\Loader;
 use Automate\Model\Platform;
+use Automate\Workflow\Context;
 use Automate\Workflow\Deployer;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
@@ -59,7 +59,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             ['Version', $input->getArgument('gitRef') ?: $platform->getDefaultBranch()],
         ]);
 
-        $context = new SSHContext($project, $platform, $logger, $gitRef, $input->getOption('force'));
+        $context = new Context($project, $platform, $logger, $gitRef, $input->getOption('force'));
         $workflow = new Deployer($context);
 
         if (!$workflow->deploy()) {

diff --git a/src/Automate/Context/AbstractContext.php b/src/Automate/Context/AbstractContext.php
diff --git a/src/Automate/Context/ContextInterface.php b/src/Automate/Context/ContextInterface.php
diff --git a/src/Automate/Context/SSHContext.php b/src/Automate/Context/SSHContext.php
diff --git a/src/Automate/Event/DeployEvent.php b/src/Automate/Event/DeployEvent.php
@@ -11,17 +11,17 @@
 
 namespace Automate\Event;
 
-use Automate\Context\ContextInterface;
+use Automate\Workflow\Context;
 use Symfony\Contracts\EventDispatcher\Event;
 
 class DeployEvent extends Event
 {
     public function __construct(
-        private readonly ContextInterface $context,
+        private readonly Context $context,
     ) {
     }
 
-    public function getContext(): ContextInterface
+    public function getContext(): Context
     {
         return $this->context;
     }

diff --git a/src/Automate/Event/FailedDeployEvent.php b/src/Automate/Event/FailedDeployEvent.php
@@ -11,11 +11,11 @@
 
 namespace Automate\Event;
 
-use Automate\Context\ContextInterface;
+use Automate\Workflow\Context;
 
 class FailedDeployEvent extends DeployEvent
 {
-    public function __construct(ContextInterface $context, private readonly \Exception $exception)
+    public function __construct(Context $context, private readonly \Exception $exception)
     {
         parent::__construct($context);
     }