Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Have optional callbacks in CLI functions #200

Merged
merged 2 commits into from
Mar 10, 2016
Merged

Have optional callbacks in CLI functions #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96d209a
Have optional callbacks in CLI functions so that they can be used as …
matteofigus Mar 10, 2016
a5149ba
Cleanup
matteofigus Mar 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions cli/facade/init.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

var colors = require('colors/safe');
var format = require('stringformat');
var _ = require('underscore');

var strings = require('../../resources/index');

Expand All @@ -10,7 +11,10 @@ module.exports = function(dependencies){
var local = dependencies.local,
logger = dependencies.logger;

return function(opts){
return function(opts, callback){

callback = callback || _.noop;

var componentName = opts.componentName,
templateType = opts.templateType,
errors = strings.errors.cli;
Expand All @@ -25,10 +29,12 @@ module.exports = function(dependencies){
err = errors.TEMPLATE_TYPE_NOT_VALID;
}

logger.log(format(colors.red(errors.INIT_FAIL), err));
logger.log(colors.red(format(errors.INIT_FAIL, err)));
} else {
logger.log(format(colors.green(strings.messages.cli.COMPONENT_INITED), componentName));
logger.log(colors.green(format(strings.messages.cli.COMPONENT_INITED, componentName)));
}

callback(err, componentName);
});
};
};
9 changes: 7 additions & 2 deletions cli/facade/mock.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

var colors = require('colors/safe');
var format = require('stringformat');
var _ = require('underscore');

var strings = require('../../resources/index');

