Improved error handling.

gulpfile.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var gulp = require('gulp'),
+	plumber = require('gulp-plumber'),
 	paths = {
 		gulp: './gulpfile.js',
 		src: './index.js',
@@ -15,6 +16,7 @@ gulp.task('lint', function () {
 
 	return gulp
 		.src([paths.gulp, paths.src, paths.test])
+		.pipe(plumber())
 		.pipe(jscs())
 		.pipe(jshint())
 		.pipe(jshint.reporter('jshint-stylish'));
@@ -35,6 +37,11 @@ gulp.task('test', ['lint', 'cover'], function () {
 
 	return gulp
 		.src(paths.test)
+		.pipe(plumber())
 		.pipe(mocha({ reporter: 'spec' }))
 		.pipe(istanbul.writeReports());
 });
+
+gulp.task('watch', function () {
+	gulp.watch([paths.src, paths.test], ['test']);
+});

index.js

@@ -1,6 +1,7 @@
 'use strict';
 
-var hb = require('handlebars'),
+var gutil = require('gulp-util'),
+	hb = require('handlebars'),
 	logger = require('./util/logger'),
 	registrar = require('handlebars-registrar'),
 	requireGlob = require('require-glob'),
@@ -58,27 +59,32 @@ module.exports = function (options) {
 
 	// Stream it. Stream it good.
 	return through.obj(function (file, enc, cb) {
-		var context = Object.create(data || {}),
-			template = hb.compile(file.contents.toString());
+		try {
+			var context = Object.create(data || {}),
+				template = hb.compile(file.contents.toString());
 
-		if (includeFile) {
-			context.file = file;
-		}
+			if (includeFile) {
+				context.file = file;
+			}
 
-		if (typeof options.dataEach === 'function') {
-			context = options.dataEach(context, file);
-		}
+			if (typeof options.dataEach === 'function') {
+				context = options.dataEach(context, file);
+			}
 
-		if (options.debug) {
-			logger.file(file.path.replace(file.base, ''));
-			logger.keys('     data', data);
-			logger.keys('  context', context);
-			logger.keys('  helpers', hb.helpers);
-			logger.keys(' partials', hb.partials);
-		}
+			if (options.debug) {
+				logger.file(file.path.replace(file.base, ''));
+				logger.keys('     data', data);
+				logger.keys('  context', context);
+				logger.keys('  helpers', hb.helpers);
+				logger.keys(' partials', hb.partials);
+			}
 
-		file.contents = new Buffer(template(context));
+			file.contents = new Buffer(template(context));
 
-		cb(null, file);
+			cb(null, file);
+		}
+		catch (err) {
+			cb(new gutil.PluginError('gulp-hb', err));
+		}
 	});
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gulp-hb",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "A sane Handlebars Gulp plugin.",
   "keywords": [
     "gulpplugin",
@@ -46,6 +46,7 @@
     "gulp-jscs": "^1.5.2",
     "gulp-jshint": "^1.10.0",
     "gulp-mocha": "^2.0.1",
+    "gulp-plumber": "^1.0.0",
     "jshint-stylish": "^1.0.1",
     "vinyl-fs": "^1.0.0"
   },

test/fixtures/templates/error.html

@@ -0,0 +1 @@
+{{>>> derp}}

test/gulp-hb.e2e.js

@@ -23,11 +23,17 @@ describe('gulp-hb e2e', function () {
 			done();
 		}
 
+		function expectError(err) {
+			expect(err.plugin).toBe('gulp-hb');
+			expect(err.message).toContain('derp');
+			done();
+		}
+
 		vinylFs
 			.src(fixture)
 			.pipe(plugin)
 			.on('data', expectFile)
-			.on('error', done);
+			.on('error', expectError);
 	}
 
 	beforeEach(function () {
@@ -134,4 +140,8 @@ describe('gulp-hb e2e', function () {
 
 		testWithFile('dataEach.html', hb(options), done);
 	});
+
+	it('should handle errors', function (done) {
+		testWithFile('error.html', hb(), done);
+	});
 });