Merge tag 'v0.12.0' into pattern-engines

Author: geoffp

CHANGELOG

@@ -1,4 +1,22 @@
 THIS CHANGELOG IS AN ATTEMPT TO DOCUMENT CHANGES TO THIS PROJECT.
+
+PL-node-v0.12.0
+ - ADD: Gulp support arrives with an optional configuration
+ - ADD: Instructions how to install and run with Gulp
+ - DEL: Deleted the sass modules from `package.json` files
+ - CHG: Commented out all sass tasks in Grunt and Gulp files
+ - CHG: Changed static web server provider to BrowserSync
+ - CHG: Replaced the Style Guide toolbar Auto-Reload and Page Follow with a link to the BrowserSync UI
+ - THX: Thanks @oscar-g for the initial work on the gulpfile!
+ - ADD: An alternative, more verbose syntax for pattern partial inclusion
+ - THX: Thanks @e2tha-e for the thoughtful addition with unit test coverage
+
+PL-node-v0.11.0
+ - ADD: Ignore pattern directories that start with an underscore.
+ - ADD: Support for lists with the listItems variable
+ - FIX: Resolved issue where pattern parameter data bled into global data object
+ - ADD: Support a fluid viewport
+
 PL-node-v0.10.1
  - ADD: Added more unit tests for recently more-modular code
  - FIX: Lineage was not working for patterns with pattern parameters

CONTRIBUTING.md

@@ -4,6 +4,9 @@ If you'd like to contribute to patternlab - node, please do so! There is always
 No pull request is too small.
 
 ##Guidelines
