From 857d31dcb2bf6ddcf2997d679491fd1ad11fbf25 Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Sun, 18 Dec 2016 20:53:50 +0100 Subject: [PATCH] introduce triggers --- dist/smartcli.classes.smartcli.d.ts | 31 ++++++++---- dist/smartcli.classes.smartcli.js | 65 ++++++++++++++++-------- dist/smartcli.plugins.js | 2 +- package.json | 1 + test/test.js | 20 +++----- test/test.ts | 18 +++---- ts/smartcli.classes.smartcli.ts | 78 ++++++++++++++++++++--------- ts/smartcli.plugins.ts | 2 +- 8 files changed, 135 insertions(+), 82 deletions(-) diff --git a/dist/smartcli.classes.smartcli.d.ts b/dist/smartcli.classes.smartcli.d.ts index 5612aab..25eedda 100644 --- a/dist/smartcli.classes.smartcli.d.ts +++ b/dist/smartcli.classes.smartcli.d.ts @@ -1,9 +1,14 @@ /// import * as q from 'q'; +import { Subject } from 'rxjs'; import { Objectmap } from 'lik'; -export interface ICommandDeferredObject { +export interface ICommandPromiseObject { commandName: string; - deferred: q.Deferred; + promise: q.Promise; +} +export interface ITriggerObservableObject { + triggerName: string; + subject: Subject; } export declare class Smartcli { argv: any; @@ -15,28 +20,34 @@ export declare class Smartcli { /** * map of all Command/Promise objects to keep track */ - allCommandDeferredsMap: Objectmap; + allCommandPromisesMap: Objectmap; + /** + * map of all Trigger/Observable objects to keep track + */ + allTriggerObservablesMap: Objectmap; constructor(); /** - * adds an alias, meaning one equals the other in terms of triggering associated commands + * adds an alias, meaning one equals the other in terms of command execution. */ - addAlias(keyArg: any, aliasArg: any): void; + addCommandAlias(keyArg: any, aliasArg: any): void; /** * adds a Command by returning a Promise that reacts to the specific commandString given. * Note: in e.g. "npm install something" the "install" is considered the command. */ - addCommand(definitionArg: { - commandName: string; - }): q.Promise; + addCommand(commandNameArg: string): q.Promise; /** * gets a Promise for a command word */ getCommandPromiseByName(commandNameArg: string): q.Promise; /** - * triggers a command by name + * adds a Trigger. Like addCommand(), but returns an subscribable observable + */ + addTrigger(triggerNameArg: string): Subject; + /** + * execute trigger by name * @param commandNameArg - the name of the command to trigger */ - triggerCommandByName(commandNameArg: string): q.Promise; + trigger(triggerName: string): Subject; /** * allows to specify help text to be printed above the rest of the help text */ diff --git a/dist/smartcli.classes.smartcli.js b/dist/smartcli.classes.smartcli.js index 2b70f7c..63f51de 100644 --- a/dist/smartcli.classes.smartcli.js +++ b/dist/smartcli.classes.smartcli.js @@ -1,5 +1,6 @@ "use strict"; const q = require("q"); +const rxjs_1 = require("rxjs"); const plugins = require("./smartcli.plugins"); // import classes const lik_1 = require("lik"); @@ -8,15 +9,19 @@ class Smartcli { /** * map of all Command/Promise objects to keep track */ - this.allCommandDeferredsMap = new lik_1.Objectmap(); + this.allCommandPromisesMap = new lik_1.Objectmap(); + /** + * map of all Trigger/Observable objects to keep track + */ + this.allTriggerObservablesMap = new lik_1.Objectmap(); this.argv = plugins.yargs; this.questionsDone = q.defer(); this.parseStarted = q.defer(); } /** - * adds an alias, meaning one equals the other in terms of triggering associated commands + * adds an alias, meaning one equals the other in terms of command execution. */ - addAlias(keyArg, aliasArg) { + addCommandAlias(keyArg, aliasArg) { this.argv = this.argv.alias(keyArg, aliasArg); return; } @@ -24,15 +29,15 @@ class Smartcli { * adds a Command by returning a Promise that reacts to the specific commandString given. * Note: in e.g. "npm install something" the "install" is considered the command. */ - addCommand(definitionArg) { + addCommand(commandNameArg) { let done = q.defer(); - this.allCommandDeferredsMap.add({ - commandName: definitionArg.commandName, - deferred: done + this.allCommandPromisesMap.add({ + commandName: commandNameArg, + promise: done.promise }); this.parseStarted.promise .then(() => { - if (this.argv._.indexOf(definitionArg.commandName) === 0) { + if (this.argv._.indexOf(commandNameArg) === 0) { done.resolve(this.argv); } else { @@ -45,28 +50,40 @@ class Smartcli { * gets a Promise for a command word */ getCommandPromiseByName(commandNameArg) { - return this.allCommandDeferredsMap.find(commandDeferredObjectArg => { + return this.allCommandPromisesMap.find(commandDeferredObjectArg => { return commandDeferredObjectArg.commandName === commandNameArg; - }).deferred.promise; + }).promise; } /** - * triggers a command by name + * adds a Trigger. Like addCommand(), but returns an subscribable observable + */ + addTrigger(triggerNameArg) { + let triggerSubject = new rxjs_1.Subject(); + this.allTriggerObservablesMap.add({ + triggerName: triggerNameArg, + subject: triggerSubject + }); + this.addCommand(triggerNameArg).then(() => { + triggerSubject.next(); + }); + return triggerSubject; + } + /** + * execute trigger by name * @param commandNameArg - the name of the command to trigger */ - triggerCommandByName(commandNameArg) { - let commandDeferred = this.allCommandDeferredsMap.find(commandDeferredObjectArg => { - return commandDeferredObjectArg.commandName === commandNameArg; - }).deferred; - commandDeferred.resolve(); - return commandDeferred.promise; + trigger(triggerName) { + let triggerSubject = this.allTriggerObservablesMap.find(triggerObservableObjectArg => { + return triggerObservableObjectArg.triggerName === triggerName; + }).subject; + triggerSubject.next(); + return triggerSubject; } /** * allows to specify help text to be printed above the rest of the help text */ addHelp(optionsArg) { - this.addCommand({ - commandName: 'help' - }).then(argvArg => { + this.addCommand('help').then(argvArg => { plugins.beautylog.log(optionsArg.helpText); }); } @@ -75,7 +92,7 @@ class Smartcli { */ addVersion(versionArg) { this.version = versionArg; - this.addAlias('v', 'version'); + this.addCommandAlias('v', 'version'); this.parseStarted.promise .then(() => { if (this.argv.v) { @@ -88,6 +105,10 @@ class Smartcli { */ standardTask() { let done = q.defer(); + this.allCommandPromisesMap.add({ + commandName: 'standard', + promise: done.promise + }); this.parseStarted.promise .then(() => { if (this.argv._.length === 0 && !this.argv.v) { @@ -109,4 +130,4 @@ class Smartcli { } } exports.Smartcli = Smartcli; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRjbGkuY2xhc3Nlcy5zbWFydGNsaS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0Y2xpLmNsYXNzZXMuc21hcnRjbGkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHVCQUFzQjtBQUV0Qiw4Q0FBNkM7QUFFN0MsaUJBQWlCO0FBQ2pCLDZCQUE2QjtBQVE3QjtJQWFJO1FBTEE7O1dBRUc7UUFDSCwyQkFBc0IsR0FBRyxJQUFJLGVBQVMsRUFBMEIsQ0FBQTtRQUc1RCxJQUFJLENBQUMsSUFBSSxHQUFHLE9BQU8sQ0FBQyxLQUFLLENBQUE7UUFDekIsSUFBSSxDQUFDLGFBQWEsR0FBRyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUE7UUFDOUIsSUFBSSxDQUFDLFlBQVksR0FBRyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUE7SUFDakMsQ0FBQztJQUVEOztPQUVHO0lBQ0gsUUFBUSxDQUFDLE1BQU0sRUFBQyxRQUFRO1FBQ3BCLElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxFQUFDLFFBQVEsQ0FBQyxDQUFBO1FBQzVDLE1BQU0sQ0FBQTtJQUNWLENBQUM7SUFFRDs7O09BR0c7SUFDSCxVQUFVLENBQUMsYUFBb0M7UUFDM0MsSUFBSSxJQUFJLEdBQUcsQ0FBQyxDQUFDLEtBQUssRUFBTyxDQUFBO1FBQ3pCLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxHQUFHLENBQUM7WUFDNUIsV0FBVyxFQUFFLGFBQWEsQ0FBQyxXQUFXO1lBQ3RDLFFBQVEsRUFBRSxJQUFJO1NBQ2pCLENBQUMsQ0FBQTtRQUNGLElBQUksQ0FBQyxZQUFZLENBQUMsT0FBTzthQUNwQixJQUFJLENBQUM7WUFDRixFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsYUFBYSxDQUFDLFdBQVcsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQ3ZELElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFBO1lBQzNCLENBQUM7WUFBQyxJQUFJLENBQUMsQ0FBQztnQkFDSixJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQTtZQUMxQixDQUFDO1FBQ0wsQ0FBQyxDQUFDLENBQUE7UUFDTixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtJQUN2QixDQUFDO0lBRUQ7O09BRUc7SUFDSCx1QkFBdUIsQ0FBQyxjQUFzQjtRQUMxQyxNQUFNLENBQUMsSUFBSSxDQUFDLHNCQUFzQixDQUFDLElBQUksQ0FBQyx3QkFBd0I7WUFDNUQsTUFBTSxDQUFDLHdCQUF3QixDQUFDLFdBQVcsS0FBSyxjQUFjLENBQUE7UUFDbEUsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQTtJQUN2QixDQUFDO0lBRUQ7OztPQUdHO0lBQ0gsb0JBQW9CLENBQUMsY0FBc0I7UUFDdkMsSUFBSSxlQUFlLEdBQUcsSUFBSSxDQUFDLHNCQUFzQixDQUFDLElBQUksQ0FBQyx3QkFBd0I7WUFDM0UsTUFBTSxDQUFDLHdCQUF3QixDQUFDLFdBQVcsS0FBSyxjQUFjLENBQUE7UUFDbEUsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFBO1FBQ1gsZUFBZSxDQUFDLE9BQU8sRUFBRSxDQUFBO1FBQ3pCLE1BQU0sQ0FBQyxlQUFlLENBQUMsT0FBTyxDQUFBO0lBQ2xDLENBQUM7SUFFRDs7T0FFRztJQUNILE9BQU8sQ0FBQyxVQUVQO1FBQ0csSUFBSSxDQUFDLFVBQVUsQ0FBQztZQUNaLFdBQVcsRUFBRSxNQUFNO1NBQ3RCLENBQUMsQ0FBQyxJQUFJLENBQUMsT0FBTztZQUNYLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsQ0FBQTtRQUM5QyxDQUFDLENBQUMsQ0FBQTtJQUNOLENBQUM7SUFFRDs7T0FFRztJQUNILFVBQVUsQ0FBQyxVQUFrQjtRQUN6QixJQUFJLENBQUMsT0FBTyxHQUFHLFVBQVUsQ0FBQTtRQUN6QixJQUFJLENBQUMsUUFBUSxDQUFDLEdBQUcsRUFBQyxTQUFTLENBQUMsQ0FBQTtRQUM1QixJQUFJLENBQUMsWUFBWSxDQUFDLE9BQU87YUFDcEIsSUFBSSxDQUFDO1lBQ0YsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO2dCQUNkLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFBO1lBQzdCLENBQUM7UUFDTCxDQUFDLENBQUMsQ0FBQTtJQUNWLENBQUM7SUFFRDs7T0FFRztJQUNILFlBQVk7UUFDUixJQUFJLElBQUksR0FBRyxDQUFDLENBQUMsS0FBSyxFQUFPLENBQUE7UUFDekIsSUFBSSxDQUFDLFlBQVksQ0FBQyxPQUFPO2FBQ3BCLElBQUksQ0FBQztZQUNGLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLE1BQU0sS0FBSyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQzNDLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFBO1lBQzNCLENBQUM7WUFBQyxJQUFJLENBQUMsQ0FBQztnQkFDSixJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQTtZQUMxQixDQUFDO1FBQ0wsQ0FBQyxDQUFDLENBQUE7UUFDTixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtJQUN2QixDQUFDO0lBRUQ7O09BRUc7SUFDSCxVQUFVO1FBQ04sSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQTtRQUMxQixJQUFJLENBQUMsWUFBWSxDQUFDLE9BQU8sRUFBRSxDQUFBO1FBQzNCLE1BQU0sQ0FBQTtJQUNWLENBQUM7Q0FFSjtBQXpIRCw0QkF5SEMifQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRjbGkuY2xhc3Nlcy5zbWFydGNsaS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0Y2xpLmNsYXNzZXMuc21hcnRjbGkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHVCQUFzQjtBQUN0QiwrQkFBOEI7QUFFOUIsOENBQTZDO0FBRTdDLGlCQUFpQjtBQUNqQiw2QkFBK0I7QUFhL0I7SUFrQkk7UUFWQTs7V0FFRztRQUNILDBCQUFxQixHQUFHLElBQUksZUFBUyxFQUF5QixDQUFBO1FBRTlEOztXQUVHO1FBQ0gsNkJBQXdCLEdBQUcsSUFBSSxlQUFTLEVBQTRCLENBQUE7UUFHaEUsSUFBSSxDQUFDLElBQUksR0FBRyxPQUFPLENBQUMsS0FBSyxDQUFBO1FBQ3pCLElBQUksQ0FBQyxhQUFhLEdBQUcsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFBO1FBQzlCLElBQUksQ0FBQyxZQUFZLEdBQUcsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFBO0lBQ2pDLENBQUM7SUFFRDs7T0FFRztJQUNILGVBQWUsQ0FBQyxNQUFNLEVBQUMsUUFBUTtRQUMzQixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sRUFBQyxRQUFRLENBQUMsQ0FBQTtRQUM1QyxNQUFNLENBQUE7SUFDVixDQUFDO0lBRUQ7OztPQUdHO0lBQ0gsVUFBVSxDQUFDLGNBQXNCO1FBQzdCLElBQUksSUFBSSxHQUFHLENBQUMsQ0FBQyxLQUFLLEVBQU8sQ0FBQTtRQUN6QixJQUFJLENBQUMscUJBQXFCLENBQUMsR0FBRyxDQUFDO1lBQzNCLFdBQVcsRUFBRSxjQUFjO1lBQzNCLE9BQU8sRUFBRSxJQUFJLENBQUMsT0FBTztTQUN4QixDQUFDLENBQUE7UUFDRixJQUFJLENBQUMsWUFBWSxDQUFDLE9BQU87YUFDcEIsSUFBSSxDQUFDO1lBQ0YsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENB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 \ No newline at end of file diff --git a/dist/smartcli.plugins.js b/dist/smartcli.plugins.js index c7e8aa3..5122cd5 100644 --- a/dist/smartcli.plugins.js +++ b/dist/smartcli.plugins.js @@ -10,4 +10,4 @@ const path = require("path"); exports.path = path; const smartparam = require("smartparam"); exports.smartparam = smartparam; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRjbGkucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0Y2xpLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDBCQUF3QjtBQUV4QiwrQkFBOEI7QUFPMUIsc0JBQUs7QUFOVCx1Q0FBc0M7QUFPbEMsOEJBQVM7QUFOYiwyQkFBMEI7QUFPdEIsa0JBQUc7QUFOUCw2QkFBNEI7QUFPeEIsb0JBQUk7QUFOUix5Q0FBd0M7QUFPcEMsZ0NBQVUifQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRjbGkucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0Y2xpLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDBCQUF1QjtBQUV2QiwrQkFBOEI7QUFPMUIsc0JBQUs7QUFOVCx1Q0FBc0M7QUFPbEMsOEJBQVM7QUFOYiwyQkFBMEI7QUFPdEIsa0JBQUc7QUFOUCw2QkFBNEI7QUFPeEIsb0JBQUk7QUFOUix5Q0FBd0M7QUFPcEMsZ0NBQVUifQ== \ No newline at end of file diff --git a/package.json b/package.json index 7864557..9258a35 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "beautylog": "^6.0.0", "lik": "^1.0.24", "q": "^1.4.1", + "rxjs": "^5.0.1", "smartparam": "0.1.1", "typings-global": "^1.0.14", "yargs": "^6.4.0" diff --git a/test/test.js b/test/test.js index f11c258..e86a10e 100644 --- a/test/test.js +++ b/test/test.js @@ -12,9 +12,7 @@ describe('smartcli.Smartcli class', function () { }); describe('.addCommand', function () { it('should add an command', function () { - smartCliTestObject.addCommand({ - commandName: 'awesome' - }); + smartCliTestObject.addCommand('awesome'); }); }); describe('.standardTask', function () { @@ -26,11 +24,11 @@ describe('smartcli.Smartcli class', function () { done(); }); }); - describe('.triggerCommandByName', function () { + describe('.trigger', function () { let hasExecuted = false; it('should accept a command', function (done) { - smartCliTestObject.addCommand({ commandName: 'triggerme' }) - .then(argvArg => { + smartCliTestObject.addTrigger('triggerme') + .subscribe(() => { hasExecuted = true; }); done(); @@ -39,11 +37,9 @@ describe('smartcli.Smartcli class', function () { should(hasExecuted).be.false(); }); it('should execute when triggered', function (done) { - smartCliTestObject.triggerCommandByName('triggerme') - .then(argvArg => { - should(hasExecuted).be.true(); - done(); - }).catch(err => { done(err); }); + smartCliTestObject.trigger('triggerme'); + should(hasExecuted).be.true(); + done(); }); }); describe('.startParse', function () { @@ -52,4 +48,4 @@ describe('smartcli.Smartcli class', function () { }); }); }); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHdCQUFxQjtBQUVyQiwwQ0FBMEM7QUFDMUMsaUNBQWdDO0FBRWhDLFFBQVEsQ0FBQyx5QkFBeUIsRUFBQztJQUMvQixJQUFJLGtCQUFxQyxDQUFBO0lBQ3pDLFFBQVEsQ0FBQyxnQkFBZ0IsRUFBQztRQUN0QixFQUFFLENBQUMsOEJBQThCLEVBQUM7WUFDOUIsa0JBQWtCLEdBQUcsSUFBSSxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUE7WUFDNUMsTUFBTSxDQUFDLGtCQUFrQixDQUFDLENBQUMsRUFBRSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLENBQUE7UUFDL0QsQ0FBQyxDQUFDLENBQUE7SUFDTixDQUFDLENBQUMsQ0FBQTtJQUNGLFFBQVEsQ0FBQyxhQUFhLEVBQUM7UUFDbkIsRUFBRSxDQUFDLHVCQUF1QixFQUFDO1lBQ3ZCLGtCQUFrQixDQUFDLFVBQVUsQ0FBQztnQkFDMUIsV0FBVyxFQUFFLFNBQVM7YUFDekIsQ0FBQyxDQUFBO1FBQ04sQ0FBQyxDQUFDLENBQUE7SUFDTixDQUFDLENBQUMsQ0FBQTtJQUNGLFFBQVEsQ0FBQyxlQUFlLEVBQUM7UUFDckIsRUFBRSxDQUFDLHFDQUFxQyxFQUFDLFVBQVMsSUFBSTtZQUNsRCxrQkFBa0IsQ0FBQyxZQUFZLEVBQUU7aUJBQzVCLElBQUksQ0FBQztnQkFDRixPQUFPLENBQUMsR0FBRyxDQUFDLDRCQUE0QixDQUFDLENBQUE7WUFDN0MsQ0FBQyxDQUFDLENBQUE7WUFDTixJQUFJLEVBQUUsQ0FBQTtRQUNWLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDLENBQUE7SUFDRixRQUFRLENBQUMsdUJBQXVCLEVBQUU7UUFDOUIsSUFBSSxXQUFXLEdBQUcsS0FBSyxDQUFBO1FBQ3ZCLEVBQUUsQ0FBQyx5QkFBeUIsRUFBRSxVQUFTLElBQUk7WUFDdkMsa0JBQWtCLENBQUMsVUFBVSxDQUFDLEVBQUMsV0FBVyxFQUFFLFdBQVcsRUFBQyxDQUFDO2lCQUNwRCxJQUFJLENBQUMsT0FBTztnQkFDVCxXQUFXLEdBQUcsSUFBSSxDQUFBO1lBQ3RCLENBQUMsQ0FBQyxDQUFBO1lBQ04sSUFBSSxFQUFFLENBQUE7UUFDVixDQUFDLENBQUMsQ0FBQTtRQUNGLEVBQUUsQ0FBQyw4QkFBOEIsRUFBRTtZQUMvQixNQUFNLENBQUMsV0FBVyxDQUFDLENBQUMsRUFBRSxDQUFDLEtBQUssRUFBRSxDQUFBO1FBQ2xDLENBQUMsQ0FBQyxDQUFBO1FBQ0YsRUFBRSxDQUFDLCtCQUErQixFQUFFLFVBQVMsSUFBSTtZQUM3QyxrQkFBa0IsQ0FBQyxvQkFBb0IsQ0FBQyxXQUFXLENBQUM7aUJBQy9DLElBQUksQ0FBQyxPQUFPO2dCQUNULE1BQU0sQ0FBQyxXQUFXLENBQUMsQ0FBQyxFQUFFLENBQUMsSUFBSSxFQUFFLENBQUE7Z0JBQzdCLElBQUksRUFBRSxDQUFBO1lBQ1YsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLEdBQUcsTUFBTSxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUEsQ0FBQyxDQUFDLENBQUMsQ0FBQTtRQUN0QyxDQUFDLENBQUMsQ0FBQTtJQUNOLENBQUMsQ0FBQyxDQUFBO0lBQ0YsUUFBUSxDQUFDLGFBQWEsRUFBQztRQUNuQixFQUFFLENBQUMsb0NBQW9DLEVBQUM7WUFDcEMsa0JBQWtCLENBQUMsVUFBVSxFQUFFLENBQUE7UUFDbkMsQ0FBQyxDQUFDLENBQUE7SUFDTixDQUFDLENBQUMsQ0FBQTtBQUNOLENBQUMsQ0FBQyxDQUFBIn0= \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHdCQUFxQjtBQUVyQiwwQ0FBMEM7QUFDMUMsaUNBQWdDO0FBRWhDLFFBQVEsQ0FBQyx5QkFBeUIsRUFBQztJQUMvQixJQUFJLGtCQUFxQyxDQUFBO0lBQ3pDLFFBQVEsQ0FBQyxnQkFBZ0IsRUFBQztRQUN0QixFQUFFLENBQUMsOEJBQThCLEVBQUM7WUFDOUIsa0JBQWtCLEdBQUcsSUFBSSxRQUFRLENBQUMsUUFBUSxFQUFFLENBQUE7WUFDNUMsTUFBTSxDQUFDLGtCQUFrQixDQUFDLENBQUMsRUFBRSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLENBQUE7UUFDL0QsQ0FBQyxDQUFDLENBQUE7SUFDTixDQUFDLENBQUMsQ0FBQTtJQUNGLFFBQVEsQ0FBQyxhQUFhLEVBQUM7UUFDbkIsRUFBRSxDQUFDLHVCQUF1QixFQUFDO1lBQ3ZCLGtCQUFrQixDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsQ0FBQTtRQUM1QyxDQUFDLENBQUMsQ0FBQTtJQUNOLENBQUMsQ0FBQyxDQUFBO0lBQ0YsUUFBUSxDQUFDLGVBQWUsRUFBQztRQUNyQixFQUFFLENBQUMscUNBQXFDLEVBQUMsVUFBUyxJQUFJO1lBQ2xELGtCQUFrQixDQUFDLFlBQVksRUFBRTtpQkFDNUIsSUFBSSxDQUFDO2dCQUNGLE9BQU8sQ0FBQyxHQUFHLENBQUMsNEJBQTRCLENBQUMsQ0FBQTtZQUM3QyxDQUFDLENBQUMsQ0FBQTtZQUNOLElBQUksRUFBRSxDQUFBO1FBQ1YsQ0FBQyxDQUFDLENBQUE7SUFDTixDQUFDLENBQUMsQ0FBQTtJQUNGLFFBQVEsQ0FBQyxVQUFVLEVBQUU7UUFDakIsSUFBSSxXQUFXLEdBQUcsS0FBSyxDQUFBO1FBQ3ZCLEVBQUUsQ0FBQyx5QkFBeUIsRUFBRSxVQUFTLElBQUk7WUFDdkMsa0JBQWtCLENBQUMsVUFBVSxDQUFDLFdBQVcsQ0FBQztpQkFDckMsU0FBUyxDQUFDO2dCQUNQLFdBQVcsR0FBRyxJQUFJLENBQUE7WUFDdEIsQ0FBQyxDQUFDLENBQUE7WUFDTixJQUFJLEVBQUUsQ0FBQTtRQUNWLENBQUMsQ0FBQyxDQUFBO1FBQ0YsRUFBRSxDQUFDLDhCQUE4QixFQUFFO1lBQy9CLE1BQU0sQ0FBQyxXQUFXLENBQUMsQ0FBQyxFQUFFLENBQUMsS0FBSyxFQUFFLENBQUE7UUFDbEMsQ0FBQyxDQUFDLENBQUE7UUFDRixFQUFFLENBQUMsK0JBQStCLEVBQUUsVUFBUyxJQUFJO1lBQzdDLGtCQUFrQixDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQTtZQUN2QyxNQUFNLENBQUMsV0FBVyxDQUFDLENBQUMsRUFBRSxDQUFDLElBQUksRUFBRSxDQUFBO1lBQzdCLElBQUksRUFBRSxDQUFBO1FBQ1YsQ0FBQyxDQUFDLENBQUE7SUFDTixDQUFDLENBQUMsQ0FBQTtJQUNGLFFBQVEsQ0FBQyxhQUFhLEVBQUM7UUFDbkIsRUFBRSxDQUFDLG9DQUFvQyxFQUFDO1lBQ3BDLGtCQUFrQixDQUFDLFVBQVUsRUFBRSxDQUFBO1FBQ25DLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQyxDQUFDLENBQUE7QUFDTixDQUFDLENBQUMsQ0FBQSJ9 \ No newline at end of file diff --git a/test/test.ts b/test/test.ts index 6eb61cc..debed09 100644 --- a/test/test.ts +++ b/test/test.ts @@ -13,9 +13,7 @@ describe('smartcli.Smartcli class',function(){ }) describe('.addCommand',function(){ it('should add an command',function(){ - smartCliTestObject.addCommand({ - commandName: 'awesome' - }) + smartCliTestObject.addCommand('awesome') }) }) describe('.standardTask',function(){ @@ -27,11 +25,11 @@ describe('smartcli.Smartcli class',function(){ done() }) }) - describe('.triggerCommandByName', function() { + describe('.trigger', function() { let hasExecuted = false it('should accept a command', function(done) { - smartCliTestObject.addCommand({commandName: 'triggerme'}) - .then(argvArg => { + smartCliTestObject.addTrigger('triggerme') + .subscribe(() => { hasExecuted = true }) done() @@ -40,11 +38,9 @@ describe('smartcli.Smartcli class',function(){ should(hasExecuted).be.false() }) it('should execute when triggered', function(done) { - smartCliTestObject.triggerCommandByName('triggerme') - .then(argvArg => { - should(hasExecuted).be.true() - done() - }).catch(err => { done(err) }) + smartCliTestObject.trigger('triggerme') + should(hasExecuted).be.true() + done() }) }) describe('.startParse',function(){ diff --git a/ts/smartcli.classes.smartcli.ts b/ts/smartcli.classes.smartcli.ts index 14b4caa..465d6fd 100644 --- a/ts/smartcli.classes.smartcli.ts +++ b/ts/smartcli.classes.smartcli.ts @@ -1,14 +1,20 @@ import * as q from 'q' +import { Subject } from 'rxjs' import * as plugins from './smartcli.plugins' // import classes -import {Objectmap} from 'lik' +import { Objectmap } from 'lik' // interfaces -export interface ICommandDeferredObject { - commandName: string - deferred: q.Deferred +export interface ICommandPromiseObject { + commandName: string, + promise: q.Promise +} + +export interface ITriggerObservableObject { + triggerName: string + subject: Subject } export class Smartcli { @@ -22,7 +28,12 @@ export class Smartcli { /** * map of all Command/Promise objects to keep track */ - allCommandDeferredsMap = new Objectmap() + allCommandPromisesMap = new Objectmap() + + /** + * map of all Trigger/Observable objects to keep track + */ + allTriggerObservablesMap = new Objectmap() constructor() { this.argv = plugins.yargs @@ -31,9 +42,9 @@ export class Smartcli { } /** - * adds an alias, meaning one equals the other in terms of triggering associated commands + * adds an alias, meaning one equals the other in terms of command execution. */ - addAlias(keyArg,aliasArg): void { + addCommandAlias(keyArg,aliasArg): void { this.argv = this.argv.alias(keyArg,aliasArg) return } @@ -42,15 +53,15 @@ export class Smartcli { * adds a Command by returning a Promise that reacts to the specific commandString given. * Note: in e.g. "npm install something" the "install" is considered the command. */ - addCommand(definitionArg: {commandName: string}): q.Promise { + addCommand(commandNameArg: string): q.Promise { let done = q.defer() - this.allCommandDeferredsMap.add({ - commandName: definitionArg.commandName, - deferred: done + this.allCommandPromisesMap.add({ + commandName: commandNameArg, + promise: done.promise }) this.parseStarted.promise .then(() => { - if (this.argv._.indexOf(definitionArg.commandName) === 0) { + if (this.argv._.indexOf(commandNameArg) === 0) { done.resolve(this.argv) } else { done.reject(this.argv) @@ -63,21 +74,36 @@ export class Smartcli { * gets a Promise for a command word */ getCommandPromiseByName(commandNameArg: string): q.Promise { - return this.allCommandDeferredsMap.find(commandDeferredObjectArg => { + return this.allCommandPromisesMap.find(commandDeferredObjectArg => { return commandDeferredObjectArg.commandName === commandNameArg - }).deferred.promise + }).promise } /** - * triggers a command by name + * adds a Trigger. Like addCommand(), but returns an subscribable observable + */ + addTrigger(triggerNameArg: string) { + let triggerSubject = new Subject() + this.allTriggerObservablesMap.add({ + triggerName: triggerNameArg, + subject: triggerSubject + }) + this.addCommand(triggerNameArg).then(() => { + triggerSubject.next() + }) + return triggerSubject + } + + /** + * execute trigger by name * @param commandNameArg - the name of the command to trigger */ - triggerCommandByName(commandNameArg: string) { - let commandDeferred = this.allCommandDeferredsMap.find(commandDeferredObjectArg => { - return commandDeferredObjectArg.commandName === commandNameArg - }).deferred - commandDeferred.resolve() - return commandDeferred.promise + trigger(triggerName: string) { + let triggerSubject = this.allTriggerObservablesMap.find(triggerObservableObjectArg => { + return triggerObservableObjectArg.triggerName === triggerName + }).subject + triggerSubject.next() + return triggerSubject } /** @@ -86,9 +112,7 @@ export class Smartcli { addHelp(optionsArg: { helpText: string }) { - this.addCommand({ - commandName: 'help' - }).then(argvArg => { + this.addCommand('help').then(argvArg => { plugins.beautylog.log(optionsArg.helpText) }) } @@ -98,7 +122,7 @@ export class Smartcli { */ addVersion(versionArg: string) { this.version = versionArg - this.addAlias('v','version') + this.addCommandAlias('v','version') this.parseStarted.promise .then(() => { if (this.argv.v) { @@ -112,6 +136,10 @@ export class Smartcli { */ standardTask(): q.Promise { let done = q.defer() + this.allCommandPromisesMap.add({ + commandName: 'standard', + promise: done.promise + }) this.parseStarted.promise .then(() => { if (this.argv._.length === 0 && !this.argv.v) { diff --git a/ts/smartcli.plugins.ts b/ts/smartcli.plugins.ts index eee1910..433dfca 100644 --- a/ts/smartcli.plugins.ts +++ b/ts/smartcli.plugins.ts @@ -1,4 +1,4 @@ -import 'typings-global'; +import 'typings-global' import * as yargs from 'yargs' import * as beautylog from 'beautylog'