Default to error on failure

jscarmona · Aug 12, 2016 · a35ee1a · a35ee1a
1 parent 90a845e
commit a35ee1a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/src/tasks/publish-projects.js b/src/tasks/publish-projects.js
@@ -34,6 +34,7 @@ export default {
       toolsVersion: 12.0,
       stdout: false,
       stderr: true,
+      errorOnFail: true,
       properties: {
         DeployOnBuild: true,
         DeployDefaultTarget: 'WebPublish',
@@ -91,6 +92,7 @@ export default {
 
       gulp.src(file.path)
         .pipe(msbuild(options))
+          .on('error', error)
           .on('end', () => { this.resume(); });
     }
   },

diff --git a/src/tasks/publish-tds.js b/src/tasks/publish-tds.js
@@ -34,6 +34,7 @@ export default {
       toolsVersion: 12.0,
       stdout: false,
       stderr: true,
+      errorOnFail: true,
       properties: {
         DeployOnBuild: true,
         DeployDefaultTarget: 'WebPublish',
@@ -67,30 +68,33 @@ export default {
    * @param {Function} error
    */
   fn(config, end, error) {
-    const src = yargs.argv.src || yargs.argv.s || config.src;
-    const dest = yargs.argv.dest || yargs.argv.d;
-    const url = yargs.argv.url || yargs.argv.u;
     const options = config.options;
+    const src = yargs.argv.src || yargs.argv.s || config.src;
+    const dest = yargs.argv.dest || yargs.argv.d || options.properties.SitecoreDeployFolder;
+    const url = yargs.argv.url || yargs.argv.u || options.properties.SitecoreWebUrl;
 
-    options.properties.SitecoreWebUrl = url || options.properties.SitecoreWebUrl;
-    options.properties.SitecoreDeployFolder = dest || options.properties.SitecoreDeployFolder;
-    options.configuration = yargs.argv.build || yargs.argv.b || options.configuration;
+    if (url) {
+      options.properties.SitecoreWebUrl = url;
+    }
 
-    try {
-      gulp.src(src)
-        .pipe(es.through(build))
-        .on('end', end);
-    } catch (e) {
-      error(e.message);
+    if (dest) {
+      options.properties.SitecoreDeployFolder = dest;
     }
 
+    options.configuration = yargs.argv.build || yargs.argv.b || options.configuration;
+
+    gulp.src(src)
+      .pipe(es.through(build))
+      .on('end', end);
+
     function build(file) {
       IGNITE_UTILS.log(`${path.basename(file.path, path.extname(file.path))}`);
 
       this.pause();
 
       gulp.src(file.path)
         .pipe(msbuild(options))
+          .on('error', error)
           .on('end', () => { this.resume(); });
     }
   },