#14 catch SSH error and target stdErr to display better error message

kakawait · kakawait · commit 4daaacebfa76 · 2014-02-28T17:32:22.000+01:00
diff --git a/src/Jumper/Communicator/Ssh.php b/src/Jumper/Communicator/Ssh.php
@@ -3,6 +3,7 @@
 namespace Jumper\Communicator;
 
 use Jumper\Communicator;
+use Jumper\Exception\CommunicatorException;
 use Net_SSH2 as Ssh2Client;
 
 /**
@@ -14,13 +15,19 @@
  */
 class Ssh implements Communicator
 {
+    /**
+     * @var \Net_SSH2
+     */
     private $ssh;
 
     /**
      * @var $authentication \Jumper\Communicator\Authentication
      */
     private $authentication;
 
+    /**
+     * @var array
+     */
     private $defaultOptions = array(
         'host' => '127.0.0.1',
         'port' => '22',
@@ -29,6 +36,9 @@ class Ssh implements Communicator
         'callbacks' => array()
     );
 
+    /**
+     * @param array $options
+     */
     public function __construct(array $options = array())
     {
         $this->defaultOptions = array_replace_recursive($this->defaultOptions, $options);
@@ -39,34 +49,69 @@ public function __construct(array $options = array())
         );
     }
 
+    /**
+     *
+     */
     public function __destruct()
     {
         $this->close();
     }
 
+    /**
+     * @param Authentication $authentication
+     */
     public function setAuthentication(Authentication $authentication)
     {
         $this->authentication = $authentication;
     }
 
-    public function isConnected() {
+    /**
+     * @return bool
+     */
+    public function isConnected()
+    {
         return !is_null($this->ssh) && $this->ssh->isConnected();
     }
 
+    /**
+     * @throws \Jumper\Exception\CommunicatorException
+     */
     public function connect()
     {
         $authentication = null;
         if (!is_null($this->authentication)) {
             $authentication = $this->authentication->getAuthentication($this->ssh);
         }
-        return $this->ssh->login($this->authentication->getUser(), $authentication);
+        if (!$this->ssh->login($this->authentication->getUser(), $authentication)) {
+            throw new CommunicatorException($this->ssh->getLastError(), $this->ssh->getExitStatus());
+        }
     }
 
+    /**
+     * @param $command
+     *
+     * @throws \RuntimeException
+     * @throws \Jumper\Exception\CommunicatorException
+     * @return String
+     */
     public function run($command)
     {
-        return $this->ssh->exec($command);
+        $result = $this->ssh->exec($command);
+        if ($result === false) {
+            throw new CommunicatorException($this->ssh->getLastError(), $this->ssh->getExitStatus());
+        }
+
+        $error = $this->ssh->getStdError();
+        if (!empty($error)) {
+            throw new \RuntimeException($this->ssh->getStdError(), $this->ssh->getExitStatus());
+        }
+
+        return $result;
     }
 
+    /**
+     *
+     */
     public function close()
     {
         $this->ssh->disconnect();
diff --git a/src/Jumper/Exception/CommunicatorException.php b/src/Jumper/Exception/CommunicatorException.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Jumper\Exception;
+
+/**
+ * Communicator exception
+ *
+ * @package Jumper\Exception
+ * @author  Thibaud Leprêtre
+ * @license MIT
+ */
+class CommunicatorException extends \Exception {
+
+} 
diff --git a/src/Jumper/Exception/ExecutorException.php b/src/Jumper/Exception/ExecutorException.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * User: t5e
+ * Date: 2/28/14
+ * Time: 5:18 PM
+ */
+
+namespace Jumper\Exception;
+
+
+class ExecutorException extends \Exception {
+
+} 
diff --git a/src/Jumper/Executor.php b/src/Jumper/Executor.php
@@ -3,6 +3,7 @@
 namespace Jumper;
 
 use Jeremeamia\SuperClosure\SerializableClosure;
+use Jumper\Exception\ExecutorException;
 use TinyPHP\Minifier;
 
 /**
@@ -70,12 +71,20 @@ public function run(\Closure $closure)
             );
 
             return $this->stringifier->toObject($output);
+        } catch (\RuntimeException $e) {
+            throw new ExecutorException('An error occurs when execution php on target host with the following message: '
+                                        . $e->getMessage());
         } catch (\Exception $e) {
             // todo Manage exception
             throw $e;
         }
     }
 
+    protected function isPhpError($string)
+    {
+        return strpos($string, 'PHP Notice:', 1);
+    }
+
     /**
      * Unserializer source code that is mandatory to unserialize object
      *
