[exec] Show command info. (#126)

hechoendrupal · Dec 30, 2016 · 99fc369 · 99fc369
1 parent 221ad3b
commit 99fc369
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 8 deletions.
diff --git a/services.yml b/services.yml
@@ -20,7 +20,7 @@ services:
     class: Drupal\Console\Core\Utils\FileQueue
   console.shell_process:
     class: Drupal\Console\Core\Utils\ShellProcess
-    arguments: ['@app.root']
+    arguments: ['@app.root', '@console.translator_manager']
   console.string_converter:
       class: Drupal\Console\Core\Utils\StringConverter
   console.chain_discovery:

diff --git a/src/Command/Exec/ExecCommand.php b/src/Command/Exec/ExecCommand.php
@@ -12,6 +12,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Process\ExecutableFinder;
 use Drupal\Console\Core\Command\Shared\CommandTrait;
 use Drupal\Console\Core\Utils\ShellProcess;
 use Drupal\Console\Core\Style\DrupalStyle;
@@ -76,6 +77,23 @@ protected function execute(InputInterface $input, OutputInterface $output)
             return 1;
         }
 
+        $name = $bin;
+        if ($index = stripos($name, " ")) {
+            $name = substr($name, 0, $index);
+        }
+
+        $finder = new ExecutableFinder();
+        if (!$finder->find($name)) {
+            $io->error(
+                sprintf(
+                    $this->trans('commands.exec.messages.binary-not-found'),
+                    $name
+                )
+            );
+
+            return 1;
+        }
+
         if (!$this->shellProcess->exec($bin, $workingDirectory)) {
             $io->error(
                 sprintf(

diff --git a/src/Utils/ShellProcess.php b/src/Utils/ShellProcess.php
@@ -18,6 +18,11 @@ class ShellProcess
      */
     protected $appRoot;
 
+    /**
+     * @var TranslatorManager
+     */
+    protected $translator;
+
     /**
      * @var ShellProcess
      */
@@ -30,11 +35,13 @@ class ShellProcess
 
     /**
      * Process constructor.
-     * @param string $appRoot
+     * @param string            $appRoot
+     * @param TranslatorManager $translator
      */
-    public function __construct($appRoot)
+    public function __construct($appRoot, $translator)
     {
         $this->appRoot = $appRoot;
+        $this->translator = $translator;
 
         $output = new ConsoleOutput();
         $input = new ArrayInput([]);
@@ -54,6 +61,19 @@ public function exec($command, $workingDirectory=null)
         if (!$workingDirectory || $workingDirectory==='') {
             $workingDirectory = $this->appRoot;
         }
+
+        $this->io->newLine();
+        $this->io->comment(
+            $this->translator->trans('commands.exec.messages.working-directory') .': ',
+            false
+        );
+        $this->io->writeln($workingDirectory);
+        $this->io->comment(
+            $this->translator->trans('commands.exec.messages.executing-command') .': ',
+            false
+        );
+        $this->io->writeln($command);
+
         $this->process = new Process($command);
         $this->process->setWorkingDirectory($workingDirectory);
         $this->process->enableOutput();

diff --git a/src/Utils/TwigRenderer.php b/src/Utils/TwigRenderer.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\Console\Core\Utils;
 
-use MongoDB\Driver\Manager;
+use Drupal\Console\Core\Utils\TranslatorManager;;
 
 /**
  * Class TwigRenderer
@@ -16,7 +16,7 @@
 class TwigRenderer
 {
     /**
-     * @var Manager
+     * @var TranslatorManager
      */
     protected $translator;
 
@@ -37,11 +37,11 @@ class TwigRenderer
 
     /**
      * TwigRenderer constructor.
-     * @param Manager         $translator
-     * @param StringConverter $stringConverter
+     * @param TranslatorManager $translator
+     * @param StringConverter   $stringConverter
      */
     public function __construct(
-        Manager $translator,
+        TranslatorManager $translator,
         StringConverter $stringConverter
     ) {
         $this->translator = $translator;