-1. Please keep your pull requests concise
-2. _ALWAYS_ submit it against the [dev branch](https://github.com/pattern-lab/patternlab-node/tree/dev). If this does not occur, I will first, try to redirect you gently, second, port over your contribution manually if time allows, and/or third, close your pull request.
-3. If you can, add some unit tests using the existing patterns
+1. Please keep your pull requests concise and limited to **ONE** substantive change at a time.
+2. _ALWAYS_ submit pull requests against the [dev branch](https://github.com/pattern-lab/patternlab-node/tree/dev). If this does not occur, I will first, try to redirect you gently, second, port over your contribution manually if time allows, and/or third, close your pull request.
+3. If you can, add some unit tests using the existing patterns
+
+##Coding style
+Regarding code style like indentation and whitespace, follow the conventions you see used in the source already. Add enough source code comments to help the next person.

Gruntfile.js

@@ -3,10 +3,6 @@ module.exports = function(grunt) {
 	// Project configuration.
 	grunt.initConfig({
 		pkg: grunt.file.readJSON('package.json'),
-		clean: {
-			options: { force: true },
-			files: ['./public/patterns']
-		},
 		concat: {
 			options: {
 				stripBanners: true,
@@ -47,6 +43,10 @@ module.exports = function(grunt) {
 			pseudopattern_hunter: {
 				src: './builder/pseudopattern_hunter.js',
 				dest: './builder/pseudopattern_hunter.js'
+			},
+			list_item_hunter: {
+				src: './builder/list_item_hunter.js',
+				dest: './builder/list_item_hunter.js'
 			}
 		},
 		copy: {
@@ -59,67 +59,72 @@ module.exports = function(grunt) {
 				{ expand: true, cwd: './source/fonts/', src: '*', dest: './public/fonts/'},
 				{ expand: true, cwd: './source/_data/', src: 'annotations.js', dest: './public/data/' }
 				]
-			}
-		},
-		jshint: {
-			options: {
-				"curly": true,
-				"eqnull": true,
-				"eqeqeq": true,
-				"undef": true,
-				"forin": true,
-				//"unused": true,
-				"node": true
 			},
-			patternlab: ['Gruntfile.js', './builder/lib/patternlab.js']
+			css: {
+				files: [
+				{ expand: true, cwd: './source/css/', src: '*.css', dest: './public/css/' }
+				]
+			}
 		},
 		watch: {
-			// scss: { //scss can be watched if you like
-			//	options: {
-			//		livereload: true
-			//	},
+			all: {
+				files: [
+					'source/css/**/*.css',
+					'public/styleguide/css/*.css',
+					'source/_patterns/**/*.mustache',
+					'source/_patterns/**/*.json',
+					'source/_data/*.json'
+				],
+				tasks: ['default']
+			},
+			// scss: {
 			// 	files: ['source/css/**/*.scss', 'public/styleguide/css/*.scss'],
-			// 	tasks: ['default']
+			// 	tasks: ['sass', 'copy:css','bsReload:css']
 			// },
-			all: {
-				options: {
-					livereload: true
-				},
+			patterns: {
 				files: [
-				'source/_patterns/**/*.mustache',
-				'source/_patterns/**/*.json',
-				'source/_data/*.json'
+					'source/_patterns/**/*.mustache',
+					'source/_patterns/**/*.json',
+					'source/_data/*.json'
 				],
 				tasks: ['default']
 			}
 		},
-		sass: {
-			build: {
-				options: {
-					style: 'expanded',
-					precision: 8
-				},
-				files: {
-					'./source/css/style.css': './source/css/style.scss',
-					'./public/styleguide/css/static.css': './public/styleguide/css/static.scss',
-					'./public/styleguide/css/styleguide.css': './public/styleguide/css/styleguide.scss',
-					'./public/styleguide/css/styleguide-specific.css': './public/styleguide/css/styleguide-specific.scss'
-				}
-			}
-		},
+		// sass: {
+		// 	build: {
+		// 		options: {
+		// 			style: 'expanded',
+		// 			precision: 8
+		// 		},
+		// 		files: {
+		// 			'./source/css/style.css': './source/css/style.scss',
+		// 			'./public/styleguide/css/static.css': './public/styleguide/css/static.scss',
+		// 			'./public/styleguide/css/styleguide.css': './public/styleguide/css/styleguide.scss',
+		// 			'./public/styleguide/css/styleguide-specific.css': './public/styleguide/css/styleguide-specific.scss'
+		// 		}
+		// 	}
+		// },
 		nodeunit: {
 			all: ['test/*_tests.js']
 		},
-		connect: {
-			app:{
+		browserSync: {
+			dev: {
 				options: {
-					port: 9001,
-					base: './public',
-					hostname: 'localhost',
-					open: true,
-					livereload: 35729
+					server:  './public',
+					watchTask: true,
+					plugins: [
+						{
+							module: 'bs-html-injector',
+							options: {
+								files: './public/index.html'
+							}
+						}
+					]
 				}
 			}
+		},
+		bsReload: {
+			css: './public/**/*.css'
 		}
 	});
 
@@ -130,11 +135,15 @@ module.exports = function(grunt) {
 	grunt.task.loadTasks('./builder/');
 
 	//if you choose to use scss, or any preprocessor, you can add it here
-	grunt.registerTask('default', ['clean', 'concat', 'patternlab', /*'sass',*/ 'copy']);
+	grunt.registerTask('default', ['patternlab', /*'sass',*/ 'copy:main']);
 
 	//travis CI task
-	grunt.registerTask('travis', ['nodeunit', 'clean', 'concat', 'patternlab', /*'sass',*/ 'copy']);
+	grunt.registerTask('travis', ['nodeunit', 'patternlab']);
+
+	//TODO: this line is more efficient, but you cannot run concurrent watch tasks without another dependency.
+	//grunt.registerTask('serve', ['patternlab', /*'sass',*/ 'copy:main', 'browserSync', 'watch:patterns', 'watch:scss']);
+	grunt.registerTask('serve', ['patternlab', /*'sass',*/ 'copy:main', 'browserSync', 'watch:all']);
 
-	grunt.registerTask('serve', ['clean', 'concat', 'patternlab', /*'sass',*/ 'copy', 'connect', 'watch']);
+	grunt.registerTask('build', ['nodeunit', 'concat']);
 
 };