Merge remote-tracking branch 'upstream/master' into fix-fetchstarterkit

Conflicts:
	src/PatternLab/Fetch.php

Author: aleksip

.editorconfig

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

src/PatternLab/Config.php

@@ -207,6 +207,7 @@ public static function init($baseDir = "", $verbose = true) {
 		self::setExposedOption("ishFontSize");
 		self::setExposedOption("ishMaximum");
 		self::setExposedOption("ishMinimum");
+		self::setExposedOption("patternExtension");
 
 	}
 

src/PatternLab/Console/Commands/ServerCommand.php

@@ -24,6 +24,9 @@ public function __construct() {
 		$this->command = "server";
 
 		Console::setCommand($this->command,"Start the PHP-based server","The server command will start PHP's web server for you.","s");
+		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::setCommandSample($this->command,"To provide both a custom hostname and port:","--host <host> --port <port>");
 
 	}
 
@@ -39,9 +42,15 @@ public function run() {
 			$publicDir = Config::getOption("publicDir");
 			$coreDir   = Config::getOption("coreDir");
 
+			$host = Console::findCommandOptionValue("host");
+			$host = $host ? $host : "localhost";
+			
+			$port = Console::findCommandOptionValue("port");
+			$host = $port ? $host.":".$port : $host.":8080";
+			
 			// start-up the server with the router
-			Console::writeInfo("server started on localhost:8080. use ctrl+c to exit...");
-			passthru("cd ".$publicDir." && ".$_SERVER["_"]." -S localhost:8080 ".$coreDir."/server/router.php");
+			Console::writeInfo("server started on ".$host.". use ctrl+c to exit...");
+			passthru("cd ".$publicDir." && ".$_SERVER["_"]." -S ".$host." ".$coreDir."/server/router.php");
 
 		}
 

src/PatternLab/Console/Commands/WatchCommand.php

@@ -27,8 +27,9 @@ public function __construct() {
 
 		Console::setCommand($this->command,"Watch for changes and regenerate","The watch command builds Pattern Lab, watches for changes in <path>source/</path> and regenerates Pattern Lab when there are any.","w");
 		Console::setCommandOption($this->command,"patternsonly","Watches only the patterns. Does NOT clean <path>public/</path>.","To watch and generate only the patterns:","p");
-		Console::setCommandOption($this->command,"nocache","Set the cacheBuster value to 0.","To turn off the cacheBuster:","n");
-		Console::setCommandOption($this->command,"starterkit","Watch for changes to the StarterKit and copy to <path>source/</path>. The <info>--starterkit</info> flag should only be used if one is actively developing a StarterKit.","To watch for changes to the StarterKit:","s");
+		Console::setCommandOption($this->command,"nocache","Set the cacheBuster value to 0.","To watch and turn off the cache buster:","n");
+		Console::setCommandOption($this->command,"sk","Watch for changes to the StarterKit and copy to <path>source/</path>. The <info>--sk</info> flag should only be used if one is actively developing a StarterKit.","To watch for changes to the StarterKit:");
+		Console::setCommandSample($this->command,"To watch only patterns and turn off the cache buster:","--patternsonly --nocache");
 		//Console::setCommandOption($this->command,"autoreload","Turn on the auto-reload service.","To turn on auto-reload:","r");
 
 	}
@@ -44,7 +45,7 @@ public function run() {
 		// $options["autoReload"]    = Console::findCommandOption("r|autoreload");
 
 		// see if the starterKit flag was passed so you know what dir to watch
-		if (Console::findCommandOption("s|starterkit")) {
+		if (Console::findCommandOption("sk")) {
 
 			// load the starterkit watcher
 			$w = new Watcher();