new way to build commands. add support for --with-watch. use processSpawner

Author: dmolsen

src/PatternLab/Console/Commands/ServerCommand.php

@@ -13,8 +13,11 @@
 use \PatternLab\Config;
 use \PatternLab\Console;
 use \PatternLab\Console\Command;
+use \PatternLab\Console\Commands\WatchCommand;
+use \PatternLab\Console\ProcessSpawner;
 use \PatternLab\Timer;
 
+
 class ServerCommand extends Command {
 
 	public function __construct() {
@@ -27,6 +30,7 @@ public function __construct() {
 		Console::setCommandOption($this->command,"host:","Provide a custom hostname. Default value is <path>localhost</path>.","To use a custom hostname and the default port:","","<host>");
 		Console::setCommandOption($this->command,"port:","Provide a custom port. Default value is <path>8080</path>.","To use a custom port and the default hostname:","","<port>");
 		Console::setCommandOption($this->command,"quiet","Turn on quiet mode for the server.","To turn on quiet mode:");
+		Console::setCommandOption($this->command,"with-watch","Start watching ./source when starting the server. Takes the same arguments as --watch.","To turn on with-watch mode:");
 		Console::setCommandSample($this->command,"To provide both a custom hostname and port:","--host <host> --port <port>");
 
 	}
@@ -43,29 +47,50 @@ public function run() {
 			$publicDir = Config::getOption("publicDir");
 			$coreDir   = Config::getOption("coreDir");
 
-			$host = Console::findCommandOptionValue("host");
-			$host = $host ? $host : "localhost";
+			$host  = Console::findCommandOptionValue("host");
+			$host  = $host ? $host : "localhost";
 
-			$port = Console::findCommandOptionValue("port");
-			$host = $port ? $host.":".$port : $host.":8080";
+			$port  = Console::findCommandOptionValue("port");
+			$host  = $port ? $host.":".$port : $host.":8080";
 
-			$null = Console::findCommandOption("quiet");
-			$null = $null ? " >& /dev/null" : "";
+			$quiet = Console::findCommandOption("quiet");
 
-			$php  = isset($_SERVER["_"]) ? $_SERVER["_"] : Config::getOption("phpBin");
+			// set-up the base command
+			$command    = $this->pathPHP." -S ".$host." ".$coreDir."/server/router.php";
+			$commands   = array();
+			$commands[] = array("command" => $command, "cwd" => $publicDir, "timeout" => null, "idle" => 600);
 
-			if (!$php) {
-				$configPath = Console::getHumanReadablePath(Config::getOption("configPath"));
-				Console::writeError("please add the option `phpBin` with the path to PHP to <path>".$configPath."</path> before running the server...");
+			// get the watch command info
+			if (Console::findCommandOption("with-watch")) {
+				$watchCommand = new WatchCommand;
+				$commands[]   = array("command" => $watchCommand->build()." --noprocs", "timeout" => null, "idle" => 600);
 			}
 
-			// start-up the server with the router
 			Console::writeInfo("server started on http://".$host." - use ctrl+c to exit...");
 
-			passthru("cd ".$publicDir." && ".$php." -S ".$host." ".$coreDir."/server/router.php".$null);
+			$processSpawner = new ProcessSpawner;
+			$processSpawner->spawn($commands, $quiet);
 
 		}
 
 	}
 
+	public function build() {
+		
+		$command = $this->pathPHP." ".$this->pathConsole." --".$this->command;
+		
+		$host = Console::findCommandOptionValue("host");
+		$port = Console::findCommandOptionValue("port");
+		
+		if ($host) {
+			$command .= " --host ".$host;
+		}
+		if ($port) {
+			$command .= " --port ".$port;
+		}
+		
+		return $command;
+		
+	}
+	
 }