fixes #28, do not bail in module code and capture unhandled exception…

…s in cli.js

bin/cli.js

@@ -78,4 +78,7 @@ include({
     console.error('Validation failed:', err.message);
     process.exit(1);
   });
+}).catch(function(err) {
+  console.error(err);
+  process.exit(1);
 });

index.js

@@ -153,7 +153,6 @@ function include(base, scope, args) {
       strictSSL: true,
     }).get('body').call('toString');
   }
-  if(body) body.catch(bail);
   if (args.type === 'json') {
     return body.then(function(res) { return yaml.safeLoad(res, { schema: yamlSchema }) }).catch(function(yamlErr) {
       return body.then(jsmin).then(JSON.parse).catch(function(jsonErr) {
@@ -201,8 +200,3 @@ function JSONifyString(string) {
   });
   return lines;
 }
-
-function bail(err) {
-  console.error(err.toString());
-  process.exit(1);
-}

t/cli.js

@@ -9,7 +9,13 @@ var include = require('../index'),
     describe(category, function() {
       tests[category].forEach(function(test) {
         it(test.name || 'include', function(done) {
-          exec('node',  ['bin/cli.js', test.template], function(err, out) {
+          exec('node',  ['bin/cli.js', test.template], function(err, out, stderr) {
+            if(test.exitCode) {
+              assert.ok(stderr.match(new RegExp(test.errorMessage)));
+              assert.equal(test.exitCode, err.code);
+              return done();
+            }
+
             var json = JSON.parse(out.toString());
             delete json.Metadata;
             assert.deepEqual(json, test.output);

t/includes/yaml/malformed.yml

@@ -0,0 +1,3 @@
+!Sub
+  - "arn:aws:route53:::hostedzone/${ZoneId}/rrset"
+  - { ZoneId: !If [IsProd, "XYZ" "ZQW" ] }

t/tests/cli.json

@@ -37,5 +37,10 @@
         }
       }
     }
+  }, {
+    "name": "malformed yaml",
+    "template": "t/includes/yaml/malformed.yml",
+    "exitCode": 1,
+    "errorMessage": "missed comma"
   }]
 }