Merge pull request #3 from igorsgm/chore/adjustments-2

wip

Author: igorsgm

src/Console/Commands/PostCommit.php

@@ -4,7 +4,7 @@
 
 use Igorsgm\GitHooks\Contracts\HookCommand;
 use Igorsgm\GitHooks\Exceptions\HookFailException;
-use Igorsgm\GitHooks\Git\GetLasCommitFromLog;
+use Igorsgm\GitHooks\Git\GitHelper;
 use Igorsgm\GitHooks\Git\Log;
 use Igorsgm\GitHooks\Traits\WithPipeline;
 use Illuminate\Console\Command;
@@ -54,15 +54,14 @@ public function getHook(): string
     /**
      * Execute the console command.
      *
-     * @param  GetLasCommitFromLog  $command
      * @return mixed
      */
-    public function handle(GetLasCommitFromLog $command)
+    public function handle()
     {
         try {
             $this->sendLogCommitThroughHooks(
                 new Log(
-                    $command->exec()->getOutput()
+                    GitHelper::getLastCommitFromLog()
                 )
             );
         } catch (HookFailException $e) {

src/Console/Commands/PreCommit.php

@@ -5,7 +5,7 @@
 use Igorsgm\GitHooks\Contracts\HookCommand;
 use Igorsgm\GitHooks\Exceptions\HookFailException;
 use Igorsgm\GitHooks\Git\ChangedFiles;
-use Igorsgm\GitHooks\Git\GetListOfChangedFiles;
+use Igorsgm\GitHooks\Git\GitHelper;
 use Igorsgm\GitHooks\Traits\WithPipeline;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Config\Repository;
@@ -54,15 +54,14 @@ public function getHook(): string
     /**
      * Execute the console command.
      *
-     * @param  GetListOfChangedFiles  $command
      * @return mixed
      */
-    public function handle(GetListOfChangedFiles $command)
+    public function handle()
     {
         try {
             $this->sendChangedFilesThroughHooks(
                 new ChangedFiles(
-                    $command->exec()->getOutput()
+                    GitHelper::getListOfChangedFiles()
                 )
             );
         } catch (HookFailException $e) {

src/Console/Commands/PrePush.php

@@ -4,7 +4,7 @@
 
 use Igorsgm\GitHooks\Contracts\HookCommand;
 use Igorsgm\GitHooks\Exceptions\HookFailException;
-use Igorsgm\GitHooks\Git\GetLasCommitFromLog;
+use Igorsgm\GitHooks\Git\GitHelper;
 use Igorsgm\GitHooks\Git\Log;
 use Igorsgm\GitHooks\Traits\WithPipeline;
 use Illuminate\Console\Command;
@@ -54,15 +54,14 @@ public function getHook(): string
     /**
      * Execute the console command.
      *
-     * @param  GetLasCommitFromLog  $command
      * @return mixed
      */
-    public function handle(GetLasCommitFromLog $command)
+    public function handle()
     {
         try {
             $this->sendLogCommitThroughHooks(
                 new Log(
-                    $command->exec()->getOutput()
+                    GitHelper::getLastCommitFromLog()
                 )
             );
         } catch (HookFailException $e) {

src/Contracts/GitCommand.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace Igorsgm\GitHooks\Git;
+
+use Igorsgm\GitHooks\Traits\ProcessHelper;
+use Symfony\Component\Process\Exception\ProcessFailedException;
+
+class GitHelper
+{
+    use ProcessHelper;
+
+    /**
+     * @return string
+     */
+    public static function getListOfChangedFiles()
+    {
+        return self::execAndGetCommandOutput('git status --short');
+    }
+
+    /**
+     * @return string
+     */
+    public static function getLastCommitFromLog()
+    {
+        return self::execAndGetCommandOutput('git log -1 HEAD');
+    }
+
+    /**
+     * @param  string|array  $commands
+     * @return string
+     */
+    private static function execAndGetCommandOutput($commands)
+    {
+        $process = self::execCommands($commands);
+
+        if (! $process->isSuccessful()) {
+            throw new ProcessFailedException($process);
+        }
+
+        return $process->getOutput();
+    }
+}

src/Git/GetLasCommitFromLog.php

@@ -0,0 +1,102 @@
+<?php
+
+namespace Igorsgm\GitHooks\Traits;
+
+use RuntimeException;
+use Symfony\Component\Process\Process;
+
+trait ProcessHelper
+{
+    /**
+     * Run the given commands.
+     *
+     * @param  array|string  $commands
+     * @param  array  $params
+     * @return \Symfony\Component\Process\Process
+     */
+    public function runCommands($commands, $params = [])
+    {
+        $input = $this->input ?? null;
+        $output = method_exists($this, 'getOutput') ? $this->getOutput() : null;
+
+        if ($output && ! $output->isDecorated()) {
+            $commands = $this->transformCommands($commands, function ($value) {
+                return $value.' --no-ansi';
+            });
+        }
+
+        if ($input && $input->getOption('quiet')) {
+            $commands = $this->transformCommands($commands, function ($value) {
+                return $value.' --quiet';
+            });
+        }
+
+        if (data_get($params, 'silent')) {
+            $commands = $this->transformCommands($commands, function ($value) {
+                return $this->buildNoOutputCommand($value);
+            });
+        }
+
+        $process = Process::fromShellCommandline(
+            implode(' && ', (array) $commands),
+            data_get($params, 'cwd'),
+            data_get($params, 'env'),
+            data_get($params, 'input'),
+            data_get($params, 'timeout')
+        );
+
+        $showOutput = data_get($params, 'tty') === true || data_get($params, 'show-output') === true;
+        if ($showOutput && '\\' !== DIRECTORY_SEPARATOR && file_exists('/dev/tty') && is_readable('/dev/tty')) {
+            try {
+                $process->setTty(true);
+            } catch (RuntimeException $e) {
+                $output->writeln('  <bg=yellow;fg=black> WARN </> '.$e->getMessage().PHP_EOL);
+            }
+        }
+
+        $process->run(! $showOutput ? null : function ($type, $line) use ($output) {
+            $output->write('    '.$line);
+        });
+
+        return $process;
+    }
+
+    /**
+     * Static alias for runCommands.
+     *
+     * @param  array|string  $commands
+     * @param  array  $params
+     * @return Process
+     */
+    public static function execCommands($commands, $params = [])
+    {
+        return (new self)->runCommands($commands, $params);
+    }
+
+    /**
+     * @param  array  $commands
+     * @param  callable  $callback
+     * @return array
+     */
+    public function transformCommands($commands, $callback)
+    {
+        return array_map(function ($value) use ($callback) {
+            if (substr($value, 0, 5) === 'chmod') {
+                return $value;
+            }
+
+            return $callback($value);
+        }, $commands);
+    }
+
+    /**
+     * Builds the string for a command without console output
+     *
+     * @param  string  $command
+     * @return string
+     */
+    public function buildNoOutputCommand($command = '')
+    {
+        return trim($command).' > '.(PHP_OS_FAMILY == 'Windows' ? 'NUL' : '/dev/null 2>&1');
+    }
+}

src/Git/GetListOfChangedFiles.php

@@ -7,7 +7,7 @@
 use Igorsgm\GitHooks\Exceptions\HookFailException;
 use Igorsgm\GitHooks\Git\ChangedFiles;
 use Igorsgm\GitHooks\Git\CommitMessage;
-use Igorsgm\GitHooks\Git\GetListOfChangedFiles;
+use Igorsgm\GitHooks\Git\GitHelper;
 use Illuminate\Contracts\Config\Repository;
 
 trait WithCommitMessage
@@ -26,10 +26,8 @@ trait WithCommitMessage
 
     /**
      * Execute the console command.
-     *
-     * @param  GetListOfChangedFiles  $command
      */
-    public function handle(GetListOfChangedFiles $command)
+    public function handle()
     {
         $file = $this->argument('file');
 
@@ -42,7 +40,7 @@ public function handle(GetListOfChangedFiles $command)
                 new CommitMessage(
                     $message,
                     new ChangedFiles(
-                        $command->exec()->getOutput()
+                        GitHelper::getListOfChangedFiles()
                     )
                 )
             );

src/Git/GitHelper.php

@@ -3,7 +3,7 @@
 namespace Igorsgm\GitHooks\Tests;
 
 use Igorsgm\GitHooks\CommitMessageStorage;
-use Igorsgm\GitHooks\Tests\Concerns\WithTmpFiles;
+use Igorsgm\GitHooks\Tests\Traits\WithTmpFiles;
 
 class CommitMessageStorageTest extends TestCase
 {