+ date format lib from http://blog.stevenlevithan.com/archives/date-t…

…ime-format ; + date format ; version bump to 0.0.3

date.format.js

@@ -0,0 +1,126 @@
+/*
+ * Date Format 1.2.3
+ * (c) 2007-2009 Steven Levithan <stevenlevithan.com>
+ * MIT license
+ *
+ * Includes enhancements by Scott Trenda <scott.trenda.net>
+ * and Kris Kowal <cixar.com/~kris.kowal/>
+ *
+ * Accepts a date, a mask, or a date and a mask.
+ * Returns a formatted version of the given date.
+ * The date defaults to the current date/time.
+ * The mask defaults to dateFormat.masks.default.
+ */
+
+var dateFormat = function () {
+	var	token = /d{1,4}|m{1,4}|yy(?:yy)?|([HhMsTt])\1?|[LloSZ]|"[^"]*"|'[^']*'/g,
+		timezone = /\b(?:[PMCEA][SDP]T|(?:Pacific|Mountain|Central|Eastern|Atlantic) (?:Standard|Daylight|Prevailing) Time|(?:GMT|UTC)(?:[-+]\d{4})?)\b/g,
+		timezoneClip = /[^-+\dA-Z]/g,
+		pad = function (val, len) {
+			val = String(val);
+			len = len || 2;
+			while (val.length < len) val = "0" + val;
+			return val;
+		};
+
+	// Regexes and supporting functions are cached through closure
+	return function (date, mask, utc) {
+		var dF = dateFormat;
+
+		// You can't provide utc if you skip other args (use the "UTC:" mask prefix)
+		if (arguments.length == 1 && Object.prototype.toString.call(date) == "[object String]" && !/\d/.test(date)) {
+			mask = date;
+			date = undefined;
+		}
+
+		// Passing date through Date applies Date.parse, if necessary
+		date = date ? new Date(date) : new Date;
+		if (isNaN(date)) throw SyntaxError("invalid date");
+
+		mask = String(dF.masks[mask] || mask || dF.masks["default"]);
+
+		// Allow setting the utc argument via the mask
+		if (mask.slice(0, 4) == "UTC:") {
+			mask = mask.slice(4);
+			utc = true;
+		}
+
+		var	_ = utc ? "getUTC" : "get",
+			d = date[_ + "Date"](),
+			D = date[_ + "Day"](),
+			m = date[_ + "Month"](),
+			y = date[_ + "FullYear"](),
+			H = date[_ + "Hours"](),
+			M = date[_ + "Minutes"](),
+			s = date[_ + "Seconds"](),
+			L = date[_ + "Milliseconds"](),
+			o = utc ? 0 : date.getTimezoneOffset(),
+			flags = {
+				d:    d,
+				dd:   pad(d),
+				ddd:  dF.i18n.dayNames[D],
+				dddd: dF.i18n.dayNames[D + 7],
+				m:    m + 1,
+				mm:   pad(m + 1),
+				mmm:  dF.i18n.monthNames[m],
+				mmmm: dF.i18n.monthNames[m + 12],
+				yy:   String(y).slice(2),
+				yyyy: y,
+				h:    H % 12 || 12,
+				hh:   pad(H % 12 || 12),
+				H:    H,
+				HH:   pad(H),
+				M:    M,
+				MM:   pad(M),
+				s:    s,
+				ss:   pad(s),
+				l:    pad(L, 3),
+				L:    pad(L > 99 ? Math.round(L / 10) : L),
+				t:    H < 12 ? "a"  : "p",
+				tt:   H < 12 ? "am" : "pm",
+				T:    H < 12 ? "A"  : "P",
+				TT:   H < 12 ? "AM" : "PM",
+				Z:    utc ? "UTC" : (String(date).match(timezone) || [""]).pop().replace(timezoneClip, ""),
+				o:    (o > 0 ? "-" : "+") + pad(Math.floor(Math.abs(o) / 60) * 100 + Math.abs(o) % 60, 4),
+				S:    ["th", "st", "nd", "rd"][d % 10 > 3 ? 0 : (d % 100 - d % 10 != 10) * d % 10]
+			};
+
+		return mask.replace(token, function ($0) {
+			return $0 in flags ? flags[$0] : $0.slice(1, $0.length - 1);
+		});
+	};
+}();
+
+// Some common format strings
+dateFormat.masks = {
+	"default":      "ddd mmm dd yyyy HH:MM:ss",
+	shortDate:      "m/d/yy",
+	mediumDate:     "mmm d, yyyy",
+	longDate:       "mmmm d, yyyy",
+	fullDate:       "dddd, mmmm d, yyyy",
+	shortTime:      "h:MM TT",
+	mediumTime:     "h:MM:ss TT",
+	longTime:       "h:MM:ss TT Z",
+	isoDate:        "yyyy-mm-dd",
+	isoTime:        "HH:MM:ss",
+	isoDateTime:    "yyyy-mm-dd'T'HH:MM:ss",
+	isoUtcDateTime: "UTC:yyyy-mm-dd'T'HH:MM:ss'Z'"
+};
+
+// Internationalization strings
+dateFormat.i18n = {
+	dayNames: [
+		"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat",
+		"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
+	],
+	monthNames: [
+		"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
+		"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"
+	]
+};
+
+// For convenience...
+Date.prototype.format = function (mask, utc) {
+	return dateFormat(this, mask, utc);
+};
+

