From a790c3fc8e12f4e1ca471f6ff391feded47d2c28 Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Sat, 14 May 2016 16:26:38 +0200 Subject: [PATCH] beautylog.ora now supports intermediate log messages. --- dist/beautylog.classes.d.ts | 2 +- dist/beautylog.classes.js | 6 +++--- dist/beautylog.classes.ora.d.ts | 5 ++++- dist/beautylog.classes.ora.js | 20 +++++++++++++++++--- dist/beautylog.plugins.d.ts | 10 ++++++++-- dist/beautylog.plugins.js | 25 +++++++++---------------- dist/index.d.ts | 2 +- test/test.js | 5 +++-- test/test.ts | 3 ++- ts/beautylog.classes.ora.ts | 19 +++++++++++++++++-- ts/beautylog.classes.ts | 4 ++-- ts/beautylog.plugins.ts | 23 ++++++++--------------- 12 files changed, 75 insertions(+), 49 deletions(-) diff --git a/dist/beautylog.classes.d.ts b/dist/beautylog.classes.d.ts index 4b7955a..283e56d 100644 --- a/dist/beautylog.classes.d.ts +++ b/dist/beautylog.classes.d.ts @@ -1,4 +1,4 @@ import { Table } from "./beautylog.classes.table"; import { Ora } from "./beautylog.classes.ora"; export declare let table: (tableTypeArg: string, tableHeadArrayArg?: string[]) => Table; -export declare let ora: (textArg: string, colorArg: string) => Ora; +export declare let ora: (textArg: string, colorArg: string, startArg?: boolean) => Ora; diff --git a/dist/beautylog.classes.js b/dist/beautylog.classes.js index f2c86f8..b4527f0 100644 --- a/dist/beautylog.classes.js +++ b/dist/beautylog.classes.js @@ -5,8 +5,8 @@ var beautylog_classes_ora_1 = require("./beautylog.classes.ora"); exports.table = function (tableTypeArg, tableHeadArrayArg) { return new beautylog_classes_table_1.Table(tableTypeArg, tableHeadArrayArg); }; -exports.ora = function (textArg, colorArg) { - return new beautylog_classes_ora_1.Ora(textArg, colorArg); +exports.ora = function (textArg, colorArg, startArg) { + return new beautylog_classes_ora_1.Ora(textArg, colorArg, startArg); }; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImJlYXV0eWxvZy5jbGFzc2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDRDQUE0Qzs7QUFFNUMsd0NBQW9CLDJCQUEyQixDQUFDLENBQUE7QUFDaEQsc0NBQWtCLHlCQUF5QixDQUFDLENBQUE7QUFFakMsYUFBSyxHQUFHLFVBQVMsWUFBbUIsRUFBQyxpQkFBMkI7SUFDdkUsTUFBTSxDQUFDLElBQUksK0JBQUssQ0FBQyxZQUFZLEVBQUMsaUJBQWlCLENBQUMsQ0FBQztBQUNyRCxDQUFDLENBQUE7QUFFVSxXQUFHLEdBQUcsVUFBUyxPQUFjLEVBQUMsUUFBZTtJQUNwRCxNQUFNLENBQUMsSUFBSSwyQkFBRyxDQUFDLE9BQU8sRUFBQyxRQUFRLENBQUMsQ0FBQztBQUNyQyxDQUFDLENBQUEiLCJmaWxlIjoiYmVhdXR5bG9nLmNsYXNzZXMuanMiLCJzb3VyY2VzQ29udGVudCI6WyIvLy8gPHJlZmVyZW5jZSBwYXRoPVwiLi90eXBpbmdzL21haW4uZC50c1wiIC8+XHJcblxyXG5pbXBvcnQge1RhYmxlfSBmcm9tIFwiLi9iZWF1dHlsb2cuY2xhc3Nlcy50YWJsZVwiO1xyXG5pbXBvcnQge09yYX0gZnJvbSBcIi4vYmVhdXR5bG9nLmNsYXNzZXMub3JhXCI7XHJcblxyXG5leHBvcnQgbGV0IHRhYmxlID0gZnVuY3Rpb24odGFibGVUeXBlQXJnOnN0cmluZyx0YWJsZUhlYWRBcnJheUFyZz86c3RyaW5nW10pe1xyXG4gICAgcmV0dXJuIG5ldyBUYWJsZSh0YWJsZVR5cGVBcmcsdGFibGVIZWFkQXJyYXlBcmcpO1xyXG59XHJcblxyXG5leHBvcnQgbGV0IG9yYSA9IGZ1bmN0aW9uKHRleHRBcmc6c3RyaW5nLGNvbG9yQXJnOnN0cmluZyl7XHJcbiAgICByZXR1cm4gbmV3IE9yYSh0ZXh0QXJnLGNvbG9yQXJnKTtcclxufSJdfQ== +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImJlYXV0eWxvZy5jbGFzc2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDRDQUE0Qzs7QUFFNUMsd0NBQW9CLDJCQUEyQixDQUFDLENBQUE7QUFDaEQsc0NBQWtCLHlCQUF5QixDQUFDLENBQUE7QUFFakMsYUFBSyxHQUFHLFVBQVMsWUFBbUIsRUFBQyxpQkFBMkI7SUFDdkUsTUFBTSxDQUFDLElBQUksK0JBQUssQ0FBQyxZQUFZLEVBQUMsaUJBQWlCLENBQUMsQ0FBQztBQUNyRCxDQUFDLENBQUE7QUFFVSxXQUFHLEdBQUcsVUFBUyxPQUFjLEVBQUMsUUFBZSxFQUFDLFFBQWlCO0lBQ3RFLE1BQU0sQ0FBQyxJQUFJLDJCQUFHLENBQUMsT0FBTyxFQUFDLFFBQVEsRUFBQyxRQUFRLENBQUMsQ0FBQztBQUM5QyxDQUFDLENBQUEiLCJmaWxlIjoiYmVhdXR5bG9nLmNsYXNzZXMuanMiLCJzb3VyY2VzQ29udGVudCI6WyIvLy8gPHJlZmVyZW5jZSBwYXRoPVwiLi90eXBpbmdzL21haW4uZC50c1wiIC8+XHJcblxyXG5pbXBvcnQge1RhYmxlfSBmcm9tIFwiLi9iZWF1dHlsb2cuY2xhc3Nlcy50YWJsZVwiO1xyXG5pbXBvcnQge09yYX0gZnJvbSBcIi4vYmVhdXR5bG9nLmNsYXNzZXMub3JhXCI7XHJcblxyXG5leHBvcnQgbGV0IHRhYmxlID0gZnVuY3Rpb24odGFibGVUeXBlQXJnOnN0cmluZyx0YWJsZUhlYWRBcnJheUFyZz86c3RyaW5nW10pe1xyXG4gICAgcmV0dXJuIG5ldyBUYWJsZSh0YWJsZVR5cGVBcmcsdGFibGVIZWFkQXJyYXlBcmcpO1xyXG59XHJcblxyXG5leHBvcnQgbGV0IG9yYSA9IGZ1bmN0aW9uKHRleHRBcmc6c3RyaW5nLGNvbG9yQXJnOnN0cmluZyxzdGFydEFyZz86Ym9vbGVhbil7XHJcbiAgICByZXR1cm4gbmV3IE9yYSh0ZXh0QXJnLGNvbG9yQXJnLHN0YXJ0QXJnKTtcclxufSJdfQ== diff --git a/dist/beautylog.classes.ora.d.ts b/dist/beautylog.classes.ora.d.ts index bdfa8ca..e817522 100644 --- a/dist/beautylog.classes.ora.d.ts +++ b/dist/beautylog.classes.ora.d.ts @@ -1,9 +1,12 @@ export declare class Ora { private _oraObject; state: string; - constructor(textArg: string, colorArg: string); + constructor(textArg: string, colorArg: string, startArg?: boolean); text(textArg: any): void; + start(): void; end(): void; endOk(textArg: any): void; endError(textArg: any): void; + stop(): void; + log(logText: string, logType: string): void; } diff --git a/dist/beautylog.classes.ora.js b/dist/beautylog.classes.ora.js index 93391e3..1215b5e 100644 --- a/dist/beautylog.classes.ora.js +++ b/dist/beautylog.classes.ora.js @@ -3,18 +3,23 @@ var plugins = require("./beautylog.plugins"); var log = require("./beautylog.log"); var Ora = (function () { - function Ora(textArg, colorArg) { + function Ora(textArg, colorArg, startArg) { + if (startArg === void 0) { startArg = false; } this._oraObject = plugins.ora({ spinner: "dots", text: textArg, color: colorArg }); - this._oraObject.start(); + startArg ? this._oraObject.start() : void (0); } Ora.prototype.text = function (textArg) { this._oraObject.text = textArg; }; ; + Ora.prototype.start = function () { + this._oraObject.start(); + }; + ; Ora.prototype.end = function () { this._oraObject.stop(); this._oraObject.clear(); @@ -29,8 +34,17 @@ var Ora = (function () { log.error(textArg); }; ; + Ora.prototype.stop = function () { + this.end(); + }; + // log methods that play nice with ora + Ora.prototype.log = function (logText, logType) { + this.stop(); + log.log(logText, logType); + this.start(); + }; return Ora; }()); exports.Ora = Ora; -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImJlYXV0eWxvZy5jbGFzc2VzLm9yYS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsNENBQTRDO0FBQzVDLElBQVksT0FBTyxXQUFNLHFCQUFxQixDQUFDLENBQUE7QUFDL0MsSUFBWSxHQUFHLFdBQU0saUJBQWlCLENBQUMsQ0FBQTtBQUV2QztJQUdJLGFBQVksT0FBYyxFQUFDLFFBQWU7UUFDdEMsSUFBSSxDQUFDLFVBQVUsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDO1lBQzFCLE9BQU8sRUFBQyxNQUFNO1lBQ2QsSUFBSSxFQUFDLE9BQU87WUFDWixLQUFLLEVBQUMsUUFBUTtTQUNqQixDQUFDLENBQUM7UUFDSCxJQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQzVCLENBQUM7SUFDRCxrQkFBSSxHQUFKLFVBQUssT0FBTztRQUNSLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxHQUFHLE9BQU8sQ0FBQztJQUNuQyxDQUFDOztJQUNELGlCQUFHLEdBQUg7UUFDSSxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksRUFBRSxDQUFDO1FBQ3ZCLElBQUksQ0FBQyxVQUFVLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDNUIsQ0FBQztJQUNELG1CQUFLLEdBQUwsVUFBTSxPQUFPO1FBQ1QsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDO1FBQ1gsR0FBRyxDQUFDLEVBQUUsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUNwQixDQUFDOztJQUNELHNCQUFRLEdBQVIsVUFBUyxPQUFPO1FBQ1osSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDO1FBQ1gsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUN2QixDQUFDOztJQUNMLFVBQUM7QUFBRCxDQTFCQSxBQTBCQyxJQUFBO0FBMUJZLFdBQUcsTUEwQmYsQ0FBQSIsImZpbGUiOiJiZWF1dHlsb2cuY2xhc3Nlcy5vcmEuanMiLCJzb3VyY2VzQ29udGVudCI6WyIvLy8gPHJlZmVyZW5jZSBwYXRoPVwiLi90eXBpbmdzL21haW4uZC50c1wiIC8+XHJcbmltcG9ydCAqIGFzIHBsdWdpbnMgZnJvbSBcIi4vYmVhdXR5bG9nLnBsdWdpbnNcIjtcclxuaW1wb3J0ICogYXMgbG9nIGZyb20gXCIuL2JlYXV0eWxvZy5sb2dcIjtcclxuXHJcbmV4cG9ydCBjbGFzcyBPcmEge1xyXG4gICAgcHJpdmF0ZSBfb3JhT2JqZWN0O1xyXG4gICAgc3RhdGU6c3RyaW5nO1xyXG4gICAgY29uc3RydWN0b3IodGV4dEFyZzpzdHJpbmcsY29sb3JBcmc6c3RyaW5nKXtcclxuICAgICAgICB0aGlzLl9vcmFPYmplY3QgPSBwbHVnaW5zLm9yYSh7XHJcbiAgICAgICAgICAgIHNwaW5uZXI6XCJkb3RzXCIsXHJcbiAgICAgICAgICAgIHRleHQ6dGV4dEFyZyxcclxuICAgICAgICAgICAgY29sb3I6Y29sb3JBcmdcclxuICAgICAgICB9KTtcclxuICAgICAgICB0aGlzLl9vcmFPYmplY3Quc3RhcnQoKTtcclxuICAgIH1cclxuICAgIHRleHQodGV4dEFyZyl7XHJcbiAgICAgICAgdGhpcy5fb3JhT2JqZWN0LnRleHQgPSB0ZXh0QXJnO1xyXG4gICAgfTtcclxuICAgIGVuZCgpe1xyXG4gICAgICAgIHRoaXMuX29yYU9iamVjdC5zdG9wKCk7XHJcbiAgICAgICAgdGhpcy5fb3JhT2JqZWN0LmNsZWFyKCk7XHJcbiAgICB9XHJcbiAgICBlbmRPayh0ZXh0QXJnKXtcclxuICAgICAgICB0aGlzLmVuZCgpO1xyXG4gICAgICAgIGxvZy5vayh0ZXh0QXJnKTtcclxuICAgIH07XHJcbiAgICBlbmRFcnJvcih0ZXh0QXJnKXtcclxuICAgICAgICB0aGlzLmVuZCgpO1xyXG4gICAgICAgIGxvZy5lcnJvcih0ZXh0QXJnKTtcclxuICAgIH07XHJcbn0iXX0= +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImJlYXV0eWxvZy5jbGFzc2VzLm9yYS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsNENBQTRDO0FBQzVDLElBQVksT0FBTyxXQUFNLHFCQUFxQixDQUFDLENBQUE7QUFDL0MsSUFBWSxHQUFHLFdBQU0saUJBQWlCLENBQUMsQ0FBQTtBQUV2QztJQUdJLGFBQVksT0FBYyxFQUFDLFFBQWUsRUFBQyxRQUF3QjtRQUF4Qix3QkFBd0IsR0FBeEIsZ0JBQXdCO1FBQy9ELElBQUksQ0FBQyxVQUFVLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQztZQUMxQixPQUFPLEVBQUMsTUFBTTtZQUNkLElBQUksRUFBQyxPQUFPO1lBQ1osS0FBSyxFQUFDLFFBQVE7U0FDakIsQ0FBQyxDQUFDO1FBRUgsUUFBUSxHQUFHLElBQUksQ0FBQyxVQUFVLENBQUMsS0FBSyxFQUFFLEdBQUcsS0FBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ2pELENBQUM7SUFDRCxrQkFBSSxHQUFKLFVBQUssT0FBTztRQUNSLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxHQUFHLE9BQU8sQ0FBQztJQUNuQyxDQUFDOztJQUVELG1CQUFLLEdBQUw7UUFDSSxJQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQzVCLENBQUM7O0lBQ0QsaUJBQUcsR0FBSDtRQUNJLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxFQUFFLENBQUM7UUFDdkIsSUFBSSxDQUFDLFVBQVUsQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUM1QixDQUFDO0lBQ0QsbUJBQUssR0FBTCxVQUFNLE9BQU87UUFDVCxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUM7UUFDWCxHQUFHLENBQUMsRUFBRSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3BCLENBQUM7O0lBQ0Qsc0JBQVEsR0FBUixVQUFTLE9BQU87UUFDWixJQUFJLENBQUMsR0FBRyxFQUFFLENBQUM7UUFDWCxHQUFHLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3ZCLENBQUM7O0lBQ0Qsa0JBQUksR0FBSjtRQUNJLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQztJQUNmLENBQUM7SUFFRCxzQ0FBc0M7SUFDdEMsaUJBQUcsR0FBSCxVQUFJLE9BQWMsRUFBQyxPQUFjO1FBQzdCLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUNaLEdBQUcsQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ3pCLElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUNqQixDQUFDO0lBQ0wsVUFBQztBQUFELENBekNBLEFBeUNDLElBQUE7QUF6Q1ksV0FBRyxNQXlDZixDQUFBIiwiZmlsZSI6ImJlYXV0eWxvZy5jbGFzc2VzLm9yYS5qcyIsInNvdXJjZXNDb250ZW50IjpbIi8vLyA8cmVmZXJlbmNlIHBhdGg9XCIuL3R5cGluZ3MvbWFpbi5kLnRzXCIgLz5cclxuaW1wb3J0ICogYXMgcGx1Z2lucyBmcm9tIFwiLi9iZWF1dHlsb2cucGx1Z2luc1wiO1xyXG5pbXBvcnQgKiBhcyBsb2cgZnJvbSBcIi4vYmVhdXR5bG9nLmxvZ1wiO1xyXG5cclxuZXhwb3J0IGNsYXNzIE9yYSB7XHJcbiAgICBwcml2YXRlIF9vcmFPYmplY3Q7XHJcbiAgICBzdGF0ZTpzdHJpbmc7XHJcbiAgICBjb25zdHJ1Y3Rvcih0ZXh0QXJnOnN0cmluZyxjb2xvckFyZzpzdHJpbmcsc3RhcnRBcmc6Ym9vbGVhbiA9IGZhbHNlKXtcclxuICAgICAgICB0aGlzLl9vcmFPYmplY3QgPSBwbHVnaW5zLm9yYSh7XHJcbiAgICAgICAgICAgIHNwaW5uZXI6XCJkb3RzXCIsXHJcbiAgICAgICAgICAgIHRleHQ6dGV4dEFyZyxcclxuICAgICAgICAgICAgY29sb3I6Y29sb3JBcmdcclxuICAgICAgICB9KTtcclxuICAgICAgICBcclxuICAgICAgICBzdGFydEFyZyA/IHRoaXMuX29yYU9iamVjdC5zdGFydCgpIDogdm9pZCgwKTtcclxuICAgIH1cclxuICAgIHRleHQodGV4dEFyZyl7XHJcbiAgICAgICAgdGhpcy5fb3JhT2JqZWN0LnRleHQgPSB0ZXh0QXJnO1xyXG4gICAgfTtcclxuICAgIFxyXG4gICAgc3RhcnQoKXtcclxuICAgICAgICB0aGlzLl9vcmFPYmplY3Quc3RhcnQoKTtcclxuICAgIH07XHJcbiAgICBlbmQoKXtcclxuICAgICAgICB0aGlzLl9vcmFPYmplY3Quc3RvcCgpO1xyXG4gICAgICAgIHRoaXMuX29yYU9iamVjdC5jbGVhcigpO1xyXG4gICAgfVxyXG4gICAgZW5kT2sodGV4dEFyZyl7XHJcbiAgICAgICAgdGhpcy5lbmQoKTtcclxuICAgICAgICBsb2cub2sodGV4dEFyZyk7XHJcbiAgICB9O1xyXG4gICAgZW5kRXJyb3IodGV4dEFyZyl7XHJcbiAgICAgICAgdGhpcy5lbmQoKTtcclxuICAgICAgICBsb2cuZXJyb3IodGV4dEFyZyk7XHJcbiAgICB9O1xyXG4gICAgc3RvcCgpeyAvLyBhbGlhcyBmb3IgZW5kXHJcbiAgICAgICAgdGhpcy5lbmQoKTtcclxuICAgIH1cclxuICAgIFxyXG4gICAgLy8gbG9nIG1ldGhvZHMgdGhhdCBwbGF5IG5pY2Ugd2l0aCBvcmFcclxuICAgIGxvZyhsb2dUZXh0OnN0cmluZyxsb2dUeXBlOnN0cmluZyl7XHJcbiAgICAgICAgdGhpcy5zdG9wKCk7XHJcbiAgICAgICAgbG9nLmxvZyhsb2dUZXh0LGxvZ1R5cGUpO1xyXG4gICAgICAgIHRoaXMuc3RhcnQoKTtcclxuICAgIH1cclxufSJdfQ== diff --git a/dist/beautylog.plugins.d.ts b/dist/beautylog.plugins.d.ts index c0bf002..c1829db 100644 --- a/dist/beautylog.plugins.d.ts +++ b/dist/beautylog.plugins.d.ts @@ -1,2 +1,8 @@ -declare var plugins: any; -export = plugins; +export declare let lodash: any; +export declare let smartenv: any; +export declare let q: any; +export declare let cliTable: any; +export declare let colors: any; +export declare let clc: any; +export declare let figlet: any; +export declare let ora: any; diff --git a/dist/beautylog.plugins.js b/dist/beautylog.plugins.js index 44fdf2d..10a3b56 100644 --- a/dist/beautylog.plugins.js +++ b/dist/beautylog.plugins.js @@ -1,19 +1,12 @@ /// "use strict"; -var plugins = { - lodash: require("lodash"), - smartenv: require("smartenv"), - q: require("q") -}; -if (plugins.smartenv.getEnv().isNode) { - plugins = plugins.lodash.assign(plugins, { - cliTable: require("cli-table2"), - colors: require("colors"), - clc: require("cli-color"), - figlet: require("figlet"), - ora: require("ora") - }); -} -module.exports = plugins; +exports.lodash = require("lodash"); +exports.smartenv = require("smartenv"); +exports.q = require("q"); +exports.cliTable = require("cli-table2"); +exports.colors = require("colors"); +exports.clc = require("cli-color"); +exports.figlet = require("figlet"); +exports.ora = require("ora"); -//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImJlYXV0eWxvZy5wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDRDQUE0Qzs7QUFFNUMsSUFBSSxPQUFPLEdBQU87SUFDZCxNQUFNLEVBQUUsT0FBTyxDQUFDLFFBQVEsQ0FBQztJQUN6QixRQUFRLEVBQUUsT0FBTyxDQUFDLFVBQVUsQ0FBQztJQUM3QixDQUFDLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQztDQUNsQixDQUFDO0FBQ0YsRUFBRSxDQUFDLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxNQUFNLENBQUMsQ0FBQSxDQUFDO0lBQ2xDLE9BQU8sR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxPQUFPLEVBQUM7UUFDcEMsUUFBUSxFQUFHLE9BQU8sQ0FBQyxZQUFZLENBQUM7UUFDaEMsTUFBTSxFQUFFLE9BQU8sQ0FBQyxRQUFRLENBQUM7UUFDekIsR0FBRyxFQUFFLE9BQU8sQ0FBQyxXQUFXLENBQUM7UUFDekIsTUFBTSxFQUFFLE9BQU8sQ0FBQyxRQUFRLENBQUM7UUFDekIsR0FBRyxFQUFFLE9BQU8sQ0FBQyxLQUFLLENBQUM7S0FDdEIsQ0FBQyxDQUFDO0FBQ1AsQ0FBQztBQUNELGlCQUFTLE9BQU8sQ0FBQyIsImZpbGUiOiJiZWF1dHlsb2cucGx1Z2lucy5qcyIsInNvdXJjZXNDb250ZW50IjpbIi8vLyA8cmVmZXJlbmNlIHBhdGg9XCIuL3R5cGluZ3MvbWFpbi5kLnRzXCIgLz5cclxuXHJcbnZhciBwbHVnaW5zOmFueSA9IHtcclxuICAgIGxvZGFzaDogcmVxdWlyZShcImxvZGFzaFwiKSxcclxuICAgIHNtYXJ0ZW52OiByZXF1aXJlKFwic21hcnRlbnZcIiksXHJcbiAgICBxOiByZXF1aXJlKFwicVwiKVxyXG59O1xyXG5pZiAocGx1Z2lucy5zbWFydGVudi5nZXRFbnYoKS5pc05vZGUpe1xyXG4gICAgcGx1Z2lucyA9IHBsdWdpbnMubG9kYXNoLmFzc2lnbihwbHVnaW5zLHtcclxuICAgICAgICBjbGlUYWJsZTogIHJlcXVpcmUoXCJjbGktdGFibGUyXCIpLFxyXG4gICAgICAgIGNvbG9yczogcmVxdWlyZShcImNvbG9yc1wiKSxcclxuICAgICAgICBjbGM6IHJlcXVpcmUoXCJjbGktY29sb3JcIiksXHJcbiAgICAgICAgZmlnbGV0OiByZXF1aXJlKFwiZmlnbGV0XCIpLFxyXG4gICAgICAgIG9yYTogcmVxdWlyZShcIm9yYVwiKVxyXG4gICAgfSk7XHJcbn1cclxuZXhwb3J0ID0gcGx1Z2luczsiXX0= +//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImJlYXV0eWxvZy5wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDRDQUE0Qzs7QUFFakMsY0FBTSxHQUFHLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQztBQUMzQixnQkFBUSxHQUFHLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FBQztBQUMvQixTQUFDLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFBO0FBQ2hCLGdCQUFRLEdBQUcsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQUFDO0FBQ2pDLGNBQU0sR0FBRyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUM7QUFDM0IsV0FBRyxHQUFHLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQztBQUMzQixjQUFNLEdBQUcsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0FBQzNCLFdBQUcsR0FBRyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUMiLCJmaWxlIjoiYmVhdXR5bG9nLnBsdWdpbnMuanMiLCJzb3VyY2VzQ29udGVudCI6WyIvLy8gPHJlZmVyZW5jZSBwYXRoPVwiLi90eXBpbmdzL21haW4uZC50c1wiIC8+XHJcblxyXG5leHBvcnQgbGV0IGxvZGFzaCA9IHJlcXVpcmUoXCJsb2Rhc2hcIik7XHJcbmV4cG9ydCBsZXQgc21hcnRlbnYgPSByZXF1aXJlKFwic21hcnRlbnZcIik7XHJcbmV4cG9ydCBsZXQgcSA9IHJlcXVpcmUoXCJxXCIpXHJcbmV4cG9ydCBsZXQgY2xpVGFibGUgPSByZXF1aXJlKFwiY2xpLXRhYmxlMlwiKTtcclxuZXhwb3J0IGxldCBjb2xvcnMgPSByZXF1aXJlKFwiY29sb3JzXCIpO1xyXG5leHBvcnQgbGV0IGNsYyA9IHJlcXVpcmUoXCJjbGktY29sb3JcIik7XHJcbmV4cG9ydCBsZXQgZmlnbGV0ID0gcmVxdWlyZShcImZpZ2xldFwiKTtcclxuZXhwb3J0IGxldCBvcmEgPSByZXF1aXJlKFwib3JhXCIpO1xyXG4iXX0= diff --git a/dist/index.d.ts b/dist/index.d.ts index 7d0c1ea..9d1f082 100644 --- a/dist/index.d.ts +++ b/dist/index.d.ts @@ -7,7 +7,7 @@ export declare let figletSync: (textArg: string, optionsArg?: any) => boolean; export declare let info: (logText: any) => void; export declare let log: (logText?: string, logType?: string) => void; export declare let ok: (logText: any) => void; -export declare let ora: (textArg: string, colorArg: string) => Ora; +export declare let ora: (textArg: string, colorArg: string, startArg?: boolean) => Ora; export declare let success: (logText: any) => void; export declare let table: (tableTypeArg: string, tableHeadArrayArg?: string[]) => Table; export declare let warn: (logText: any) => void; diff --git a/test/test.js b/test/test.js index 1d144e7..2b42c9d 100644 --- a/test/test.js +++ b/test/test.js @@ -49,9 +49,10 @@ describe("beautylog", function () { describe(".ora(text,color)", function () { it("should display, update, and end a message", function (done) { this.timeout(10000); - var testOra = beautylog.ora("This is a test text", "green"); + var testOra = beautylog.ora("This is a test text", "green", true); setTimeout(function () { testOra.text("updated text!"); + testOra.log("an intermediate log message", "info"); setTimeout(function () { testOra.endOk("Allright, ora works!"); done(); @@ -93,4 +94,4 @@ describe("beautylog", function () { }); }); -//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["test.ts"],"names":[],"mappings":"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","file":"test.js","sourcesContent":["/// <reference path=\"../ts/typings/main.d.ts\" />\r\nimport beautylog = require('../dist/index.js');\r\n\r\ndescribe(\"beautylog\",function(){\r\n    describe(\".log(message,logtype)\",function(){\r\n        it(\"should log cyan text\",function(){\r\n            beautylog.log('beautylog.log(), with normal logText, without logType');\r\n        });\r\n        it(\"should print different log types dependent on logType\",function(){\r\n            beautylog.log('beautylog.log(), with normal logText, without logType');\r\n            beautylog.log('beautylog.log(), with normal logText, with logType \"dir\"','dir');\r\n            beautylog.log('beautylog.log(), with normal logText, with logType \"error\"','error');\r\n            beautylog.log('beautylog.log(), with normal logText, with logType \"info\"','info');\r\n            beautylog.log('beautylog.log(), with normal logText, with logType \"ok\"','ok');\r\n            beautylog.log('beautylog.log(), with normal logText, with logType \"success\"','success');\r\n            beautylog.log('beautylog.log(), with normal logText, with logType \"warn\"','warn');\r\n        });\r\n    });\r\n    describe(\".dir(message)\",function(){\r\n        it(\"should print a blue Dir message\",function(){\r\n            beautylog.dir('beautylog.dir(), with normal logText, without logType');\r\n        })\r\n    })\r\n    describe(\".error(message)\",function(){\r\n        it(\"should print a red error message\",function(){\r\n            beautylog.error('beautylog.error(), with normal logText, without logType');\r\n        });\r\n    });\r\n    describe(\".figlet\",function(){\r\n        it(\"should print nice fonts to console in yellow\",function(done){\r\n            beautylog.figlet(\"Async!\",{font:\"Star Wars\",color:\"yellow\"}).then(done);\r\n        })\r\n    });\r\n    describe(\".figletSync\",function(){\r\n        it(\"should print nice fonts to console in yellow\",function(){\r\n            beautylog.figletSync(\"Sync!\",{font:\"Star Wars\",color:\"blue\"});\r\n        })\r\n    });\r\n    describe(\".info(message)\",function(){\r\n        it(\"should display a purple info message\",function(){\r\n            beautylog.info('beautylog.dir(), with normal logText, without logType');\r\n        });\r\n    });\r\n    describe(\".ok(message)\",function(){\r\n        it(\"should display a green ok message\",function(){\r\n            beautylog.ok('beautylog.ok(), with normal logText, without logType');\r\n        });\r\n    });\r\n    describe(\".ora(text,color)\",function(){\r\n        it(\"should display, update, and end a message\",function(done){\r\n            this.timeout(10000);\r\n            let testOra = beautylog.ora(\"This is a test text\",\"green\");\r\n            setTimeout(function(){\r\n                testOra.text(\"updated text!\");\r\n                setTimeout(function(){\r\n                    testOra.endOk(\"Allright, ora works!\");\r\n                    done();\r\n                },2000);\r\n            },2000)\r\n        });\r\n        it(\"should display an error message when ended with error\",function(done){\r\n            this.timeout(10000);\r\n            let testOra = beautylog.ora(\"This is another test text\",\"green\");\r\n            setTimeout(function(){\r\n                testOra.endError(\"Allright, ora displays an error!\");\r\n                done();\r\n            },2000)\r\n        });\r\n    });\r\n    describe(\".success(message)\",function(){\r\n        it(\"should display an orange warn message\",function(){\r\n            beautylog.success('beautylog.success(), with normal logText, without logType');\r\n        })\r\n    });\r\n    describe(\".warn\",function(){\r\n        it(\"should display a orange warn message\",function(){\r\n            beautylog.warn('beautylog.warn(), with normal logText, without logType');\r\n        });\r\n    });\r\n    describe(\".table\",function(){\r\n        it(\"should print a nice table\",function(){\r\n            (function(){\r\n                var testTable1 = beautylog.table(\"checks\");\r\n                testTable1.push(['check1','success']);\r\n                testTable1.push(['check2','error']);\r\n                testTable1.push(['check3','error']);\r\n                testTable1.print();\r\n\r\n                var testTable2 = beautylog.table(\"custom\",[\"Column1\".red,\"Column2\".blue,\"Column3\".cyan]);\r\n                testTable2.push([\"Hey\",\"this\",\"works\"]);\r\n                testTable2.print();\r\n            })();\r\n        });\r\n    });\r\n});\r\n\r\n\r\n"]} +//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["test.ts"],"names":[],"mappings":"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","file":"test.js","sourcesContent":["/// <reference path=\"../ts/typings/main.d.ts\" />\r\nimport beautylog = require('../dist/index.js');\r\n\r\ndescribe(\"beautylog\",function(){\r\n    describe(\".log(message,logtype)\",function(){\r\n        it(\"should log cyan text\",function(){\r\n            beautylog.log('beautylog.log(), with normal logText, without logType');\r\n        });\r\n        it(\"should print different log types dependent on logType\",function(){\r\n            beautylog.log('beautylog.log(), with normal logText, without logType');\r\n            beautylog.log('beautylog.log(), with normal logText, with logType \"dir\"','dir');\r\n            beautylog.log('beautylog.log(), with normal logText, with logType \"error\"','error');\r\n            beautylog.log('beautylog.log(), with normal logText, with logType \"info\"','info');\r\n            beautylog.log('beautylog.log(), with normal logText, with logType \"ok\"','ok');\r\n            beautylog.log('beautylog.log(), with normal logText, with logType \"success\"','success');\r\n            beautylog.log('beautylog.log(), with normal logText, with logType \"warn\"','warn');\r\n        });\r\n    });\r\n    describe(\".dir(message)\",function(){\r\n        it(\"should print a blue Dir message\",function(){\r\n            beautylog.dir('beautylog.dir(), with normal logText, without logType');\r\n        })\r\n    })\r\n    describe(\".error(message)\",function(){\r\n        it(\"should print a red error message\",function(){\r\n            beautylog.error('beautylog.error(), with normal logText, without logType');\r\n        });\r\n    });\r\n    describe(\".figlet\",function(){\r\n        it(\"should print nice fonts to console in yellow\",function(done){\r\n            beautylog.figlet(\"Async!\",{font:\"Star Wars\",color:\"yellow\"}).then(done);\r\n        })\r\n    });\r\n    describe(\".figletSync\",function(){\r\n        it(\"should print nice fonts to console in yellow\",function(){\r\n            beautylog.figletSync(\"Sync!\",{font:\"Star Wars\",color:\"blue\"});\r\n        })\r\n    });\r\n    describe(\".info(message)\",function(){\r\n        it(\"should display a purple info message\",function(){\r\n            beautylog.info('beautylog.dir(), with normal logText, without logType');\r\n        });\r\n    });\r\n    describe(\".ok(message)\",function(){\r\n        it(\"should display a green ok message\",function(){\r\n            beautylog.ok('beautylog.ok(), with normal logText, without logType');\r\n        });\r\n    });\r\n    describe(\".ora(text,color)\",function(){\r\n        it(\"should display, update, and end a message\",function(done){\r\n            this.timeout(10000);\r\n            let testOra = beautylog.ora(\"This is a test text\",\"green\",true);\r\n            setTimeout(function(){\r\n                testOra.text(\"updated text!\");\r\n                testOra.log(\"an intermediate log message\",\"info\");\r\n                \r\n                setTimeout(function(){\r\n                    testOra.endOk(\"Allright, ora works!\");\r\n                    done();\r\n                },2000);\r\n            },2000)\r\n        });\r\n        it(\"should display an error message when ended with error\",function(done){\r\n            this.timeout(10000);\r\n            let testOra = beautylog.ora(\"This is another test text\",\"green\");\r\n            setTimeout(function(){\r\n                testOra.endError(\"Allright, ora displays an error!\");\r\n                done();\r\n            },2000)\r\n        });\r\n    });\r\n    describe(\".success(message)\",function(){\r\n        it(\"should display an orange warn message\",function(){\r\n            beautylog.success('beautylog.success(), with normal logText, without logType');\r\n        })\r\n    });\r\n    describe(\".warn\",function(){\r\n        it(\"should display a orange warn message\",function(){\r\n            beautylog.warn('beautylog.warn(), with normal logText, without logType');\r\n        });\r\n    });\r\n    describe(\".table\",function(){\r\n        it(\"should print a nice table\",function(){\r\n            (function(){\r\n                var testTable1 = beautylog.table(\"checks\");\r\n                testTable1.push(['check1','success']);\r\n                testTable1.push(['check2','error']);\r\n                testTable1.push(['check3','error']);\r\n                testTable1.print();\r\n\r\n                var testTable2 = beautylog.table(\"custom\",[\"Column1\".red,\"Column2\".blue,\"Column3\".cyan]);\r\n                testTable2.push([\"Hey\",\"this\",\"works\"]);\r\n                testTable2.print();\r\n            })();\r\n        });\r\n    });\r\n});\r\n\r\n\r\n"]} diff --git a/test/test.ts b/test/test.ts index 73f6f3d..0a98146 100644 --- a/test/test.ts +++ b/test/test.ts @@ -49,9 +49,10 @@ describe("beautylog",function(){ describe(".ora(text,color)",function(){ it("should display, update, and end a message",function(done){ this.timeout(10000); - let testOra = beautylog.ora("This is a test text","green"); + let testOra = beautylog.ora("This is a test text","green",true); setTimeout(function(){ testOra.text("updated text!"); + testOra.log("an intermediate log message","info"); setTimeout(function(){ testOra.endOk("Allright, ora works!"); done(); diff --git a/ts/beautylog.classes.ora.ts b/ts/beautylog.classes.ora.ts index 5099043..79b5f9d 100644 --- a/ts/beautylog.classes.ora.ts +++ b/ts/beautylog.classes.ora.ts @@ -5,17 +5,22 @@ import * as log from "./beautylog.log"; export class Ora { private _oraObject; state:string; - constructor(textArg:string,colorArg:string){ + constructor(textArg:string,colorArg:string,startArg:boolean = false){ this._oraObject = plugins.ora({ spinner:"dots", text:textArg, color:colorArg }); - this._oraObject.start(); + + startArg ? this._oraObject.start() : void(0); } text(textArg){ this._oraObject.text = textArg; }; + + start(){ + this._oraObject.start(); + }; end(){ this._oraObject.stop(); this._oraObject.clear(); @@ -28,4 +33,14 @@ export class Ora { this.end(); log.error(textArg); }; + stop(){ // alias for end + this.end(); + } + + // log methods that play nice with ora + log(logText:string,logType:string){ + this.stop(); + log.log(logText,logType); + this.start(); + } } \ No newline at end of file diff --git a/ts/beautylog.classes.ts b/ts/beautylog.classes.ts index b482e43..f54059b 100644 --- a/ts/beautylog.classes.ts +++ b/ts/beautylog.classes.ts @@ -7,6 +7,6 @@ export let table = function(tableTypeArg:string,tableHeadArrayArg?:string[]){ return new Table(tableTypeArg,tableHeadArrayArg); } -export let ora = function(textArg:string,colorArg:string){ - return new Ora(textArg,colorArg); +export let ora = function(textArg:string,colorArg:string,startArg?:boolean){ + return new Ora(textArg,colorArg,startArg); } \ No newline at end of file diff --git a/ts/beautylog.plugins.ts b/ts/beautylog.plugins.ts index 8e91558..e846bc7 100644 --- a/ts/beautylog.plugins.ts +++ b/ts/beautylog.plugins.ts @@ -1,17 +1,10 @@ /// -var plugins:any = { - lodash: require("lodash"), - smartenv: require("smartenv"), - q: require("q") -}; -if (plugins.smartenv.getEnv().isNode){ - plugins = plugins.lodash.assign(plugins,{ - cliTable: require("cli-table2"), - colors: require("colors"), - clc: require("cli-color"), - figlet: require("figlet"), - ora: require("ora") - }); -} -export = plugins; \ No newline at end of file +export let lodash = require("lodash"); +export let smartenv = require("smartenv"); +export let q = require("q") +export let cliTable = require("cli-table2"); +export let colors = require("colors"); +export let clc = require("cli-color"); +export let figlet = require("figlet"); +export let ora = require("ora");