From a3584988f7e662f2695a8b210bc5b95872df93f0 Mon Sep 17 00:00:00 2001
From: Philipp Kunz <kunzphp@gmail.com>
Date: Sat, 5 Dec 2015 22:29:06 +0100
Subject: [PATCH] Integrated error reporting: closes #2 and closes #4

---
 index.js                        |  7 ++++++-
 package.json                    |  7 ++++---
 test.js                         | 17 ++++++++++++++---
 test/browserifyGulpTestError.js |  1 +
 ts/modulebrowserify.ts          |  6 +++++-
 ts/test.ts                      | 17 ++++++++++++++---
 6 files changed, 44 insertions(+), 11 deletions(-)
 create mode 100644 test/browserifyGulpTestError.js

diff --git a/index.js b/index.js
index 4a28748..02f992c 100644
--- a/index.js
+++ b/index.js
@@ -5,7 +5,12 @@ var GulpBrowserBrowserify;
         return function () {
             return through.obj(function (file, enc, cb) {
                 var bundleCallback = function (err, bufferedContent) {
-                    file.contents = bufferedContent;
+                    if (Buffer.isBuffer(bufferedContent)) {
+                        file.contents = bufferedContent;
+                    }
+                    else {
+                        pr.beautylog.error("gulp-browser: .browserify() " + err.message);
+                    }
                     cb(null, file);
                 };
                 browserify(file)
diff --git a/package.json b/package.json
index 3efba59..cc32f4f 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,8 @@
     "test": "(cd ts/compile && node compile.js) && (node test.js)",
     "reinstall": "(rm -r node_modules && npm install)",
     "release": "(git pull origin master && npm version patch && git push origin master && git checkout release && git merge master && git push origin release && git checkout master)",
-    "startdev": "(git checkout master && git pull origin master)"
+    "update": "(git checkout master && git pull origin master && npm install)",
+    "upgrade": "(npm run update) && (ncu upgradeAll && npm install)"
   },
   "repository": {
     "type": "git",
@@ -31,9 +32,9 @@
     "through2": "2.0.0"
   },
   "devDependencies": {
-    "beautylog": "1.0.4",
+    "beautylog": "1.0.6",
     "gulp": "3.9.0",
     "gulp-callfunction": "0.0.10",
-    "gulp-typescript": "2.9.2"
+    "gulp-typescript": "2.10.0"
   }
 }
diff --git a/test.js b/test.js
index 713cb67..f60c3df 100644
--- a/test.js
+++ b/test.js
@@ -4,13 +4,24 @@ var gulpBrowser = require("./index.js");
 var pr = require("pushrocks");
 var gulpCallFunction = require("gulp-callfunction");
 var pipeWorked = function () {
-    pr.beautylog.success("Pipe didn't break! Ready for Primetime!");
+    pr.beautylog.info("Pipe didn't break! Ready for Primetime!");
 };
 pr.beautylog.log('Now trying to browserify a testfile...');
 gulp.task('gulpBrowserTest', function (cb) {
-    gulp.src('./test/*.js')
+    var stream = gulp.src('./test/browserifyGulpTest.js')
         .pipe(gulpBrowser.browserify())
         .pipe(gulp.dest("./test/result/"))
         .pipe(gulpCallFunction(pipeWorked));
+    return stream;
 });
-gulp.start.apply(gulp, ['gulpBrowserTest']);
+gulp.task('gulpBrowserTestError', function (cb) {
+    var stream = gulp.src('./test/browserifyGulpTestError.js')
+        .pipe(gulpBrowser.browserify())
+        .pipe(gulp.dest("./test/result/"))
+        .pipe(gulpCallFunction(pipeWorked));
+    return stream;
+});
+gulp.task("default", ['gulpBrowserTest', 'gulpBrowserTestError'], function () {
+    pr.beautylog.success("Test passed!");
+});
+gulp.start.apply(gulp, ['default']);
diff --git a/test/browserifyGulpTestError.js b/test/browserifyGulpTestError.js
new file mode 100644
index 0000000..5494646
--- /dev/null
+++ b/test/browserifyGulpTestError.js
@@ -0,0 +1 @@
+var myError = require("my-error");
\ No newline at end of file
diff --git a/ts/modulebrowserify.ts b/ts/modulebrowserify.ts
index 83a6a16..be510c4 100644
--- a/ts/modulebrowserify.ts
+++ b/ts/modulebrowserify.ts
@@ -4,7 +4,11 @@ module GulpBrowserBrowserify {
         return function() {
             return through.obj((file, enc, cb) => { //this is the trough object that gets returned by gulpBrowser.browserify();
                 var bundleCallback = function(err, bufferedContent) {
-                    file.contents = bufferedContent;
+                    if (Buffer.isBuffer(bufferedContent)){
+                        file.contents = bufferedContent;
+                    } else {
+                        pr.beautylog.error("gulp-browser: .browserify() " + err.message);
+                    }
                     cb(null,file);
                 };
                 browserify(file)
diff --git a/ts/test.ts b/ts/test.ts
index 9877c31..09b6920 100644
--- a/ts/test.ts
+++ b/ts/test.ts
@@ -5,14 +5,25 @@ var pr = require("pushrocks");
 var gulpCallFunction = require("gulp-callfunction");
 
 var pipeWorked = function() {
-    pr.beautylog.success("Pipe didn't break! Ready for Primetime!");
+    pr.beautylog.info("Pipe didn't break! Ready for Primetime!");
 };
 
 pr.beautylog.log('Now trying to browserify a testfile...');
 gulp.task('gulpBrowserTest',function(cb) {
-    gulp.src('./test/*.js')
+    var stream =gulp.src('./test/browserifyGulpTest.js')
         .pipe(gulpBrowser.browserify())
         .pipe(gulp.dest("./test/result/"))
         .pipe(gulpCallFunction(pipeWorked));
+    return stream;
 });
-gulp.start.apply(gulp, ['gulpBrowserTest']);
\ No newline at end of file
+gulp.task('gulpBrowserTestError',function(cb) {
+    var stream = gulp.src('./test/browserifyGulpTestError.js')
+        .pipe(gulpBrowser.browserify())
+        .pipe(gulp.dest("./test/result/"))
+        .pipe(gulpCallFunction(pipeWorked));
+    return stream;
+});
+gulp.task("default",['gulpBrowserTest','gulpBrowserTestError'],function(){
+    pr.beautylog.success("Test passed!");
+});
+gulp.start.apply(gulp, ['default']);
\ No newline at end of file