Merge pull request #177 from fortrabbit/fix/git-output

WIP: Stream 'git push' output

CHANGELOG.md

@@ -1,5 +1,8 @@
 #  Changelog
 
+## 2.4.3 - 2023-10-13
+- Show git/composer output when using `copy/code/up`
+
 ## 2.4.2 - 2023-07-10
 - SSH check fails when no keys are SSH configured
 - `--interactive=0` works with all/up and all/down commands

src/Actions/CodeUpAction.php

@@ -128,15 +128,15 @@ public function run(?string $stage = null): int
             return ExitCode::UNSPECIFIED_ERROR;
         }
 
-        try {
-            $this->section("git push ({$msg})");
-            $git->push($upstream, "{$branch}:master");
-        } catch (GitException $gitException) {
-            $lines = count(explode(PHP_EOL, $gitException->getMessage()));
-            $this->output->write(str_repeat("\x1B[1A\x1B[2K", $lines));
-            $this->errorBlock('Ooops.');
-            $this->output->write("<fg=red>{$gitException->getMessage()}</>");
+        $this->section("git push ({$msg})");
+
+        $process = $git->push($upstream, "{$branch}:master");
+
+        foreach ($process as $type => $data) {
+            $this->output->write($data);
+        }
 
+        if (! $process->isSuccessful()) {
             return ExitCode::UNSPECIFIED_ERROR;
         }
 

src/Services/Git.php

@@ -9,6 +9,7 @@
 use fortrabbit\Copy\Services\Git\Client;
 use fortrabbit\Copy\Services\Git\GitonomyClient;
 use InvalidArgumentException;
+use Symfony\Component\Process\Process;
 
 /**
  * Git Service
@@ -51,9 +52,9 @@ public static function fromClone(
         return new self($client);
     }
 
-    public function push(string $upstream, string $branch = 'master'): string
+    public function push(string $upstream, string $branch = 'master'): Process
     {
-        return $this->gitClient->push($upstream, $branch);
+        return $this->gitClient->pushAndStream($upstream, $branch);
     }
 
     public function pull(string $upstream, string $branch = 'master'): string

src/Services/Git/Client.php

@@ -2,6 +2,8 @@
 
 namespace fortrabbit\Copy\Services\Git;
 
+use Symfony\Component\Process\Process;
+
 interface Client
 {
 	public function clone(
@@ -12,7 +14,9 @@ public function clone(
 
 	public function push(string $upstream, string $branch = 'master'): string;
 
-	public function pull(string $upstream, string $branch = 'master'): string;
+    public function pushAndStream(string $upstream, string $branch = 'master'): Process;
+
+    public function pull(string $upstream, string $branch = 'master'): string;
 
 	public function getLocalHead(): ?string;