From 8616a2c2a6a14a2eecfe7af4942f353022dcc8cd Mon Sep 17 00:00:00 2001 From: anolilab Date: Wed, 23 Sep 2015 16:07:57 +0200 Subject: [PATCH] added error handling back | bump version --- dist/cli.js | 22 ++++++++++++++-------- src/cli.js | 18 ++++++++++-------- tests/src/environment.test.js | 6 +++--- 3 files changed, 27 insertions(+), 19 deletions(-) diff --git a/dist/cli.js b/dist/cli.js index edd081e..8b59591 100644 --- a/dist/cli.js +++ b/dist/cli.js @@ -6,6 +6,8 @@ var _getIterator = require('babel-runtime/core-js/get-iterator')['default']; var _interopRequireDefault = require('babel-runtime/helpers/interop-require-default')['default']; +var _interopRequireWildcard = require('babel-runtime/helpers/interop-require-wildcard')['default']; + exports.__esModule = true; exports['default'] = cli; @@ -17,7 +19,9 @@ var _markdowndoc = require('./markdowndoc'); var _markdowndoc2 = _interopRequireDefault(_markdowndoc); -// import * as errors from './errors'; +var _errors = require('./errors'); + +var errors = _interopRequireWildcard(_errors); var _docopt = require('docopt'); @@ -103,13 +107,15 @@ function cli() { var env = new _environment2['default'](newConfig, getModus(options)); - // env.on('error', error => { - // if (error instanceof errors.Warning) { - // process.exit(2); - // } + if (!options['--debug']) { + env.on('error', function (error) { + if (error instanceof errors.Warning) { + process.exit(2); + } - // process.exit(1); - // }); + process.exit(1); + }); + } parseConfig(env, options); @@ -118,7 +124,7 @@ function cli() { require('./notifier')(_packageJson2['default'], env.logger); } - return _markdowndoc2['default'](env); + _markdowndoc2['default'](env); } module.exports = exports['default']; diff --git a/src/cli.js b/src/cli.js index 6c8c6f2..09f5cbc 100644 --- a/src/cli.js +++ b/src/cli.js @@ -19,7 +19,7 @@ Options: import Environment from './environment'; import markdowndoc from './markdowndoc'; -// import * as errors from './errors'; +import * as errors from './errors'; import { docopt } from 'docopt'; import pkg from '../package.json'; @@ -88,13 +88,15 @@ export default function cli(argv = process.argv.slice(2)) { const env = new Environment(newConfig, getModus(options)); - // env.on('error', error => { - // if (error instanceof errors.Warning) { - // process.exit(2); - // } + if (!options['--debug']) { + env.on('error', error => { + if (error instanceof errors.Warning) { + process.exit(2); + } - // process.exit(1); - // }); + process.exit(1); + }); + } parseConfig(env, options); @@ -103,5 +105,5 @@ export default function cli(argv = process.argv.slice(2)) { require('./notifier')(pkg, env.logger); } - return markdowndoc(env); + markdowndoc(env); } diff --git a/tests/src/environment.test.js b/tests/src/environment.test.js index b079b8d..8f4032d 100644 --- a/tests/src/environment.test.js +++ b/tests/src/environment.test.js @@ -8,7 +8,7 @@ describe('#environment', function () { it('should load look for .markdowndocrc or load default config if no path is set', function () { var expected = { 'name' : 'markdowndoc', - 'version' : '0.0.2', + 'version' : '0.0.4', 'description': 'A documentation tool for Markdown.', 'debug' : false, 'style' : 'single', @@ -46,7 +46,7 @@ describe('#environment', function () { it('should render the default config', function () { var expected = { 'name' : 'markdowndoc', - 'version' : '0.0.2', + 'version' : '0.0.4', 'description': 'A documentation tool for Markdown.', 'debug' : false, 'style' : 'multisite', @@ -85,7 +85,7 @@ describe('#environment', function () { it('should render the package config', function () { var expected = { 'name' : 'markdowndoc', - 'version' : '0.0.2', + 'version' : '0.0.4', 'description': 'A documentation tool for Markdown.', 'debug' : false, 'style' : 'single',