getting rid of refs to packagesDir in favor of configDir

Author: dmolsen

config/config.yml.default

@@ -35,6 +35,5 @@ cacheBusterOn: "true"
 
 # project directories
 exportDir: "export"
-packagesDir: "packages"
 publicDir: "public"
 sourceDir: "source"

src/PatternLab/Config.php

@@ -48,7 +48,7 @@ protected static function cleanDir($dir) {
 	/**
 	* Get the value associated with an option from the Config
 	* @param  {String}       the name of the option to be checked
-	* 
+	*
 	* @return {String/Boolean} the value of the get or false if it wasn't found
 	*/
 	public static function getOption($optionName = "") {
@@ -67,7 +67,7 @@ public static function getOption($optionName = "") {
 
 	/**
 	* Get the options set in the config
-	* 
+	*
 	* @return {Array}        the options from the config
 	*/
 	public static function getOptions() {
@@ -180,7 +180,6 @@ public static function init($baseDir = "", $verbose = true) {
 		// set-up the various dirs
 		self::$options["coreDir"]          = is_dir(self::$options["baseDir"]."_core") ? self::$options["baseDir"]."_core" : self::$options["baseDir"]."core";
 		self::$options["exportDir"]        = isset(self::$options["exportDir"])   ? self::$options["baseDir"].self::cleanDir(self::$options["exportDir"])   : self::$options["baseDir"]."exports";
-		self::$options["packagesDir"]      = isset(self::$options["packagesDir"]) ? self::$options["baseDir"].self::cleanDir(self::$options["packagesDir"]) : self::$options["baseDir"]."packages";
 		self::$options["publicDir"]        = isset(self::$options["publicDir"])   ? self::$options["baseDir"].self::cleanDir(self::$options["publicDir"])   : self::$options["baseDir"]."public";
 		self::$options["scriptsDir"]       = isset(self::$options["scriptsDir"])  ? self::$options["baseDir"].self::cleanDir(self::$options["scriptsDir"])  : self::$options["baseDir"]."scripts";
 		self::$options["sourceDir"]        = isset(self::$options["sourceDir"])   ? self::$options["baseDir"].self::cleanDir(self::$options["sourceDir"])   : self::$options["baseDir"]."source";
@@ -214,7 +213,7 @@ public static function init($baseDir = "", $verbose = true) {
 	/**
 	* Check to see if the given array is an associative array
 	* @param  {Array}        the array to be checked
-	* 
+	*
 	* @return {Boolean}      whether it's an associative array
 	*/
 	protected static function isAssoc($array) {
@@ -248,7 +247,7 @@ public static function loadOptions($data,$parentKey = "") {
 	* Add an option and associated value to the base Config
 	* @param  {String}       the name of the option to be added
 	* @param  {String}       the value of the option to be added
-	* 
+	*
 	* @return {Boolean}      whether the set was successful
 	*/
 	public static function setOption($optionName = "", $optionValue = "") {
@@ -269,7 +268,7 @@ public static function setOption($optionName = "", $optionValue = "") {
 	/**
 	* Add an option to the exposedOptions array so it can be exposed on the front-end
 	* @param  {String}       the name of the option to be added to the exposedOption arrays
-	* 
+	*
 	* @return {Boolean}      whether the set was successful
 	*/
 	public static function setExposedOption($optionName = "") {
@@ -337,7 +336,7 @@ public static function updateConfigOption($optionName,$optionValue) {
 	* Update an option and associated value to the base Config
 	* @param  {String}       the name of the option to be updated
 	* @param  {String}       the value of the option to be updated
-	* 
+	*
 	* @return {Boolean}      whether the update was successful
 	*/
 	public static function updateOption($optionName = "", $optionValue = "") {

src/PatternLab/Dispatcher.php

@@ -46,18 +46,13 @@ public static function init() {
 	protected static function loadListeners() {
 
 		// default var
-		$packagesDir = Config::getOption("packagesDir");
-		
-		// see if the package dir exists. if it doesn't make it
-		if (!is_dir($packagesDir)) {
-			mkdir($packagesDir);
-		}
+		$configDir = Config::getOption("configDir");
 
 		// make sure the listener data exists
-		if (file_exists($packagesDir."/listeners.json")) {
+		if (file_exists($configDir."/listeners.json")) {
 
 			// get listener list data
-			$listenerList = json_decode(file_get_contents($packagesDir."/listeners.json"), true);
+			$listenerList = json_decode(file_get_contents($configDir."/listeners.json"), true);
 
 			// get the listener info
 			foreach ($listenerList["listeners"] as $listenerName) {

src/PatternLab/InstallerUtil.php

@@ -646,6 +646,7 @@ protected static function runTasks($installerInfo) {
 				self::scanForPatternEngineRule($pathBase);
 			} else if ($type == "patternlab-starterkit") {
 				Config::updateConfigOption("starterKit",$name);
+				Config::updateConfigOption("starterKitPath",$pathBase);
 			} else if (($type == "patternlab-styleguidekit") && (strpos($name,"-assets-") === false)) {
 				Config::updateConfigOption("styleguideKit",$name);
 			}

src/PatternLab/PatternEngine.php

@@ -57,18 +57,13 @@ public static function init() {
 	public static function loadRules() {
 
 		// default var
-		$packagesDir = Config::getOption("packagesDir");
-		
-		// see if the package dir exists. if it doesn't it means composer hasn't been run
-		if (!is_dir($packagesDir)) {
-			Console::writeError("you haven't fully set-up Pattern Lab yet. please add a pattern engine...");
-		}
+		$configDir = Config::getOption("configDir");
 
 		// make sure the pattern engine data exists
-		if (file_exists($packagesDir."/patternengines.json")) {
+		if (file_exists($configDir."/patternengines.json")) {
 
 			// get pattern engine list data
-			$patternEngineList = json_decode(file_get_contents($packagesDir."/patternengines.json"), true);
+			$patternEngineList = json_decode(file_get_contents($configDir."/patternengines.json"), true);
 
 			// get the pattern engine info
 			foreach ($patternEngineList["patternengines"] as $patternEngineName) {
@@ -78,7 +73,7 @@ public static function loadRules() {
 			}
 
 		} else {
-			Console::writeError("The pattern engines list isn't available in <path>".$packagesDir."</path>...");
+			Console::writeError("The pattern engines list isn't available in <path>".$configDir."</path>...");
 		}
 
 	}

src/PatternLab/Template.php

@@ -6,7 +6,7 @@
  * Copyright (c) 2014 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
  *
- * Set-ups the vars needed related to setting up and rendering templates. Meaning putting 
+ * Set-ups the vars needed related to setting up and rendering templates. Meaning putting
  *
  */
 
@@ -42,12 +42,12 @@ public static function init() {
 
 		// set-up config vars
 		$patternExtension        = Config::getOption("patternExtension");
-		$pluginDir               = Config::getOption("packagesDir");
 		$sourceDir               = Config::getOption("sourceDir");
 		$styleguideKit           = Config::getOption("styleguideKit");
+		$styleguideKitPath       = Config::getOption("styleguideKitPath");
 
 		// load pattern-lab's resources
-		$partialPath             = $pluginDir."/".$styleguideKit."/views/partials";
+		$partialPath             = $styleguideKitPath."/views/partials";
 		self::$htmlHead          = file_get_contents($partialPath."/general-header.".$patternExtension);
 		self::$htmlFoot          = file_get_contents($partialPath."/general-footer.".$patternExtension);
 
@@ -62,8 +62,8 @@ public static function init() {
 		$filesystemLoaderClass   = $patternEngineBasePath."\Loaders\FilesystemLoader";
 
 		$options                 = array();
-		$options["templatePath"] = $pluginDir."/".$styleguideKit."/views";
-		$options["partialsPath"] = $pluginDir."/".$styleguideKit."/views/partials";
+		$options["templatePath"] = $styleguideKitPath."/views";
+		$options["partialsPath"] = $styleguideKitPath."/views/partials";
 
 		self::$filesystemLoader  = new $filesystemLoaderClass($options);