From 1a567de6c7ee8a9685dcc0f78862eeafe4c838cf Mon Sep 17 00:00:00 2001
From: tpetr <tpetr@hubspot.com>
Date: Tue, 23 Feb 2016 13:13:53 -0500
Subject: [PATCH 1/2] initial work

---
 SingularityService/pom.xml | 15 ++++++++++++---
 SingularityUI/gulpfile.js  | 18 ++++++++++++++++++
 SingularityUI/package.json |  8 ++++++--
 3 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 SingularityUI/gulpfile.js

diff --git a/SingularityService/pom.xml b/SingularityService/pom.xml
index 7a6a0fb50e..9a5634e535 100644
--- a/SingularityService/pom.xml
+++ b/SingularityService/pom.xml
@@ -539,9 +539,18 @@
                 <goals>
                   <goal>npm</goal>
                 </goals>
-                <configuration>
-                  <arguments>install</arguments>
-                </configuration>
+              </execution>
+              <execution>
+                <id>bower install</id>
+                <goals>
+                  <goal>bower</goal>
+                </goals>
+              </execution>
+              <execution>
+                <id>gulp build</id>
+                <goals>
+                  <goal>gulp</goal>
+                </goals>
               </execution>
             </executions>
           </plugin>
diff --git a/SingularityUI/gulpfile.js b/SingularityUI/gulpfile.js
new file mode 100644
index 0000000000..6b7f937c1b
--- /dev/null
+++ b/SingularityUI/gulpfile.js
@@ -0,0 +1,18 @@
+var gulp = require('gulp');
+var path = require('path');
+var brunch = require('brunch');
+var del = require('del');
+
+gulp.task("clean", function() {
+  return del([
+    path.resolve(__dirname, '../SingularityService/target/generated-resources/assets/static/**'),
+    path.resolve(__dirname, '../SingularityService/target/generated-resources/assets/index.html')], {force: true});
+});
+
+gulp.task("build", function(cb) {
+  brunch.build({}, function () {
+    cb();
+  });
+});
+
+gulp.task("default", ["clean", "build"])
\ No newline at end of file
diff --git a/SingularityUI/package.json b/SingularityUI/package.json
index 0b5060b32e..b17a820351 100644
--- a/SingularityUI/package.json
+++ b/SingularityUI/package.json
@@ -16,8 +16,7 @@
     "brunch": "./node_modules/brunch/bin/brunch"
   },
   "scripts": {
-    "start": "brunch watch --server",
-    "postinstall": "bower install --allow-root && brunch build --production"
+    "start": "brunch watch --server"
   },
   "dependencies": {
     "bower": "^1.7.6",
@@ -32,5 +31,10 @@
     "react-coffee-brunch": "^1.7.2",
     "stylus-brunch": "^2.0.0",
     "uglify-js-brunch": "^2.0.0"
+  },
+  "license": "Apache 2.0",
+  "devDependencies": {
+    "del": "^2.2.0",
+    "gulp": "^3.9.1"
   }
 }

From a0c26d12a00acd6a5e95cabaa6914e9b992e6ae4 Mon Sep 17 00:00:00 2001
From: tpetr <tpetr@hubspot.com>
Date: Wed, 24 Feb 2016 11:05:27 -0500
Subject: [PATCH 2/2] better way to brunch

---
 SingularityUI/gulpfile.js | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/SingularityUI/gulpfile.js b/SingularityUI/gulpfile.js
index 6b7f937c1b..29fe0713d6 100644
--- a/SingularityUI/gulpfile.js
+++ b/SingularityUI/gulpfile.js
@@ -1,18 +1,39 @@
 var gulp = require('gulp');
 var path = require('path');
-var brunch = require('brunch');
 var del = require('del');
+var child_process = require('child_process');
+
+var dest = path.resolve(__dirname, '../SingularityService/target/generated-resources/assets');
 
 gulp.task("clean", function() {
   return del([
-    path.resolve(__dirname, '../SingularityService/target/generated-resources/assets/static/**'),
-    path.resolve(__dirname, '../SingularityService/target/generated-resources/assets/index.html')], {force: true});
+    path.resolve(dest, 'static/**'),
+    path.resolve(dest, 'index.html')], {force: true});
 });
 
 gulp.task("build", function(cb) {
-  brunch.build({}, function () {
-    cb();
+  var brunch = child_process.execFile('node_modules/brunch/bin/brunch', ['build', '--production']);
+
+  var hasStderrOutput = false;
+
+  brunch.stdout.pipe(process.stdout);
+  brunch.stderr.pipe(process.stderr);
+
+  brunch.stderr.on('data', function () {
+    hasStderrOutput = true;
+  });
+
+  brunch.on('error', cb);
+
+  brunch.on('exit', function (code) {
+    if (hasStderrOutput) {
+      cb(new Error("Brunch build failed"));
+    } else if (code != 0) {
+      cb(new Error("Brunch exited with code " + code));
+    } else {
+      cb();
+    }
   });
 });
 
-gulp.task("default", ["clean", "build"])
\ No newline at end of file
+gulp.task("default", ["clean", "build"]);