ExternalVendorCode/balena-cli
1
0
Fork 0
mirror of https://github.com/balena-io/balena-cli.git synced 2025-02-20 17:33:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #143 from resin-io/jviotti/refactor/app

Browse Source 
Refactor app actions to use promises
This commit is contained in:
Juan Cruz Viotti 2015-08-17 08:02:04 -04:00
commit 1096b2d212
4 changed files with 119 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
build/actions/app.js
View File

@ -1,7 +1,7 @@
(function() {
var async, commandOptions, form, resin, vcs, visuals;
var _, commandOptions, helpers, resin, vcs, visuals;
async = require('async');
_ = require('lodash');
resin = require('resin-sdk');
@ -11,7 +11,7 @@
vcs = require('resin-vcs');
form = require('resin-cli-form');
helpers = require('../utils/helpers');
exports.create = {
signature: 'app create <name>',
@ -27,29 +27,15 @@
],
permission: 'user',
action: function(params, options, done) {
return async.waterfall([
function(callback) {
return resin.models.application.has(params.name).nodeify(callback);
}, function(hasApplication, callback) {
if (hasApplication) {
return callback(new Error('You already have an application with that name!'));
}
if (options.type != null) {
return callback(null, options.type);
}
return form.ask({
message: 'Device Type',
type: 'list',
choices: ['Raspberry Pi', 'Raspberry Pi 2', 'BeagleBone Black']
}).nodeify(callback);
}, function(type, callback) {
options.type = type;
return resin.models.application.create(params.name, options.type).nodeify(callback);
}, function(application, callback) {
console.info("Application created: " + params.name + " (" + options.type + ", id " + application.id + ")");
return callback();
return resin.models.application.has(params.name).then(function(hasApplication) {
if (hasApplication) {
throw new Error('You already have an application with that name!');
}
], done);
}).then(helpers.selectDeviceType).then(function(deviceType) {
return resin.models.application.create(params.name, deviceType);
}).then(function(application) {
return console.info("Application created: " + application.app_name + " (" + application.device_type + ", id " + application.id + ")");
}).nodeify(done);
}
};
@ -94,24 +80,12 @@
options: [commandOptions.yes],
permission: 'user',
action: function(params, options, done) {
return async.waterfall([
function(callback) {
if (options.yes) {
return callback(null, true);
} else {
return form.ask({
message: 'Are you sure you want to delete the application?',
type: 'confirm',
"default": false
}).nodeify(callback);
}
}, function(confirmed, callback) {
if (!confirmed) {
return callback();
}
return resin.models.application.remove(params.name).nodeify(callback);
return helpers.confirm(option.yes, 'Are you sure you want to delete the application?').then(function(confirmed) {
if (!confirmed) {
return;
}
], done);
return resin.models.application.remove(params.name);
}).nodeify(done);
}
};
@ -124,41 +98,27 @@
action: function(params, options, done) {
var currentDirectory;
currentDirectory = process.cwd();
return async.waterfall([
function(callback) {
return resin.models.application.has(params.name).nodeify(callback);
}, function(hasApp, callback) {
var message;
if (!hasApp) {
return callback(new Error("Invalid application: " + params.name));
}
message = "Are you sure you want to associate " + currentDirectory + " with " + params.name + "?";
if (options.yes) {
return callback(null, true);
} else {
return form.ask({
message: message,
type: 'confirm',
"default": false
}).nodeify(callback);
}
}, function(confirmed, callback) {
if (!confirmed) {
return done();
}
return vcs.initialize(currentDirectory).nodeify(callback);
}, function(callback) {
return resin.models.application.get(params.name).nodeify(callback);
}, function(application, callback) {
return vcs.associate(currentDirectory, application.git_repository).nodeify(callback);
return resin.models.application.has(params.name).then(function(hasApplication) {
if (!hasApplication) {
throw new Error("Invalid application: " + params.name);
}
], function(error, remoteUrl) {
if (error != null) {
return done(error);
}).then(function() {
var message;
message = "Are you sure you want to associate " + currentDirectory + " with " + params.name + "?";
return helpers.confirm(options.yes, message);
}).then(function(confirmed) {
if (!confirmed) {
return;
}
console.info("git repository added: " + remoteUrl);
return done(null, remoteUrl);
});
return resin.models.application.get(params.name).get('git_repository').then(function(gitRepository) {
return vcs.initialize(currentDirectory).then(function() {
return vcs.associate(currentDirectory, gitRepository);
}).then(function() {
console.info("git repository added: " + gitRepository);
return gitRepository;
});
});
}).nodeify(done);
}
};

29
build/utils/helpers.js Normal file
View File

@ -0,0 +1,29 @@
(function() {
var Promise, form;
Promise = require('bluebird');
form = require('resin-cli-form');
exports.selectDeviceType = function() {
return form.ask({
message: 'Device Type',
type: 'list',
choices: ['Raspberry Pi', 'Raspberry Pi 2', 'BeagleBone Black']
});
};
exports.confirm = function(yesOption, message) {
return Promise["try"](function() {
if (yesOption) {
return true;
}
return form.ask({
message: message,
type: 'confirm',
"default": false
});
});
};
}).call(this);

109
lib/actions/app.coffee
View File

@ -1,9 +1,9 @@
async = require('async')
_ = require('lodash')
resin = require('resin-sdk')
visuals = require('resin-cli-visuals')
commandOptions = require('./command-options')
vcs = require('resin-vcs')
form = require('resin-cli-form')
helpers = require('../utils/helpers')
exports.create =
signature: 'app create <name>'
@ -33,38 +33,19 @@ exports.create =
]
permission: 'user'
action: (params, options, done) ->
async.waterfall [
(callback) ->
resin.models.application.has(params.name).nodeify(callback)
# Validate the the application name is available
# before asking the device type.
# https://github.com/resin-io/resin-cli/issues/30
resin.models.application.has(params.name).then (hasApplication) ->
if hasApplication
throw new Error('You already have an application with that name!')
(hasApplication, callback) ->
if hasApplication
return callback(new Error('You already have an application with that name!'))
return callback(null, options.type) if options.type?
form.ask
message: 'Device Type'
type: 'list'
choices: [
# Lock to specific devices until we support
# the rest with device specs.
'Raspberry Pi'
'Raspberry Pi 2'
'BeagleBone Black'
]
.nodeify(callback)
(type, callback) ->
options.type = type
resin.models.application.create(params.name, options.type).nodeify(callback)
(application, callback) ->
console.info("Application created: #{params.name} (#{options.type}, id #{application.id})")
return callback()
], done
.then(helpers.selectDeviceType).then (deviceType) ->
return resin.models.application.create(params.name, deviceType)
.then (application) ->
console.info("Application created: #{application.app_name} (#{application.device_type}, id #{application.id})")
.nodeify(done)
exports.list =
signature: 'apps'
@ -144,22 +125,10 @@ exports.remove =
options: [ commandOptions.yes ]
permission: 'user'
action: (params, options, done) ->
async.waterfall [
(callback) ->
if options.yes
return callback(null, true)
else
form.ask
message: 'Are you sure you want to delete the application?'
type: 'confirm'
default: false
.nodeify(callback)
(confirmed, callback) ->
return callback() if not confirmed
resin.models.application.remove(params.name).nodeify(callback)
], done
helpers.confirm(option.yes, 'Are you sure you want to delete the application?').then (confirmed) ->
return if not confirmed
resin.models.application.remove(params.name)
.nodeify(done)
exports.associate =
signature: 'app associate <name>'
@ -181,36 +150,22 @@ exports.associate =
action: (params, options, done) ->
currentDirectory = process.cwd()
async.waterfall [
resin.models.application.has(params.name).then (hasApplication) ->
if not hasApplication
throw new Error("Invalid application: #{params.name}")
(callback) ->
resin.models.application.has(params.name).nodeify(callback)
.then ->
message = "Are you sure you want to associate #{currentDirectory} with #{params.name}?"
helpers.confirm(options.yes, message)
(hasApp, callback) ->
if not hasApp
return callback(new Error("Invalid application: #{params.name}"))
.then (confirmed) ->
return if not confirmed
message = "Are you sure you want to associate #{currentDirectory} with #{params.name}?"
if options.yes
return callback(null, true)
else
form.ask
message: message
type: 'confirm'
default: false
.nodeify(callback)
resin.models.application.get(params.name).get('git_repository').then (gitRepository) ->
vcs.initialize(currentDirectory).then ->
return vcs.associate(currentDirectory, gitRepository)
.then ->
console.info("git repository added: #{gitRepository}")
return gitRepository
(confirmed, callback) ->
return done() if not confirmed
vcs.initialize(currentDirectory).nodeify(callback)
(callback) ->
resin.models.application.get(params.name).nodeify(callback)
(application, callback) ->
vcs.associate(currentDirectory, application.git_repository).nodeify(callback)
], (error, remoteUrl) ->
return done(error) if error?
console.info("git repository added: #{remoteUrl}")
return done(null, remoteUrl)
.nodeify(done)

23
lib/utils/helpers.coffee Normal file
View File

@ -0,0 +1,23 @@
Promise = require('bluebird')
form = require('resin-cli-form')
exports.selectDeviceType = ->
return form.ask
message: 'Device Type'
type: 'list'
choices: [
# Lock to specific devices until we support
# the rest with device specs.
'Raspberry Pi'
'Raspberry Pi 2'
'BeagleBone Black'
]
exports.confirm = (yesOption, message) ->
Promise.try ->
return true if yesOption
return form.ask
message: message
type: 'confirm'
default: false