Merge branch 'dev'

Author: dmolsen

.gitignore

@@ -3,9 +3,7 @@ public/*
 !public/listeners/*
 !public/styleguide/*
 !public/patterns/**/*
+!public/data/*.js
 config.ini
 latest-change.txt
-/public/styleguide/js/styleguide-ck.js
-/public/listeners/synclisteners-ck.js
-/public/styleguide/js/data-saver-ck.js
-/public/styleguide/js/url-handler-ck.js
+*-ck.js

CHANGELOG

@@ -1,5 +1,23 @@
 THIS CHANGELOG IS AN ATTEMPT TO DOCUMENT CHANGES TO THIS PROJECT.
 
+PL-v0.6.0
+ - ADD: a UI list of the current media query widths from the CSS
+ - ADD: a pattern's "lineage" now displays in the UI under code view
+ - ADD: annotations can be added to DOM elements of patterns
+ - ADD: separate annotation views on the list view and pattern details views
+ - ADD: generate() now "cleans" public/ before generating the site by deleting most everything
+ - ADD: added support for the css rule saver library
+ - ADD: can use a flag to generate the specific CSS that is used in a pattern. shows on code view when available.
+ - ADD: mark-up for a pattern is now included in the UI under code view
+ - FIX: can open the "raw" version of a pattern in a new window
+ - FIX: frame resizing bar properly supports decimals
+ - FIX: the checkboxes for the websocket-based features, page follow & auto-reload, now work
+ - FIX: postmessage calls now centralized and refactored
+ - FIX: units appear in the toolbar when using Hay! mode
+ - FIX: patterns shouldn't be cached
+ - THX: thanks to @benedfit for the MQ idea which he originally named "phases"
+ - THX: thanks to @alienlebarge for the "clean public/" idea
+
 PL-v0.3.6
  - FIX: added a delay to the watcher so the CPU doesn't get maxed
  - THX: thanks to martin berglund for the heads up

builder/builder.php

@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Builder CLI - v0.3.6
+ * Pattern Lab Builder CLI - v0.6.0
  *
  * Copyright (c) 2013 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
@@ -10,6 +10,7 @@
  *
  * 	php builder.php -g
  * 		Iterates over the 'source' directories & files and generates the entire site a single time.
+ * 		It also cleans the 'public' directory.
  * 	
  * 	php builder.php -w
  * 		Generates the site like the -g flag and then watches for changes in the 'source' directories &
@@ -26,21 +27,27 @@
 require __DIR__."/lib/Mustache/Autoloader.php";
 Mustache_Autoloader::register();
 
+// load css rule saver
+require __DIR__."/lib/css-rule-saver/css-rule-saver.php";
+
 // make sure this script is being accessed from the command line
 if (php_sapi_name() == 'cli') {
 
-	$args = getopt("gw");
+	$args = getopt("gwc");
 
 	if (isset($args["g"])) {
 
 		// initiate the g (generate) switch
 
 		// iterate over the source directory and generate the site
 		$g = new Generatr();
-		$g->generate();
+		
+		// check to see if CSS for patterns should be parsed & outputted
+		(isset($args["c"])) ? $g->generate(true) : $g->generate();
+		
 		print "your site has been generated...\n";
 
-	} elseif (isset($args["w"])) {
+	} else if (isset($args["w"])) {
 
 		// initiate the w (watch) switch
 
@@ -60,7 +67,8 @@
 		print "\n";
 		print "Usage:\n\n";
 		print "  php ".$_SERVER["PHP_SELF"]." -g\n";
-		print "    Iterates over the 'source' directories & files and generates the entire site a single time.\n\n";
+		print "    Iterates over the 'source' directories & files and generates the entire site a single time.\n";
+		print "    It also cleans the 'public' directory.\n\n";
 		print "  php ".$_SERVER["PHP_SELF"]." -w\n";
 		print "    Generates the site like the -g flag and then watches for changes in the 'source' directories &\n";
 		print "    files. Will re-generate files if they've changed.\n\n";