normal log function now respects an active Ora.

dist/beautylog.classes.ora.d.ts

@@ -1,3 +1,5 @@
+export declare let isOraActive: boolean;
+export declare let activeOra: Ora;
 export declare class Ora {
     private _oraObject;
     state: string;

dist/beautylog.classes.ora.js

@@ -1,7 +1,8 @@
 "use strict";
 /// <reference path="./typings/main.d.ts" />
 var plugins = require("./beautylog.plugins");
-var log = require("./beautylog.log");
+var beautylog_log_helpers_1 = require("./beautylog.log.helpers");
+exports.isOraActive = false; // when an Ora is active (e.g. start()) this is true;
 var Ora = (function () {
     function Ora(textArg, colorArg, startArg) {
         if (startArg === void 0) { startArg = false; }
@@ -21,21 +22,25 @@ var Ora = (function () {
             this._oraObject.text = textArg;
         if (colorArg)
             this._oraObject.color = colorArg;
+        exports.activeOra = this;
+        exports.isOraActive = true;
         this._oraObject.start();
     };
     ;
     Ora.prototype.end = function () {
         this._oraObject.stop();
         this._oraObject.clear();
+        exports.activeOra = undefined;
+        exports.isOraActive = false;
     };
     Ora.prototype.endOk = function (textArg) {
         this.end();
-        log.ok(textArg);
+        beautylog_log_helpers_1.logNode(textArg, "ok");
     };
     ;
     Ora.prototype.endError = function (textArg) {
         this.end();
-        log.error(textArg);
+        beautylog_log_helpers_1.logNode(textArg, "error");
     };
     ;
     Ora.prototype.stop = function () {
@@ -44,11 +49,11 @@ var Ora = (function () {
     // log methods that play nice with ora
     Ora.prototype.log = function (logText, logType) {
         this.stop();
-        log.log(logText, logType);
+        beautylog_log_helpers_1.logNode(logText, logType);
         this.start();
     };
     return Ora;
 }());
 exports.Ora = Ora;
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImJlYXV0eWxvZy5jbGFzc2VzLm9yYS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsNENBQTRDO0FBQzVDLElBQVksT0FBTyxXQUFNLHFCQUFxQixDQUFDLENBQUE7QUFDL0MsSUFBWSxHQUFHLFdBQU0saUJBQWlCLENBQUMsQ0FBQTtBQUV2QztJQUdJLGFBQVksT0FBYyxFQUFDLFFBQWUsRUFBQyxRQUF3QjtRQUF4Qix3QkFBd0IsR0FBeEIsZ0JBQXdCO1FBQy9ELElBQUksQ0FBQyxVQUFVLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQztZQUMxQixPQUFPLEVBQUMsTUFBTTtZQUNkLElBQUksRUFBQyxPQUFPO1lBQ1osS0FBSyxFQUFDLFFBQVE7U0FDakIsQ0FBQyxDQUFDO1FBRUgsUUFBUSxHQUFHLElBQUksQ0FBQyxVQUFVLENBQUMsS0FBSyxFQUFFLEdBQUcsS0FBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ2pELENBQUM7SUFDRCxrQkFBSSxHQUFKLFVBQUssT0FBTztRQUNSLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxHQUFHLE9BQU8sQ0FBQztJQUNuQyxDQUFDOztJQUVELG1CQUFLLEdBQUwsVUFBTSxPQUFlLEVBQUMsUUFBZ0I7UUFDbEMsRUFBRSxDQUFBLENBQUMsT0FBTyxDQUFDO1lBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxJQUFJLEdBQUcsT0FBTyxDQUFDO1FBQzNDLEVBQUUsQ0FBQSxDQUFDLFFBQVEsQ0FBQztZQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsS0FBSyxHQUFHLFFBQVEsQ0FBQztRQUM5QyxJQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQzVCLENBQUM7O0lBQ0QsaUJBQUcsR0FBSDtRQUNJLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxFQUFFLENBQUM7UUFDdkIsSUFBSSxDQUFDLFVBQVUsQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUM1QixDQUFDO0lBQ0QsbUJBQUssR0FBTCxVQUFNLE9BQU87UUFDVCxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUM7UUFDWCxHQUFHLENBQUMsRUFBRSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3BCLENBQUM7O0lBQ0Qsc0JBQVEsR0FBUixVQUFTLE9BQU87UUFDWixJQUFJLENBQUMsR0FBRyxFQUFFLENBQUM7UUFDWCxHQUFHLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3ZCLENBQUM7O0lBQ0Qsa0JBQUksR0FBSjtRQUNJLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQztJQUNmLENBQUM7SUFFRCxzQ0FBc0M7SUFDdEMsaUJBQUcsR0FBSCxVQUFJLE9BQWMsRUFBQyxPQUFjO1FBQzdCLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUNaLEdBQUcsQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ3pCLElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUNqQixDQUFDO0lBQ0wsVUFBQztBQUFELENBM0NBLEFBMkNDLElBQUE7QUEzQ1ksV0FBRyxNQTJDZixDQUFBIiwiZmlsZSI6ImJlYXV0eWxvZy5jbGFzc2VzLm9yYS5qcyIsInNvdXJjZXNDb250ZW50IjpbIi8vLyA8cmVmZXJlbmNlIHBhdGg9XCIuL3R5cGluZ3MvbWFpbi5kLnRzXCIgLz5cclxuaW1wb3J0ICogYXMgcGx1Z2lucyBmcm9tIFwiLi9iZWF1dHlsb2cucGx1Z2luc1wiO1xyXG5pbXBvcnQgKiBhcyBsb2cgZnJvbSBcIi4vYmVhdXR5bG9nLmxvZ1wiO1xyXG5cclxuZXhwb3J0IGNsYXNzIE9yYSB7XHJcbiAgICBwcml2YXRlIF9vcmFPYmplY3Q7XHJcbiAgICBzdGF0ZTpzdHJpbmc7XHJcbiAgICBjb25zdHJ1Y3Rvcih0ZXh0QXJnOnN0cmluZyxjb2xvckFyZzpzdHJpbmcsc3RhcnRBcmc6Ym9vbGVhbiA9IGZhbHNlKXtcclxuICAgICAgICB0aGlzLl9vcmFPYmplY3QgPSBwbHVnaW5zLm9yYSh7XHJcbiAgICAgICAgICAgIHNwaW5uZXI6XCJkb3RzXCIsXHJcbiAgICAgICAgICAgIHRleHQ6dGV4dEFyZyxcclxuICAgICAgICAgICAgY29sb3I6Y29sb3JBcmdcclxuICAgICAgICB9KTtcclxuICAgICAgICBcclxuICAgICAgICBzdGFydEFyZyA/IHRoaXMuX29yYU9iamVjdC5zdGFydCgpIDogdm9pZCgwKTtcclxuICAgIH1cclxuICAgIHRleHQodGV4dEFyZyl7XHJcbiAgICAgICAgdGhpcy5fb3JhT2JqZWN0LnRleHQgPSB0ZXh0QXJnO1xyXG4gICAgfTtcclxuICAgIFxyXG4gICAgc3RhcnQodGV4dEFyZz86c3RyaW5nLGNvbG9yQXJnPzpzdHJpbmcpe1xyXG4gICAgICAgIGlmKHRleHRBcmcpIHRoaXMuX29yYU9iamVjdC50ZXh0ID0gdGV4dEFyZztcclxuICAgICAgICBpZihjb2xvckFyZykgdGhpcy5fb3JhT2JqZWN0LmNvbG9yID0gY29sb3JBcmc7XHJcbiAgICAgICAgdGhpcy5fb3JhT2JqZWN0LnN0YXJ0KCk7XHJcbiAgICB9O1xyXG4gICAgZW5kKCl7XHJcbiAgICAgICAgdGhpcy5fb3JhT2JqZWN0LnN0b3AoKTtcclxuICAgICAgICB0aGlzLl9vcmFPYmplY3QuY2xlYXIoKTtcclxuICAgIH1cclxuICAgIGVuZE9rKHRleHRBcmcpe1xyXG4gICAgICAgIHRoaXMuZW5kKCk7XHJcbiAgICAgICAgbG9nLm9rKHRleHRBcmcpO1xyXG4gICAgfTtcclxuICAgIGVuZEVycm9yKHRleHRBcmcpe1xyXG4gICAgICAgIHRoaXMuZW5kKCk7XHJcbiAgICAgICAgbG9nLmVycm9yKHRleHRBcmcpO1xyXG4gICAgfTtcclxuICAgIHN0b3AoKXsgLy8gYWxpYXMgZm9yIGVuZFxyXG4gICAgICAgIHRoaXMuZW5kKCk7XHJcbiAgICB9XHJcbiAgICBcclxuICAgIC8vIGxvZyBtZXRob2RzIHRoYXQgcGxheSBuaWNlIHdpdGggb3JhXHJcbiAgICBsb2cobG9nVGV4dDpzdHJpbmcsbG9nVHlwZTpzdHJpbmcpe1xyXG4gICAgICAgIHRoaXMuc3RvcCgpO1xyXG4gICAgICAgIGxvZy5sb2cobG9nVGV4dCxsb2dUeXBlKTtcclxuICAgICAgICB0aGlzLnN0YXJ0KCk7XHJcbiAgICB9XHJcbn0iXX0=
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImJlYXV0eWxvZy5jbGFzc2VzLm9yYS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsNENBQTRDO0FBQzVDLElBQVksT0FBTyxXQUFNLHFCQUFxQixDQUFDLENBQUE7QUFDL0Msc0NBQXNCLHlCQUF5QixDQUFDLENBQUE7QUFFckMsbUJBQVcsR0FBVyxLQUFLLENBQUMsQ0FBQyxxREFBcUQ7QUFHN0Y7SUFHSSxhQUFZLE9BQWMsRUFBQyxRQUFlLEVBQUMsUUFBd0I7UUFBeEIsd0JBQXdCLEdBQXhCLGdCQUF3QjtRQUMvRCxJQUFJLENBQUMsVUFBVSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUM7WUFDMUIsT0FBTyxFQUFDLE1BQU07WUFDZCxJQUFJLEVBQUMsT0FBTztZQUNaLEtBQUssRUFBQyxRQUFRO1NBQ2pCLENBQUMsQ0FBQztRQUVILFFBQVEsR0FBRyxJQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssRUFBRSxHQUFHLEtBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNqRCxDQUFDO0lBQ0Qsa0JBQUksR0FBSixVQUFLLE9BQU87UUFDUixJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksR0FBRyxPQUFPLENBQUM7SUFDbkMsQ0FBQzs7SUFFRCxtQkFBSyxHQUFMLFVBQU0sT0FBZSxFQUFDLFFBQWdCO1FBQ2xDLEVBQUUsQ0FBQSxDQUFDLE9BQU8sQ0FBQztZQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxHQUFHLE9BQU8sQ0FBQztRQUMzQyxFQUFFLENBQUEsQ0FBQyxRQUFRLENBQUM7WUFBQyxJQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssR0FBRyxRQUFRLENBQUM7UUFDOUMsaUJBQVMsR0FBRyxJQUFJLENBQUM7UUFDakIsbUJBQVcsR0FBRyxJQUFJLENBQUM7UUFDbkIsSUFBSSxDQUFDLFVBQVUsQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUM1QixDQUFDOztJQUNELGlCQUFHLEdBQUg7UUFDSSxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksRUFBRSxDQUFDO1FBQ3ZCLElBQUksQ0FBQyxVQUFVLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDeEIsaUJBQVMsR0FBRyxTQUFTLENBQUM7UUFDdEIsbUJBQVcsR0FBRyxLQUFLLENBQUM7SUFDeEIsQ0FBQztJQUNELG1CQUFLLEdBQUwsVUFBTSxPQUFPO1FBQ1QsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDO1FBQ1gsK0JBQU8sQ0FBQyxPQUFPLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDMUIsQ0FBQzs7SUFDRCxzQkFBUSxHQUFSLFVBQVMsT0FBTztRQUNaLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQztRQUNYLCtCQUFPLENBQUMsT0FBTyxFQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQzdCLENBQUM7O0lBQ0Qsa0JBQUksR0FBSjtRQUNJLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQztJQUNmLENBQUM7SUFFRCxzQ0FBc0M7SUFDdEMsaUJBQUcsR0FBSCxVQUFJLE9BQWMsRUFBQyxPQUFjO1FBQzdCLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUNaLCtCQUFPLENBQUMsT0FBTyxFQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ3pCLElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUNqQixDQUFDO0lBQ0wsVUFBQztBQUFELENBL0NBLEFBK0NDLElBQUE7QUEvQ1ksV0FBRyxNQStDZixDQUFBIiwiZmlsZSI6ImJlYXV0eWxvZy5jbGFzc2VzLm9yYS5qcyIsInNvdXJjZXNDb250ZW50IjpbIi8vLyA8cmVmZXJlbmNlIHBhdGg9XCIuL3R5cGluZ3MvbWFpbi5kLnRzXCIgLz5cclxuaW1wb3J0ICogYXMgcGx1Z2lucyBmcm9tIFwiLi9iZWF1dHlsb2cucGx1Z2luc1wiO1xyXG5pbXBvcnQge2xvZ05vZGV9IGZyb20gXCIuL2JlYXV0eWxvZy5sb2cuaGVscGVyc1wiO1xyXG5cclxuZXhwb3J0IGxldCBpc09yYUFjdGl2ZTpib29sZWFuID0gZmFsc2U7IC8vIHdoZW4gYW4gT3JhIGlzIGFjdGl2ZSAoZS5nLiBzdGFydCgpKSB0aGlzIGlzIHRydWU7XHJcbmV4cG9ydCBsZXQgYWN0aXZlT3JhOk9yYTsgLy9wb2ludHMgdG8gdGhlIGN1cnJlbnRseSBhY3RpdmUgT3JhIG9iamVjdFxyXG5cclxuZXhwb3J0IGNsYXNzIE9yYSB7XHJcbiAgICBwcml2YXRlIF9vcmFPYmplY3Q7XHJcbiAgICBzdGF0ZTpzdHJpbmc7XHJcbiAgICBjb25zdHJ1Y3Rvcih0ZXh0QXJnOnN0cmluZyxjb2xvckFyZzpzdHJpbmcsc3RhcnRBcmc6Ym9vbGVhbiA9IGZhbHNlKXtcclxuICAgICAgICB0aGlzLl9vcmFPYmplY3QgPSBwbHVnaW5zLm9yYSh7XHJcbiAgICAgICAgICAgIHNwaW5uZXI6XCJkb3RzXCIsXHJcbiAgICAgICAgICAgIHRleHQ6dGV4dEFyZyxcclxuICAgICAgICAgICAgY29sb3I6Y29sb3JBcmdcclxuICAgICAgICB9KTtcclxuICAgICAgICBcclxuICAgICAgICBzdGFydEFyZyA/IHRoaXMuX29yYU9iamVjdC5zdGFydCgpIDogdm9pZCgwKTtcclxuICAgIH1cclxuICAgIHRleHQodGV4dEFyZyl7XHJcbiAgICAgICAgdGhpcy5fb3JhT2JqZWN0LnRleHQgPSB0ZXh0QXJnO1xyXG4gICAgfTtcclxuICAgIFxyXG4gICAgc3RhcnQodGV4dEFyZz86c3RyaW5nLGNvbG9yQXJnPzpzdHJpbmcpe1xyXG4gICAgICAgIGlmKHRleHRBcmcpIHRoaXMuX29yYU9iamVjdC50ZXh0ID0gdGV4dEFyZztcclxuICAgICAgICBpZihjb2xvckFyZykgdGhpcy5fb3JhT2JqZWN0LmNvbG9yID0gY29sb3JBcmc7XHJcbiAgICAgICAgYWN0aXZlT3JhID0gdGhpcztcclxuICAgICAgICBpc09yYUFjdGl2ZSA9IHRydWU7XHJcbiAgICAgICAgdGhpcy5fb3JhT2JqZWN0LnN0YXJ0KCk7XHJcbiAgICB9O1xyXG4gICAgZW5kKCl7XHJcbiAgICAgICAgdGhpcy5fb3JhT2JqZWN0LnN0b3AoKTtcclxuICAgICAgICB0aGlzLl9vcmFPYmplY3QuY2xlYXIoKTtcclxuICAgICAgICBhY3RpdmVPcmEgPSB1bmRlZmluZWQ7XHJcbiAgICAgICAgaXNPcmFBY3RpdmUgPSBmYWxzZTtcclxuICAgIH1cclxuICAgIGVuZE9rKHRleHRBcmcpe1xyXG4gICAgICAgIHRoaXMuZW5kKCk7XHJcbiAgICAgICAgbG9nTm9kZSh0ZXh0QXJnLFwib2tcIik7XHJcbiAgICB9O1xyXG4gICAgZW5kRXJyb3IodGV4dEFyZyl7XHJcbiAgICAgICAgdGhpcy5lbmQoKTtcclxuICAgICAgICBsb2dOb2RlKHRleHRBcmcsXCJlcnJvclwiKTtcclxuICAgIH07XHJcbiAgICBzdG9wKCl7IC8vIGFsaWFzIGZvciBlbmRcclxuICAgICAgICB0aGlzLmVuZCgpO1xyXG4gICAgfVxyXG4gICAgXHJcbiAgICAvLyBsb2cgbWV0aG9kcyB0aGF0IHBsYXkgbmljZSB3aXRoIG9yYVxyXG4gICAgbG9nKGxvZ1RleHQ6c3RyaW5nLGxvZ1R5cGU6c3RyaW5nKXtcclxuICAgICAgICB0aGlzLnN0b3AoKTtcclxuICAgICAgICBsb2dOb2RlKGxvZ1RleHQsbG9nVHlwZSk7XHJcbiAgICAgICAgdGhpcy5zdGFydCgpO1xyXG4gICAgfVxyXG59Il19

dist/beautylog.log.helpers.d.ts

@@ -5,3 +5,4 @@
  * @returns {boolean}
  */
 export declare let log: (logText?: string, logType?: string) => void;
+export declare let logNode: (logText: string, logType: string) => boolean;

test/test.ts

@@ -53,6 +53,7 @@ describe("beautylog",function(){
             setTimeout(function(){
                 testOra.text("updated text!");
                 testOra.log("an intermediate log message","info");
+                beautylog.info("another log message that uses the normal log function");
                 setTimeout(function(){
                     testOra.endOk("Allright, ora works!");
                     done();

ts/beautylog.classes.ora.ts

@@ -1,6 +1,9 @@
 /// <reference path="./typings/main.d.ts" />
 import * as plugins from "./beautylog.plugins";
-import * as log from "./beautylog.log";
+import {logNode} from "./beautylog.log.helpers";
+
+export let isOraActive:boolean = false; // when an Ora is active (e.g. start()) this is true;
+export let activeOra:Ora; //points to the currently active Ora object
 
 export class Ora {
     private _oraObject;
@@ -21,19 +24,23 @@ export class Ora {
     start(textArg?:string,colorArg?:string){
         if(textArg) this._oraObject.text = textArg;
         if(colorArg) this._oraObject.color = colorArg;
+        activeOra = this;
+        isOraActive = true;
         this._oraObject.start();
     };
     end(){
         this._oraObject.stop();
         this._oraObject.clear();
+        activeOra = undefined;
+        isOraActive = false;
     }
     endOk(textArg){
         this.end();
-        log.ok(textArg);
+        logNode(textArg,"ok");
     };
     endError(textArg){
         this.end();
-        log.error(textArg);
+        logNode(textArg,"error");
     };
     stop(){ // alias for end
         this.end();
@@ -42,7 +49,7 @@ export class Ora {
     // log methods that play nice with ora
     log(logText:string,logType:string){
         this.stop();
-        log.log(logText,logType);
+        logNode(logText,logType);
         this.start();
     }
 }

ts/beautylog.log.helpers.ts

@@ -1,6 +1,7 @@
 /// <reference path="./typings/main.d.ts" />
 
 import plugins = require("./beautylog.plugins");
+import {isOraActive,activeOra} from "./beautylog.classes.ora";
 
 var localBl = {
     dirPrefix: plugins.clc.bgXterm(39).xterm(231).bold(' DIR ') + ' ',
@@ -21,7 +22,11 @@ var localBl = {
 export let log = function(logText:string = 'empty log', logType:string = 'normal') {
     switch(plugins.smartenv.getEnv().runtimeEnv) {
     case "node":
+        if (isOraActive){
+            activeOra.log(logText,logType);
+        } else {
             logNode(logText,logType);
+        }
         break;
     case "browser":
         logBrowser(logText,logType);
@@ -32,7 +37,7 @@ export let log = function(logText:string = 'empty log', logType:string = 'normal
 }
 };
 
-let logNode = function(logText:string,logType:string){
+export let logNode = function(logText:string,logType:string){
     try {
         switch (logType) {
             case 'dir':