Merge branch 'dev'

Conflicts:
	composer.json

Author: dmolsen

.editorconfig

@@ -2,7 +2,7 @@ root = true
 
 [*]
 charset = utf-8
-indent_style = tab
+indent_style = space
 trim_trailing_whitespace = false
 end_of_line = lf
 insert_final_newline = true

README.md

@@ -1,9 +1,9 @@
-![license](https://img.shields.io/github/license/pattern-lab/plugin-php-reload.svg?maxAge=2592000)
-[![Packagist](https://img.shields.io/packagist/v/pattern-lab/plugin-reload.svg?maxAge=2592000)](https://packagist.org/packages/pattern-lab/plugin-reload) [![Gitter](https://img.shields.io/gitter/room/pattern-lab/php.svg?maxAge=2592000)](https://gitter.im/pattern-lab/php)
+![license](https://img.shields.io/github/license/pattern-lab/plugin-php-reload.svg)
+[![Packagist](https://img.shields.io/packagist/v/pattern-lab/plugin-reload.svg)](https://packagist.org/packages/pattern-lab/plugin-reload) [![Gitter](https://img.shields.io/gitter/room/pattern-lab/php.svg)](https://gitter.im/pattern-lab/php)
 
 # Reload Plugin for Pattern Lab
 
-The Reload Plugin adds Web Socket-based automatic browser reload support to Pattern Lab. The Reload Plugin will automatically reload the Pattern Lab iFrame if you're using the `--watch` flag.
+The Reload Plugin adds Web Socket-based automatic browser reload support to Pattern Lab. The Reload Plugin will automatically reload the Pattern Lab iFrame if you're using the `--watch` flag or `--server --with-watch` flag combo.
 
 ## Installation
 
@@ -19,8 +19,12 @@ The Reload Plugin is automatically turned on when you install it. Simply "watch"
 
     php core/console --watch
 
+You can also run your server and watch your project at the same time:
+
+    php core/console --server --with-watch
+
 ## Disabling the Plugin
 
 To disable the Reload Plugin you can either directly edit `./config/config.yml` or use the command line option:
 
-    php core/console --config --set reload.on=false
+    php core/console --config --set plugins.reload.enabled=false

composer.json

@@ -1,7 +1,7 @@
 {
   "name":             "pattern-lab/plugin-reload",
   "description":      "Automatic Browser Reload Support for Pattern Lab",
-  "keywords":         ["autoreload", "pattern lab"],
+  "keywords":         ["reload", "websocket", "pattern lab"],
   "homepage":         "http://patternlab.io",
   "license":          "MIT",
   "type":             "patternlab-plugin",
@@ -27,7 +27,6 @@
     "php":              ">=5.4",
     "pattern-lab/core": "^2.4.0",
     "wrench/wrench":    "^2.0.0",
-    "cocur/background-process": "~0.5"
   },
   "extra": {
     "patternlab": {
@@ -37,10 +36,11 @@
         ]
       },
       "onready": "PluginReload.init()",
-      "callback": "",
       "config": {
-        "reload": {
-          "on": true
+        "plugins": {
+          "reload": {
+            "enabled": true
+          }
         }
       }
     }

src/PatternLab/Reload/PatternLabListener.php

@@ -12,9 +12,9 @@
 
 namespace PatternLab\Reload;
 
-use \Cocur\BackgroundProcess\BackgroundProcess;
 use \PatternLab\Config;
 use \PatternLab\Console;
+use \PatternLab\Console\ProcessSpawnerEvent;
 use \PatternLab\Data;
 
 class PatternLabListener extends \PatternLab\Listener {
@@ -25,20 +25,32 @@ class PatternLabListener extends \PatternLab\Listener {
   public function __construct() {
 
     // add listener
-    $this->addListener("watcher.start","initServer");
+    $this->addListener("processSpawner.getPluginProcesses","addProcess");
 
   }
 
   /**
-  * Initialize the web socket server
+  * Add command to initialize the websocket server
   */
-  public function initServer() {
+  public function addProcess(ProcessSpawnerEvent $event) {
 
-    if ((bool)Config::getOption("reload.on")) {
-      $php     = isset($_SERVER["_"]) ? $_SERVER["_"] : Config::getOption("phpBin");
-      $path    = __DIR__."/AutoReloadServer.php";
-      $process = new BackgroundProcess($php." ".$path);
-      $process->run();
+    if ((bool)Config::getOption("plugins.reload.enabled")) {
+      
+      // only run this command if watch is going to be used
+      if (Console::findCommand("w|watch") || Console::findCommandOption("with-watch")) {
+        
+        // set-up the command
+        $pathPHP      = Console::getPathPHP();
+        $pathReload   = __DIR__."/AutoReloadServer.php";
+        $command      = "exec ".$pathPHP." ".$pathReload;
+        
+        // send the processes on their way
+        $processes     = array();
+        $processes[]   = array("command" => $command, "timeout" => null, "idle" => 600, "output" => false);
+        $event->addPluginProcesses($processes);
+        
+      }
+      
     }
 
   }