opdavies/dotfiles
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

git: Add methods for writing messages

Browse source 
Refactor CI status output.
This commit is contained in:
Oliver Davies 2020-05-27 18:44:03 +01:00
parent e8ff1fcc82
commit 171f251d89
1 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
bin/git-close-pull-request
View file

@ -61,7 +61,7 @@ class ClosesPullRequests
private function getTargetBranchFromArgs(): string private function getTargetBranchFromArgs(): string
{ {
if (!$targetBranchName = $this->getArg('t:', ['target:'])) { if (!$targetBranchName = $this->getArg('t:', ['target:'])) {
die('Invalid target branch specified. Aborting.'); $this->dieWithMessage('Invalid target branch specified. Aborting.');
} }
return $targetBranchName; return $targetBranchName;
@ -77,8 +77,14 @@ class ClosesPullRequests
self::CI_PENDING => 'Aborting: CI pending', self::CI_PENDING => 'Aborting: CI pending',
]; ];
if (array_key_exists($status = exec('hub ci-status'), $errors)) { $ciStatus = $this->run('hub ci-status', self::RUN_TYPE_QUERY);
die($errors[$status]);
switch ($ciStatus) {
case self::CI_PENDING:
$this->exitWithWarning($errors[$ciStatus]);
case self::CI_ERROR:
$this->dieWithMessage($errors[$ciStatus]);
} }
} }
@ -122,7 +128,7 @@ class ClosesPullRequests
)); ));
if ($localCommitTip != $remoteCommitTip) { if ($localCommitTip != $remoteCommitTip) {
die(sprintf( $this->dieWithMessage(sprintf(
'Branch %s was out of date, needs rebasing. Aborting.', 'Branch %s was out of date, needs rebasing. Aborting.',
$localBranch $localBranch
)); ));
@ -160,7 +166,7 @@ class ClosesPullRequests
// Switch back to the previous branch. // Switch back to the previous branch.
$this->run('git checkout -', self::RUN_TYPE_COMMAND); $this->run('git checkout -', self::RUN_TYPE_COMMAND);
die(sprintf( $this->dieWithMessage(sprintf(
'Branch %s is not fast-forwardable.', 'Branch %s is not fast-forwardable.',
$this->localBranch $this->localBranch
)); ));
@ -231,6 +237,20 @@ class ClosesPullRequests
return exec($command, $output); return exec($command, $output);
} }
} }
private function dieWithMessage(string $message): void
{
echo sprintf("\e[31m%s\e[0m", $message);
exit(1);
}
private function exitWithWarning(string $message): void
{
echo sprintf("\e[33m%s\e[0m", $message);
exit(2);
}
} }
(new ClosesPullRequests())->__invoke(); (new ClosesPullRequests())->__invoke();