Exit 1 in case of CLI error

cli/facade/dev.js

@@ -13,6 +13,7 @@ var npmInstaller = require('../domain/npm-installer');
 var oc = require('../../index');
 var strings = require('../../resources/index');
 var watch = require('../domain/watch');
+var wrapCliCallback = require('../wrap-cli-callback');
 
 module.exports = function(dependencies){
   var local = dependencies.local,
@@ -26,13 +27,13 @@ module.exports = function(dependencies){
 
   return function(opts, callback){
 
-    callback = callback || _.noop;
-
     var componentsDir = opts.dirName,
         port = opts.port || 3000,
         baseUrl = opts.baseUrl || format('http://localhost:{0}/', port),
         packaging = false,
         errors = strings.errors.cli;
+
+    callback = wrapCliCallback(callback);
 
     var installMissingDeps = function(missing, cb){
       if(_.isEmpty(missing)){ return cb(); }

cli/facade/init.js

@@ -2,9 +2,9 @@
 
 var colors = require('colors/safe');
 var format = require('stringformat');
-var _ = require('underscore');
 
 var strings = require('../../resources/index');
+var wrapCliCallback = require('../wrap-cli-callback');
 
 module.exports = function(dependencies){
 
@@ -13,12 +13,12 @@ module.exports = function(dependencies){
 
   return function(opts, callback){
 
-    callback = callback || _.noop;
-
     var componentName = opts.componentName,
         templateType = opts.templateType,
         errors = strings.errors.cli;
 
+    callback = wrapCliCallback(callback);
+
     local.init(componentName, templateType, function(err, res){
       if(err){
         if(err === 'name not valid'){
@@ -33,7 +33,7 @@ module.exports = function(dependencies){
       } else {
         logger.log(colors.green(format(strings.messages.cli.COMPONENT_INITED, componentName)));
       }
-      
+
       callback(err, componentName);
     });
   };

cli/facade/mock.js

@@ -2,9 +2,9 @@
 
 var colors = require('colors/safe');
 var format = require('stringformat');
-var _ = require('underscore');
 
 var strings = require('../../resources/index');
+var wrapCliCallback = require('../wrap-cli-callback');
 
 module.exports = function(dependencies){
 
@@ -13,7 +13,7 @@ module.exports = function(dependencies){
 
   return function(opts, callback){
 
-    callback = callback || _.noop;
+    callback = wrapCliCallback(callback);
 
     local.mock(opts, function(err, res){
       logger.log(colors.green(format(strings.messages.cli.MOCKED_PLUGIN, opts.targetName, opts.targetValue)));

cli/facade/preview.js

@@ -2,9 +2,9 @@
 
 var colors = require('colors/safe');
 var opn = require('opn');
-var _ = require('underscore');
 
 var strings = require('../../resources/index');
+var wrapCliCallback = require('../wrap-cli-callback');
 
 module.exports = function(dependencies){
 
@@ -13,7 +13,7 @@ module.exports = function(dependencies){
 
   return function(opts, callback){
 
-    callback = callback || _.noop;
+    callback = wrapCliCallback(callback);
 
     registry.getComponentPreviewUrlByUrl(opts.componentHref, function(err, href){
       if(err){ 

cli/facade/publish.js

@@ -9,6 +9,7 @@ var semver = require('semver');
 var _ = require('underscore');
 
 var strings = require('../../resources/index');
+var wrapCliCallback = require('../wrap-cli-callback');
 
 module.exports = function(dependencies){
 
@@ -24,13 +25,13 @@ module.exports = function(dependencies){
 
   return function(opts, callback){
 
-    callback = callback || _.noop;
-
     var componentPath = opts.componentPath,
         packageDir = path.resolve(componentPath, '_package'),
         compressedPackagePath = path.resolve(componentPath, 'package.tar.gz'),
         errorMessage;
 
+    callback = wrapCliCallback(callback);
+
     var getCredentials = function(cb){
       if(opts.username && opts.password){
         log.ok(strings.messages.cli.USING_CREDS);

cli/facade/registry.js

@@ -5,6 +5,7 @@ var format = require('stringformat');
 var _ = require('underscore');
 
 var strings = require('../../resources/index');
+var wrapCliCallback = require('../wrap-cli-callback');
 
 module.exports = function(dependencies){
 
@@ -19,7 +20,7 @@ module.exports = function(dependencies){
 
   return function(opts, callback){
 
-    callback = callback || _.noop;
+    callback = wrapCliCallback(callback);
 
     if(opts.command === 'ls'){
       registry.get(function(err, registries){

cli/wrap-cli-callback.js

@@ -0,0 +1,15 @@
+'use strict';
+
+var _ = require('underscore');
+
+module.exports = function(callback){
+  if(_.isFunction(callback)){
+    return callback;
+  }
+
+  return function(error){
+    if(!!error){
+      return process.exit(1);
+    }
+  };
+};

test/unit/cli-facade-dev.js

@@ -16,7 +16,7 @@ describe('cli : facade : dev', function(){
   var execute = function(dirName, port){
     logSpy.logNoNewLine = sinon.spy();
     logSpy.log = sinon.spy();
-    devFacade({ dirName: dirName, port: port });
+    devFacade({ dirName: dirName, port: port }, function(){});
   };
 
   describe('when running a dev version of the registry', function(){

test/unit/cli-facade-init.js

@@ -14,7 +14,7 @@ describe('cli : facade : init', function(){
 
   var execute = function(componentName, templateType){
     logSpy.log = sinon.spy();
-    initFacade({ componentName: componentName, templateType: templateType });
+    initFacade({ componentName: componentName, templateType: templateType }, function(){});
   };
 
   describe('when initialising a new component', function(){

test/unit/cli-facade-mock.js

@@ -14,7 +14,7 @@ describe('cli : facade : mock', function(){
 
   var execute = function(){
     logSpy.log = sinon.spy();
-    mockFacade({ targetType: 'plugin', targetName: 'getValue', targetValue: 'value' });
+    mockFacade({ targetType: 'plugin', targetName: 'getValue', targetValue: 'value' }, function(){});
   };
 
   describe('when mocking plugin', function(){

test/unit/cli-facade-preview.js

@@ -18,7 +18,7 @@ describe('cli : facade : preview', function(){
     var PreviewFacade = injectr('../../cli/facade/preview.js', { opn: opnSpy }),
         previewFacade = new PreviewFacade({ logger: logSpy, registry: registryStub });
 
-    previewFacade({ componentHref: 'http://components.com/component' });
+    previewFacade({ componentHref: 'http://components.com/component' }, function(){});
   };
 
   describe('when previewing not valid component', function(){

test/unit/cli-facade-publish.js

@@ -19,7 +19,11 @@ describe('cli : facade : publish', function(){
   var execute = function(creds){
     creds = creds || {};
     logSpy.log = sinon.stub();
-    publishFacade({ componentPath: path.resolve('test/fixtures/components/hello-world/'), username: creds.username, password: creds.password });
+    publishFacade({ 
+      componentPath: path.resolve('test/fixtures/components/hello-world/'),
+      username: creds.username,
+      password: creds.password
+    }, function(){});
   };
 
   describe('when publishing component', function(){

test/unit/cli-facade-registry.js

@@ -14,7 +14,7 @@ describe('cli : facade : registry', function(){
 
   var execute = function(command){
     logSpy.log = sinon.spy();
-    registryFacade({ command: command });
+    registryFacade({ command: command }, function(){});
   };
 
   describe('when using ls command', function(){