looser check of source & public dir. will now build

Author: dmolsen

src/PatternLab/Config.php

@@ -218,22 +218,9 @@ public static function init($baseDir = "", $verbose = true) {
 			self::$options["styleguideKitPath"] = self::$options["baseDir"].self::cleanDir(self::getStyleguideKitPath(self::$options["styleguideKitPath"]));
 		}
 
-		// double-check a few directories are real
-		// refactor this at some point. it's verbose
-		if (!isset(self::$options["sourceDir"])) {
-			Console::writeError("please make sure sourceDir is set in <path>./config/config.yml</path> by adding 'sourceDir=some/path'. sorry, stopping pattern lab... :(");
-		} else if (!is_dir(self::$options["sourceDir"])) {
-			Console::writeError("hrm... i can't seem to find the directory with your source files. are you sure they're at <path>".Console::getHumanReadablePath(self::$options["sourceDir"])."</path>? you can fix this in <path>./config/config.yml</path> by editing sourceDir. sorry, stopping pattern lab... :(");
-		}
-		if (!isset(self::$options["publicDir"])) {
-			Console::writeError("please make sure publicDir is set in <path>./config/config.yml</path> by adding 'publicDir=some/path'. sorry, stopping pattern lab... :(");
-		} else if (!is_dir(self::$options["publicDir"])) {
-			Console::writeError("hrm... i can't seem to find the directory where you want to write your styleguide. are you sure it's at <path>".Console::getHumanReadablePath(self::$options["sourceDir"])."</path>? you can fix this in <path>./config/config.yml</path> by editing publicDir. sorry, stopping pattern lab... :(");
-		}
-		if (isset(self::$options["styleguideKitPath"]) && !is_dir(self::$options["styleguideKitPath"])) {
-			Console::writeError("hrm... i can't seem to find the directory where your styleguide files are located. are you sure it's at <path>".Console::getHumanReadablePath(self::$options["styleguideKitPath"])."</path>? you can fix this in <path>./config/config.yml</path> by editing styleguideKitPath. sorry, stopping pattern lab... :(");
-		}
-		
+		// double-check a few directories are real and set-up
+		FileUtil::checkPathFromConfig(self::$options["sourceDir"], self::$userConfigPath, "sourceDir");
+		FileUtil::checkPathFromConfig(self::$options["publicDir"], self::$userConfigPath, "publicDir");
 
 		// make sure styleguideExcludes is set to an array even if it's empty
 		if (is_string(self::$options["styleGuideExcludes"])) {

src/PatternLab/FileUtil.php

@@ -20,10 +20,42 @@
 use \Symfony\Component\Filesystem\Exception\IOExceptionInterface;
 
 class FileUtil {
-
+	
+	/**
+	* Check that a dir from the config exists and try to build it if needed
+	* @param  {String}       directory to be checked/built
+	* @param  {String}       the config path
+	* @param  {String}       the config option that would help them
+	*/
+	public static function checkPathFromConfig($path, $configPath, $configOption = "") {
+		
+		if (!isset($path)) {
+			Console::writeError("please make sure ".$configOption." is set in <path>".Console::getHumanReadablePath($configPath)."</path> by adding '".$configOption."=some/path'. sorry, stopping pattern lab... :(");
+		} else if (!is_dir($path)) {
+			Console::writeWarning("i can't seem to find the directory <path>".Console::getHumanReadablePath($path)."</path>...");
+			self::makeDir($path);
+			Console::writeWarning("i created <path>".Console::getHumanReadablePath($path)."</path> just in case. you can edit this in <path>".Console::getHumanReadablePath($configPath)."</path> by editing ".$configOption."...");
+		}
+		
+	}
+	
+	/**
+	* Make a directory
+	* @param  {String}       directory to be made
+	*/
+	public static function makeDir($dir) {
+		$fs = new Filesystem();
+		try {
+			$fs->mkdir($dir);
+		} catch (IOExceptionInterface $e) {
+			Console::writeError("an error occurred while creating your directory at <path>".$e->getPath()."</path>...");
+		}
+		unset($fs);
+	}
+	
 	/**
 	* Copies a file from the given source path to the given public path.
-	* THIS IS NOT FOR PATTERNS 
+	* THIS IS NOT FOR PATTERNS
 	* @param  {String}       the source file
 	* @param  {String}       the public file
 	*/

src/PatternLab/Template.php

@@ -46,6 +46,10 @@ public static function init() {
 		$styleguideKit           = Config::getOption("styleguideKit");
 		$styleguideKitPath       = Config::getOption("styleguideKitPath");
 
+		if (!$styleguideKitPath || !is_dir($styleguideKitPath)) {
+			Console::writeError("your styleguide won't render because i can't find your styleguide files. are you sure they're at <path>".Console::getHumanReadablePath($styleguideKitPath)."</path>? you can fix this in <path>./config/config.yml</path> by editing styleguideKitPath...");
+		}
+		
 		// load pattern-lab's resources
 		$partialPath             = $styleguideKitPath."/views/partials";
 		$generalHeaderPath       = $partialPath."/general-header.".$patternExtension;