Merge branch 'release-0.3.2'

pattern-lab · Sep 20, 2013 · 73b7d9e · 73b7d9e
2 parents 8e070ca + e5bb74d
commit 73b7d9e
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 10 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,10 @@
 THIS CHANGELOG IS AN ATTEMPT TO DOCUMENT CHANGES TO THIS PROJECT.
 
+PL-v0.3.2
+ - ADD: added .svn to the ignore dirs listing when checking the source dir
+ - FIX: top-level ignored dirs are now found properly
+ - THX: thanks to @alienlebarge for the heads up regarding .svn dirs
+
 PL-v0.3.1
  - FIX: made sure the command scripts work in directories that contain spaces
  - THX: thanks to @mattsims for the heads up

diff --git a/builder/builder.php b/builder/builder.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Builder CLI - v0.3.1
+ * Pattern Lab Builder CLI - v0.3.2
  *
  * Copyright (c) 2013 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license

diff --git a/builder/lib/builder.lib.php b/builder/lib/builder.lib.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Builder Class - v0.3.1
+ * Pattern Lab Builder Class - v0.3.2
  *
  * Copyright (c) 2013 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
@@ -709,15 +709,13 @@ protected function moveStaticFile($fileName,$copy = "") {
 	* @return {Boolean}      whether the directory should be ignored
 	*/
 	protected function ignoreDir($fileName) {
-		$y = false;
 		foreach($this->id as $dir) {
-			$pos = strpos($fileName,DIRECTORY_SEPARATOR.$dir.DIRECTORY_SEPARATOR);
+			$pos = strpos(DIRECTORY_SEPARATOR.$fileName,DIRECTORY_SEPARATOR.$dir.DIRECTORY_SEPARATOR);
 			if ($pos !== false) {
-				$y = true;
-				break;
+				return true;
 			}
 		}
-		return $y;
+		return false;
 	}
 
 	/**

diff --git a/builder/lib/generator.lib.php b/builder/lib/generator.lib.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Generator Class - v0.3.1
+ * Pattern Lab Generator Class - v0.3.2
  *
  * Copyright (c) 2013 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license

diff --git a/builder/lib/watcher.lib.php b/builder/lib/watcher.lib.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Watcher Class - v0.3.1
+ * Pattern Lab Watcher Class - v0.3.2
  *
  * Copyright (c) 2013 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license

diff --git a/config/config.ini.default b/config/config.ini.default
@@ -11,7 +11,7 @@ pp = "/../../public/patterns/";
 ie = "scss,DS_Store,less"
 
 // directories and files to ignore when building or watching the source dir, separate with a comma
-id = "scss"
+id = "scss,.svn"
 
 // choose which ports the websocket services should run on
 contentSyncPort  = "8002"