index.js

@@ -1,18 +1,19 @@
 var colors = require('./colors.js');
 var sys = require('sys');
 
+require('./date.format.js');
+
 var Logger = function (context, contextColor) {
     Logger.padding = Math.max(Logger.padding, context.length);
 
-    this.context = context;
-
     var contextColorCode = contextColor ? colors.bold[contextColor] : colors.bold.white;
 
     this.doPadding = function () {
-        var ct = this.context;
+        var ct = context;
         while (ct.length < Logger.padding) {
             ct = ct.length % 2 ? ct + ' ' : ' ' + ct;
         }
+        context = ct;
         this.context = ct;
     };
 
@@ -30,9 +31,14 @@ var Logger = function (context, contextColor) {
     };
 
     var colorize = function (text, color) { return color + text + colors.reset; };
+    this.header = function () {
+        return block(context, contextColorCode) +
+               block(new Date().format(this.dateFormat), colors[this.timeColor]);
+    };
+    var block = function (text, color) { return '[' + colorize(text, color) + '] '; };
 
     this.rawPrint = function (text) {
-        console.log('[' + colorize(this.context, contextColorCode) + '] ' + text);
+        console.log(this.header() + text);
     };
 
     this.info   = function (text) { return this.log(text, colors.white); };
@@ -42,30 +48,31 @@ var Logger = function (context, contextColor) {
 
     this.buffered = function (id) {
         if (typeof(id) == 'undefined') id = 'buffer';
-        var mama = new Logger(this.context, contextColor);
+        var mama = new Logger(context, contextColor);
         mama.id = id;
         mama.oldRawPrint = mama.rawPrint;
         mama.rawPrint = function (text) {
             var last = Logger.lastUsed;
             if (!this.equals(last)) {
-                sys.print('[' + colorize(this.context, contextColorCode) + '] ' + colorize('|' + id + '|', colors.bold.white) + ' ');
+                sys.print(this.header() + colorize('|' + id + '|', colors.bold.white) + ' ');
             }
             sys.print(text + ' ');
         };
         return mama;
     };
 
     this.equals = function (logger) {
-        return !!logger && this.context == logger.context && (!!this.id == !!logger.id) && (!this.id || this.id == logger.id);
+        return !!logger && context == logger.context && (!!this.id == !!logger.id) && (!this.id || this.id == logger.id);
     };
 
-    this.showDebug = Logger.defaultShowDebug;
+    this.dateFormat = "HH:MM:ss dd.mm";
+    this.showDebug = false;
+    this.appendDateTime = false;
+    this.timeColor = 'cyan';
 };
 
 Logger.padding = 0;
-Logger.defaultShowDebug = true;
 Logger.lastUsed = null;
 
 exports.forContext = function (context, color) { return new Logger(context, color); };
 exports.setPadding = function (padding) { Logger.padding = Math.max(padding, Logger.padding); };
-exports.setDefaultShowDebug = function (show) { Logger.defaultShowDebug = show; };

package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-ccl",
-    "version": "0.0.1",
+    "version": "0.0.3",
 
     "author": "Devgru <git@devg.ru> (http://home.devg.ru)",
     "repository": { "type": "git", "url": "http://github.com/devgru/node-ccl.git" },

test.js

@@ -14,4 +14,6 @@ basic.info('after buffer');
 another.info('test2');
 chain.error('test error');
 
-
+basic.debug('won\'t be shown');
+basic.showDebug = true;
+basic.debug('this must be the only debug line');