Various improvements

- Allow multiple commands to be specified from command line (good for
  debugging)
- Show the full stack trace on commands executed with --verbose

Author: dantleech

box.json

@@ -1,5 +1,5 @@
 {
-    "alias": "phpcr.phar",
+    "alias": "phpcrsh.phar",
     "chmod": "0755",
     "directories": ["src"],
     "files": [
@@ -13,7 +13,7 @@
         }
     ],
     "git-version": "package_version",
-    "main": "bin/phpcr",
-    "output": "phpcr.phar",
+    "main": "bin/phpcrsh",
+    "output": "phpcrsh.phar",
     "stub": true
 }

src/PHPCR/Shell/Console/Application/ShellApplication.php

@@ -288,7 +288,7 @@ public function doRun(InputInterface $input, OutputInterface $output)
         try {
             $exitCode = parent::doRun($input, $output);
         } catch (\Exception $e) {
-            $this->dispatcher->dispatch(PhpcrShellEvents::COMMAND_EXCEPTION, new Event\CommandExceptionEvent($e, $output));
+            $this->dispatcher->dispatch(PhpcrShellEvents::COMMAND_EXCEPTION, new Event\CommandExceptionEvent($e, $input, $output));
 
             return 1;
         }

src/PHPCR/Shell/Console/Command/ShellCommand.php

@@ -8,7 +8,7 @@
 use Symfony\Component\Console\Input\InputOption;
 use PHPCR\Shell\Console\Application\ShellApplication;
 use PHPCR\Shell\Console\Application\Shell;
-use Symfony\Component\Console\Input\StringInput;
+use PHPCR\Shell\Console\Input\StringInput;
 
 /**
  * The shell command is the command used to configure the shell session
@@ -63,7 +63,7 @@ public function configure()
 
             new InputOption('--profile',      '-p',    InputOption::VALUE_OPTIONAL, 'Speicfy a profile name, use wit <info>--transport</info> to update or create'),
             new InputOption('--unsupported',    null,    InputOption::VALUE_NONE, 'Show all commands, including commands not supported by the repository'),
-            new InputOption('--command',        null,    InputOption::VALUE_REQUIRED, 'Run the given command'),
+            new InputOption('--command',        null,    InputOption::VALUE_REQUIRED|InputOption::VALUE_IS_ARRAY, 'Run the given command'),
     ));
     }
 
@@ -80,10 +80,14 @@ public function execute(InputInterface $input, OutputInterface $output)
 
         $noInteraction = $input->getOption('no-interaction');
 
-        if ($command = $input->getOption('command')) {
+        if ($commands = $input->getOption('command')) {
             $application->setCatchExceptions(false);
-            $input = new StringInput($command);
-            $application->run($input, $output);
+            $application->setAutoExit(false);
+
+            foreach ($commands as $command) {
+                $input = new StringInput($command);
+                $application->run($input, $output);
+            }
 
             return;
         } else {

src/PHPCR/Shell/Event/CommandExceptionEvent.php

@@ -4,16 +4,19 @@
 
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Input\InputInterface;
 
 class CommandExceptionEvent extends Event
 {
     protected $exception;
     protected $output;
+    protected $input;
 
-    public function __construct(\Exception $exception, OutputInterface $output)
+    public function __construct(\Exception $exception, InputInterface $input, OutputInterface $output)
     {
         $this->exception = $exception;
         $this->output = $output;
+        $this->input = $input;
     }
 
     public function getException()
@@ -25,4 +28,9 @@ public function getOutput()
     {
         return $this->output;
     }
+
+    public function getInput()
+    {
+        return $this->input;
+    }
 }

src/PHPCR/Shell/Subscriber/ExceptionSubscriber.php

@@ -25,8 +25,15 @@ public static function getSubscribedEvents()
     public function handleException(CommandExceptionEvent $event)
     {
         $exception = $event->getException();
+        $input = $event->getInput();
         $output = $event->getOutput();
 
+        // if verbose, just throw the whole exception back
+        if ($input->hasOption('verbose') && $input->getOption('verbose')) {
+            throw $exception;
+        }
+
+
         if ($exception instanceof UnsupportedRepositoryOperationException) {
             $output->writeln('<error>Unsupported repository operation: This repository is not capable of performing the requested action</error>');
         }