Merge branch 'feature-patterndata-refactor' into dev

Author: dmolsen

composer.json

@@ -8,6 +8,9 @@
 		}
 	},
 	"require": {
-		"alchemy/zippy": "0.2.0"
+		"alchemy/zippy": "0.2.0",
+		"michelf/php-markdown": "1.4",
+		"symfony/yaml": "2.4.4",
+		"scan/kss-php": "v0.6.0"
 	}
 }

composer.lock

@@ -77,8 +77,7 @@
 	// run commands
 
 	// load Pattern Lab's config, if first time set-up move files appropriately too
-	$configurer = new PatternLab\Configurer;
-	$config     = $configurer->getConfig();
+	PatternLab\Config::loadOptions();
 
 	// set-up required vars
 	$enableCSS     = $console->findCommandOption("c|enablecss");
@@ -89,7 +88,7 @@
 	if (($command == "g") || ($command == "b")) {
 
 		// load the generator
-		$g = new PatternLab\Generator($config);
+		$g = new PatternLab\Generator();
 		$g->generate($enableCSS,$moveStatic,$noCacheBuster);
 		$g->printSaying();
 
@@ -99,31 +98,31 @@
 		$enableCSS = false;
 
 		// load the generator
-		$g = new PatternLab\Generator($config);
+		$g = new PatternLab\Generator();
 		$g->generate($enableCSS,$moveStatic,$noCacheBuster);
 
 		// load the watcher
-		$w = new PatternLab\Watcher($config);
+		$w = new PatternLab\Watcher();
 		$w->watch($autoReload,$moveStatic,$noCacheBuster);
 
 	} else if ($command == "s") {
 
 		// run the snapshot command
 		$snapshotDir = $console->findCommandOptionValue("d|dir");
-		$s = new PatternLab\Snapshot($config);
+		$s = new PatternLab\Snapshot();
 		$s->takeSnapshot($snapshotDir);
 
 	} else if ($command == "f") {
 
 		// run the snapshot command
 		$starterKit = $console->findCommandValue("f|fetch");
-		$sk = new PatternLab\StarterKit($config);
+		$sk = new PatternLab\StarterKit();
 		$sk->fetch($starterKit);
 
 	} else if ($command == "v") {
 
 		// write out the version number
-		print "You're running v".$config["v"]." of the PHP version of Pattern Lab.\n";
+		print "You're running v".PatternLab\Config::$options["v"]." of the PHP version of Pattern Lab.\n";
 		exit;
 
 	}

core/builder.php

@@ -43,7 +43,7 @@ styleGuideExcludes = ""
 cacheBusterOn = "true"
 
 // the pattern rending engine
-patternEngine = "mustache"
+patternExtension = "mustache"
 
 // the public directory
 publicDir = "public"