Merge pull request #196 from Flakebi/exit-status

Exit with code 1 on error

Author: Zulko

src/index.js

@@ -140,10 +140,10 @@ async function main () {
     console.log(colors.red('Error: ' + err.toString()))
   })
 
-  await build(inputPath)
+  const buildError = await build(inputPath)
 
-  if (options.buildOnce) {
-    process.exit(0)
+  if (program.buildOnce) {
+    process.exit(buildError ? 1 : 0)
   } else {
     watch()
   }
@@ -200,10 +200,10 @@ async function build (filepath) {
   if (generatingPDF) {
     taskPromise = masterToPDF(inputPath, relaxedGlobals, tempHTMLPath, outputPath, locals)
   }
-  await taskPromise
+  const generateError = await taskPromise
   var duration = ((performance.now() - t0) / 1000).toFixed(2)
   console.log(colors.magenta.bold(`... Done in ${duration}s`))
-  if (generatingPDF && relaxedGlobals.config.after) {
+  if (generatingPDF && relaxedGlobals.config.after && !generateError) {
     console.log(colors.magenta.bold("Running 'after' command..."))
     var subprocess = exec(relaxedGlobals.config.after, cwd=relaxedGlobals.basedir)
 
@@ -222,6 +222,7 @@ async function build (filepath) {
     console.log(colors.magenta.bold("...done running 'after' command."))
   }
   relaxedGlobals.busy = false
+  return generateError
 }
 
 /**

src/masterToPDF.js

@@ -6,6 +6,7 @@ const filesize = require('filesize')
 const path = require('path')
 const { performance } = require('perf_hooks')
 
+// Returns undefined if successful or an error object on failure
 exports.masterToPDF = async function (masterPath, relaxedGlobals, tempHTMLPath, outputPath, locals) {
   var t0 = performance.now()
   var page = relaxedGlobals.puppeteerPage
@@ -39,7 +40,7 @@ exports.masterToPDF = async function (masterPath, relaxedGlobals, tempHTMLPath,
     } catch (error) {
       console.log(error.message)
       console.error(colors.red('There was a Pug error (see above)'))
-      return
+      return error
     }
   } else if (masterPath.endsWith('.html')) {
     html = fs.readFileSync(masterPath, 'utf8')
@@ -84,7 +85,7 @@ exports.masterToPDF = async function (masterPath, relaxedGlobals, tempHTMLPath,
                   'Increase the timeout by writing "pageRenderingTimeout: 60" ' +
                   'at the top of your config.yml. Default is 30 (seconds).')
     }
-    return
+    return error
   }
 
   var tLoad = performance.now()

test/samples/pug/error/master.pug

@@ -0,0 +1 @@
+: Pug syntax error

test/test.js

@@ -110,6 +110,29 @@ describe('Sample tests', function () {
   })
 })
 
+describe('Error tests', function () {
+  var tests = [
+    {
+      sampleName: 'error',
+      timeout: 10000
+    },
+  ]
+  tests.forEach(function (test) {
+    it('fails to render sample "' + test.sampleName + '"', function (done) {
+      this.timeout(test.timeout)
+      var basedir = path.join(__dirname, 'samples', 'pug', test.sampleName)
+      var process = spawn(
+        relaxed,
+        [path.join(basedir, 'master.pug'), '--build-once', '--no-sandbox'].concat(test.cmdOptions || [])
+      )
+      process.on('close', function (code) {
+        assert.equal(code, 1)
+        done()
+      })
+    })
+  })
+})
+
 describe('Special rendering tests', function () {
   var tests = [
     {