Solve merge conflict

Author: castarco

CONTRIBUTING.md

@@ -0,0 +1,45 @@
+Jupyter-PHP Contributing Guidelines
+====================================
+
+Contributing with Code
+----------------------
+
+In first place, if you want to contribute code to Jupyter-PHP, you must have installed PHP, preferably recent
+versions (PHP>=5.5, but recommended PHP>=7.0).
+
+If you don't know where to start, you can try searching inside the
+[issues list](https://github.com/Litipk/Jupyter-PHP/issues). Specially the ones marked with the
+[help wanted](https://github.com/Litipk/Jupyter-PHP/labels/help%20wanted) tag.
+
+Some extra advices related on good practices:
+ * We try to follow the PSR standards, in special **PSR-1**, **PSR-2** and **PSR-4**.
+ * Every new added feature should come with unit tests, stability and code correctness is an important priority of this project.
+
+
+Contributing with Documentation
+-------------------------------
+
+If you want to contribute documentation, you're welcome! :) , BUT, actually the documentation is pretty bad, and it's perfectly
+undersandable that this task isn't very attractive.
+
+Contributing with Bug Reports
+-----------------------------
+
+A very important part of every software project is the bugs tracking and solving process. You can send us bug reports through
+the [tracker](https://github.com/Litipk/Jupyter-PHP/issues).
+
+It's desirable that every bug report explains the bug in a way that the developers can easily reproduce it. The following points
+are very helpful in order to achieve reproducibility:
+* Example code.
+* Jupyter version
+* Jupyter-PHP version.
+* Python version
+* PHP version
+
+Contributing with New Ideas
+---------------------------
+
+You can use the github [tracker](https://github.com/Litipk/Jupyter-PHP/issues) to send us new ideas, even if those ideas aren't
+bug reports. In such case, adding something like "SUGGESTION: ...", "IMPROVEMENT: ..." to the report bug it's a good idea.
+
+You can also discuss your ideas with us in our [Gitter chat room](https://gitter.im/Litipk/Jupyter-PHP).

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2016 Litipk
+Copyright (c) 2015-2017 Litipk
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-

composer.json

@@ -5,10 +5,10 @@
     "license": "MIT",
     "require": {
         "php": ">=7.0.0",
-        "composer/composer": "^1.3.1",
         "ext-zmq": "*",
+        "composer/composer": "^1.3.1",
         "monolog/monolog": "^1.22",
-        "psy/psysh": "0.8.*",
+        "psy/psysh": "^0.8",
         "ramsey/uuid": "^3.5",
         "react/zmq": "^0.3.0",
         "symfony/polyfill-php70": "^1.3"

src/JupyterBroker.php

@@ -77,7 +77,7 @@ public function send(
         );
 
         if (null !== $this->logger) {
-            $this->logger->debug('Sent message', ['processId' => posix_getpid(), 'message' => $finalMsg]);
+            $this->logger->debug('Sent message', ['processId' => getmypid(), 'message' => $finalMsg]);
         }
 
         $stream->send($finalMsg);

src/System/BsdSystem.php

@@ -11,10 +11,4 @@ public function getOperativeSystem()
     {
         return self::OS_BSD;
     }
-
-    /** @return string */
-    public function getAppDataDirectory()
-    {
-        return $this->getCurrentUserHome().'/.jupyter-php';
-    }
 }

src/System/LinuxSystem.php

@@ -11,10 +11,4 @@ public function getOperativeSystem()
     {
         return self::OS_LINUX;
     }
-
-    /** @return string */
-    public function getAppDataDirectory()
-    {
-        return $this->getCurrentUserHome().'/.jupyter-php';
-    }
 }

src/System/System.php

@@ -40,7 +40,13 @@ public abstract function getCurrentUser();
     /** @return string */
     public abstract function getCurrentUserHome();
 
-    /** @return string */
+   /**
+     * @param string $cmdName
+     * @return boolean
+     */
+    public abstract function checkIfCommandExists($cmdName);
+
+   /** @return string */
     public abstract function getAppDataDirectory();
 
     /**

src/System/UnixSystem.php

@@ -32,6 +32,30 @@ public function getCurrentUserHome()
         }
     }
 
+    /**
+     * @param string $cmdName
+     * @return boolean
+     */
+    public function checkIfCommandExists($cmdName)
+    {
+        if (!function_exists('exec')) {
+            return false;
+        }
+
+        $sysResponse = exec(
+            'PATH='.getenv('PATH').'; '.
+            "if command -v ".$cmdName." >/dev/null 2>&1; then echo \"true\"; else echo \"false\"; fi;"
+        );
+
+        return filter_var($sysResponse, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);
+    }
+
+    /** @return string */
+    public function getAppDataDirectory()
+    {
+        return $this->getCurrentUserHome().'/.jupyter-php';
+    }
+
     /**
      * Returns true if the path is a "valid" path and is writable (even if the complete path does not yet exist).
      * @param string $path
@@ -41,7 +65,7 @@ public function validatePath($path)
     {
         $absPath = $this->getAbsolutePath($path);
         $absPathParts = preg_split('/\//', preg_replace('/(^\/|\/$)/', '', $absPath));
-        $nSteps = count($absPath);
+        $nSteps = count($absPathParts);
 
         $tmpPath = '';
         $prevReadable = false;

src/System/WindowsSystem.php

@@ -33,14 +33,66 @@ public function getCurrentUserHome()
         }
     }
 
+    /**
+     * @param string $cmdName
+     * @return boolean
+     */
+    public function checkIfCommandExists($cmdName)
+    {
+        if (!function_exists('exec')) {
+            return false;
+        }
+
+        $sysResponse = exec("where $cmdName > nul 2>&1 && echo true");
+
+        return filter_var($sysResponse, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);
+    }
+
+    /** @return string */
+    public function getAppDataDirectory()
+    {
+        return $this->getCurrentUserHome() . '/.jupyter-php';
+    }
+
     /**
      * Returns true if the path is a "valid" path and is writable (event if the complete path does not yet exist).
      * @param string $path
      * @return boolean
      */
     public function validatePath($path)
     {
-        // TODO: Implement validatePath() method.
+        $absPath = $this->getAbsolutePath($path);
+        $absPathParts = explode(DIRECTORY_SEPARATOR, $absPath);
+        $nSteps = count($absPathParts);
+
+        $tmpPath = $absPathParts[0];
+        $prevReadable = false;
+        $prevWritable = false;
+
+        for ($i = 1; $i < $nSteps; $i++) {
+            $tmpPath .= DIRECTORY_SEPARATOR . $absPathParts[$i];
+
+            if (file_exists($tmpPath)) {
+                if (!is_dir($tmpPath)) {
+                    if (is_link($tmpPath)) {
+                        $linkPath = readlink($tmpPath);
+                        if (false === $linkPath || !is_dir($linkPath)) {
+                            return false;
+                        }
+                        $tmpPath = $linkPath;
+                    } else {
+                        return false;
+                    }
+                }
+
+                $prevReadable = is_readable($tmpPath);
+                $prevWritable = is_writable($tmpPath);
+            } else {
+                return ($prevReadable && $prevWritable);
+            }
+        }
+
+        return true;
     }
 
     /**
@@ -49,7 +101,13 @@ public function validatePath($path)
      */
     public function ensurePath($path)
     {
-        // TODO: Implement ensurePath() method.
+        $absPath = $this->getAbsolutePath($path);
+
+        if (!file_exists($absPath) && false === mkdir($absPath, 0755, true)) {
+            throw new \RuntimeException('Unable to create the specified directory (' . $absPath . ').');
+        }
+
+        return $absPath;
     }
 
     /**
@@ -58,7 +116,7 @@ public function ensurePath($path)
      */
     protected function isAbsolutePath($path)
     {
-        // TODO: Implement isAbsolutePath() method.
+        return preg_match('/^[a-z]\:/i', $path) === 1;
     }
 
     /**
@@ -67,6 +125,11 @@ protected function isAbsolutePath($path)
      */
     protected function getAbsolutePath($path)
     {
-        // TODO: Implement getAbsolutePath() method.
+        $path = $this->isAbsolutePath($path) ? $path : (getcwd() . DIRECTORY_SEPARATOR . $path);
+
+        // Normalise directory separators
+        $path = preg_replace('/[\/\\\\]/u', DIRECTORY_SEPARATOR, $path);
+
+        return $path;
     }
 }