NuKVM/xen-orchestra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor fixes and new command: whoami.

Browse Source
This commit is contained in:
Julien Fontanet 2014-03-25 17:17:51 +01:00
parent d9e615e696
commit 313f7e8173
2 changed files with 48 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
packages/xo-cli/cli.js
View File

@ -53,7 +53,7 @@ module.exports = function (argv) {
if (def.args)
{
var interactive = process.stdout.isTTY;
var interactive = process.stdin.isTTY;
_.each(def.args, function (def, name) {
cmdParser.option(name, {
@ -67,7 +67,6 @@ module.exports = function (argv) {
});
});
// TODO: alters `fn` to prompt for each missing argument.
fn = (function (fn, args) {
return function (opts) {
var prompts = [];
@ -102,6 +101,33 @@ module.exports = function (argv) {
});
};
registerCommand('add-server', {
description: 'adds a new Xen server',
args: {
host: {
description: 'host of the server',
required: true,
},
username: {
description: 'username to use to connect',
required: true,
},
password: {
description: 'password to use to connect',
promptType: 'password',
required: true,
},
},
}, function (opts) {
return connect().then(function (connection) {
return connection.send('server.add', {
host: opts.host,
username: opts.username,
password: opts.password,
});
}).return('ok');
});
registerCommand('register', {
description: 'registers the XO instance',
args: {
@ -141,31 +167,22 @@ module.exports = function (argv) {
}).bind();
});
registerCommand('add-server', {
description: 'adds a new Xen server',
args: {
host: {
description: 'host of the server',
required: true,
},
username: {
description: 'username to use to connect',
required: true,
},
password: {
description: 'password to use to connect',
promptType: 'password',
required: true,
},
},
}, function (opts) {
return connect().then(function (connection) {
return connection.send('server.add', {
host: opts.host,
username: opts.username,
password: opts.password,
});
}).return('ok');
registerCommand('whoami', {
description: 'displays information about the current user',
}, function () {
return connect().then(function (xo) {
return xo.send('session.getUser');
}).then(function (user) {
if (user)
{
console.log('You are signed in as', user.email);
console.log('Your global permission is', user.permission);
}
else
{
console.log('Your are not signed in.');
}
});
});
// TODO: handle global `--config FILE` option.

6
packages/xo-cli/package.json
View File

@ -1,10 +1,12 @@
{
"name": "xo-cli",
"version": "0.1.0",
"version": "0.1.1",
"description": "Basic CLI for Xen-Orchestra",
"author": "Julien Fontanet <julien.fontanet@vates.fr>",
"homepage": "https://github.com/vatesfr/xo-cli",
"bugs": "https://github.com/vatesfr/xo-cli",
"bugs": {
"url": "https://github.com/vatesfr/xo-cli"
},
"repository": {
"type": "git",
"url": "https://github.com/vatesfr/xo-cli"