fix: remote branch line parse fail, update some command logic

src/CmdBuilder.php

@@ -444,4 +444,12 @@ public function isFail(): bool
     {
         return $this->code !== 0;
     }
+
+    /**
+     * @return bool
+     */
+    public function isSuccess(): bool
+    {
+        return $this->code === 0;
+    }
 }

src/Command/Commit.php

@@ -56,8 +56,7 @@ public function __invoke(string $message, array $options = []): bool
         $this->addFlags($builder, $options, ['all', 'amend']);
         $this->addValues($builder, $options, ['reuse-message', 'squash', 'author', 'date', 'cleanup']);
 
-        // $this->run($builder);
-        $builder->run();
+        $this->run($builder);
 
         return true;
     }

src/Command/Tag.php

@@ -73,7 +73,7 @@ public function list(string $sort = ''): array
         $builder = $this->getCommandBuilder()
             ->addIf("--sort=$sort", $sort);
 
-        $output = $builder->run();
+        $output = $this->run($builder);
         return $this->split($output);
     }
 
@@ -119,10 +119,9 @@ public function create(string $tag, $commit = null, array $options = []): bool
             $builder->add($commit);
         }
 
-        // $this->run($builder);
-        $builder->run();
+        $this->run($builder);
 
-        return true;
+        return $builder->isSuccess();
     }
 
     /**
@@ -144,8 +143,7 @@ public function delete(Traversable|array|string $tag): bool
             $builder->add($value);
         }
 
-        // $this->run($builder);
-        $builder->run();
+        $this->run($builder);
         return true;
     }
 

src/Concern/AbstractCommand.php

@@ -32,6 +32,11 @@ abstract class AbstractCommand
      */
     protected Git $git;
 
+    /**
+     * @var bool
+     */
+    protected bool $printCmd = false;
+
     /**
      * @param Git $git
      */
@@ -40,6 +45,25 @@ public function __construct(Git $git)
         $this->git = $git;
     }
 
+    /**
+     * @return bool
+     */
+    public function isPrintCmd(): bool
+    {
+        return $this->printCmd;
+    }
+
+    /**
+     * @param bool $printCmd
+     *
+     * @return static
+     */
+    public function setPrintCmd(bool $printCmd): static
+    {
+        $this->printCmd = $printCmd;
+        return $this;
+    }
+
     /**
      * @return string
      */
@@ -119,6 +143,18 @@ protected function getCommandBuilder(string ...$args): CmdBuilder
         return $this->git->getCommandBuilder($cmd, ...$args);
     }
 
+    /**
+     * build git command for run
+     *
+     * @param mixed ...$args
+     *
+     * @return CmdBuilder
+     */
+    public function builder(string ...$args): CmdBuilder
+    {
+        return $this->getCommandBuilder(...$args);
+    }
+
     /**
      * Executes a process
      *
@@ -128,7 +164,7 @@ protected function getCommandBuilder(string ...$args): CmdBuilder
      */
     public function run(CmdBuilder $builder): string
     {
-        return $builder->run();
+        return $builder->setPrintCmd($this->printCmd)->run();
     }
 
     /**

src/GitUtil.php

@@ -129,7 +129,8 @@ public static function parseRemoteUrl(string $url): array
     /**
      * '/(?<current>\*| ) (?<name>[^\s]+) +((?:->) (?<alias>[^\s]+)|(?<hash>[0-9a-z]{7}) (?<message>.*))/'
      */
-    public const PATTERN_BR_LINE = '/(?<current>\*| ) (?<name>\S+) +((?:->) (?<alias>\S+)|(?<hash>[0-9a-z]{4,41}) (?<message>.*))/';
+    // public const PATTERN_BR_LINE = '/(?<current>\* )(?<name>\S+) +((?:->) (?<alias>\S+)|(?<hash>[0-9a-z]{4,41}) (?<message>.*))/';
+    public const PATTERN_BR_LINE = '/(?<current>\* )?(?<name>\S+) +(?<hash>[0-9a-z]{4,41}) (?<message>.*)/';
 
     /**
      * @param string $line
@@ -167,7 +168,7 @@ public static function parseBranchLine(string $line, bool $verbose = true): arra
 
         // up from: https://github.com/kzykhys/PHPGit/pull/15/files
         if (isset($matches['current'])) {
-            $branch['current'] = $matches['current'] === '*';
+            $branch['current'] = trim($matches['current']) === '*';
         }
 
         // full name with remote. eg: remotes/origin/NAME

src/Repo.php

@@ -32,10 +32,10 @@ class Repo
      */
     private ?Git $git = null;
 
-    /*
-     * @var Info
+    /**
+     * @var bool
      */
-    // private $info;
+    private bool $debug = false;
 
     /**
      * @var string
@@ -178,6 +178,7 @@ public function getStatusInfo(bool $refresh = false): StatusInfo
 
         $text = $this->ensureGit()
             ->newCmd('status', '-bs', '-u')
+            ->setPrintCmd($this->debug)
             ->run(true);
 
         $this->statusInfo = StatusInfo::fromString($text);
@@ -291,7 +292,7 @@ public function getLastTagName(bool $refresh = false): string
         $git = $this->ensureGit();
         $val = $git->isQuietRun();
 
-        $str = $git->setQuietRun(true)->getLastTagName($refresh);
+        $str = $git->setPrintCmd($this->debug)->getLastTagName($refresh);
         $git->setQuietRun($val);
 
         return $str;
@@ -321,8 +322,8 @@ public function getCurrentBranch(bool $refresh = false): string
     public function getBranchInfos(bool $refresh = false): BranchInfos
     {
         if ($refresh || !$this->branchInfos) {
-            $str = $this->newCmd('branch', '-v', '--abbrev=7')
-                ->setQuietRun(true)
+            $str = $this->newCmd('branch', '-av', '--abbrev=7')
+                ->setPrintCmd($this->debug)
                 ->run(true);
 
             $this->branchInfos = BranchInfos::fromString($str);
@@ -523,4 +524,15 @@ public function getPlatform(): string
         return $this->platform;
     }
 
+    /**
+     * @param bool $debug
+     *
+     * @return Repo
+     */
+    public function setDebug(bool $debug): self
+    {
+        $this->debug = $debug;
+        return $this;
+    }
+
 }

test/Info/BranchInfosTest.php

@@ -41,5 +41,7 @@ public function testBranchInfos_verbose(): void
 
         $this->assertNotEmpty($cur = $brInfos->getCurrentBranch());
         $this->assertTrue($cur->current);
+        $this->assertNotEmpty($brInfos->getRemoteBranches());
+        $this->assertNotEmpty($brInfos->getRemoteBranch('my_new_br'));
     }
 }