Expand All @@ -10,9 +11,13 @@ module.exports = function(dependencies){
var local = dependencies.local,
logger = dependencies.logger;

return function(opts){
return function(opts, callback){

callback = callback || _.noop;

local.mock(opts, function(err, res){
return logger.log(colors.green(format(strings.messages.cli.MOCKED_PLUGIN, opts.targetName, opts.targetValue)));
logger.log(colors.green(format(strings.messages.cli.MOCKED_PLUGIN, opts.targetName, opts.targetValue)));
callback(err, res);
});
};
};
12 changes: 10 additions & 2 deletions cli/facade/preview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

var colors = require('colors/safe');
var opn = require('opn');
var _ = require('underscore');

var strings = require('../../resources/index');

Expand All @@ -10,10 +11,17 @@ module.exports = function(dependencies){
var logger = dependencies.logger,
registry = dependencies.registry;

return function(opts){
return function(opts, callback){

callback = callback || _.noop;

registry.getComponentPreviewUrlByUrl(opts.componentHref, function(err, href){
if(err){ return logger.log(colors.red(strings.errors.cli.COMPONENT_HREF_NOT_FOUND)); }
if(err){
logger.log(colors.red(strings.errors.cli.COMPONENT_HREF_NOT_FOUND));
return callback(strings.errors.cli.COMPONENT_HREF_NOT_FOUND);
}
opn(href);
callback(null, href);
});
};
};
41 changes: 26 additions & 15 deletions cli/facade/publish.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ module.exports = function(dependencies){

var componentPath = opts.componentPath,
packageDir = path.resolve(componentPath, '_package'),
compressedPackagePath = path.resolve(componentPath, 'package.tar.gz');
compressedPackagePath = path.resolve(componentPath, 'package.tar.gz'),
errorMessage;

var getCredentials = function(cb){
if(opts.username && opts.password){
Expand Down Expand Up @@ -84,41 +85,51 @@ module.exports = function(dependencies){
var upgradeCommand = format(strings.commands.cli.UPGRADE, err.details.suggestedVersion),
errorDetails = format(strings.errors.cli.OC_CLI_VERSION_NEEDS_UPGRADE, colors.blue(upgradeCommand));

log.err(format(strings.errors.cli.PUBLISHING_FAIL, errorDetails));
return cb();
errorMessage = format(strings.errors.cli.PUBLISHING_FAIL, errorDetails);
log.err(errorMessage);
return cb(errorMessage);
} else if(err.code === 'node_version_not_valid') {
var details = format(strings.errors.cli.NODE_CLI_VERSION_NEEDS_UPGRADE, err.details.suggestedVersion);

log.err(format(strings.errors.cli.PUBLISHING_FAIL, details));
return cb();
errorMessage = format(strings.errors.cli.PUBLISHING_FAIL, details);
log.err(errorMessage);
return cb(errorMessage);
} else {
log.err(format(strings.errors.cli.PUBLISHING_FAIL, err));
return cb();
errorMessage = format(strings.errors.cli.PUBLISHING_FAIL, err);
log.err(errorMessage);
return cb(errorMessage);
}
} else {
log.ok(format(strings.messages.cli.PUBLISHED, options.route.green));
return cb();
log.ok(format(strings.messages.cli.PUBLISHED, options.route));
return cb(null, 'ok');
}
});
};

registry.get(function(err, registryLocations){
if(err){ return log.err(err); }
if(err){
log.err(err);
return callback(err);
}

packageAndCompress(function(err, component){
if(err){
return log.err(format(strings.errors.cli.PACKAGE_CREATION_FAIL, err));
errorMessage = format(strings.errors.cli.PACKAGE_CREATION_FAIL, err);
log.err(errorMessage);
return callback(errorMessage);
}

async.eachSeries(registryLocations, function(l, next){
var registryUrl = l,
registryLength = registryUrl.length,
async.eachSeries(registryLocations, function(registryUrl, next){
var registryLength = registryUrl.length,
registryNormalised = registryUrl.slice(registryLength - 1) === '/' ? registryUrl.slice(0, registryLength - 1) : registryUrl,
componentRoute = format('{0}/{1}/{2}', registryNormalised, component.name, component.version);

putComponentToRegistry({ route: componentRoute, path: compressedPackagePath}, next);
}, function(err){
local.cleanup(compressedPackagePath, callback);
local.cleanup(compressedPackagePath, function(err2, res){
if(err){ return callback(err); }
callback(err2, res);
});
});
});
});
Expand Down
30 changes: 25 additions & 5 deletions cli/facade/registry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,30 +17,50 @@ module.exports = function(dependencies){
warn: function(msg){ return logger.log(colors.yellow(msg)); }
};

return function(opts){
return function(opts, callback){

callback = callback || _.noop;

if(opts.command === 'ls'){
registry.get(function(err, registries){
if(err){
return log.err(format(strings.errors.generic, err));
log.err(format(strings.errors.generic, err));
return callback(err);
} else {
log.warn(strings.messages.cli.REGISTRY_LIST);

if(registries.length === 0){
log.err(strings.errors.cli.REGISTRY_NOT_FOUND);
err = strings.errors.cli.REGISTRY_NOT_FOUND;
log.err(err);
return callback(err);
}

_.forEach(registries, function(registryLocation){
log.ok(registryLocation);
});

callback(null, registries);
}
});
} else if(opts.command === 'add'){
registry.add(opts.parameter, function(err, res){
return err ? log.err(err) : log.ok(strings.messages.cli.REGISTRY_ADDED);
if(err){
log.err(err);
return callback(err);
}

log.ok(strings.messages.cli.REGISTRY_ADDED);
callback(null, 'ok');
});
} else if(opts.command === 'remove'){
registry.remove(opts.parameter, function(err, res){
return err ? log.err(err) : log.ok(strings.messages.cli.REGISTRY_REMOVED);
if(err){
log.err(err);
return callback(err);
}

log.ok(strings.messages.cli.REGISTRY_REMOVED);
callback(null, 'ok');
});
}
};
Expand Down
2 changes: 1 addition & 1 deletion test/unit/cli-facade-publish.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ describe('cli : facade : publish', function(){
});

it('should publish to all registries', function(){
sinon.stub(registry, 'putComponent').yields('blabla');
sinon.stub(registry, 'putComponent').yields(null, 'ok');
execute();
registry.putComponent.restore();

Expand Down