Merge pull request #15 from bstoney/master

Added support for Windows

Author: castarco

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;
     }
 }