Merge pull request #41 from achohq/color

Add new colors

examples/index.js

@@ -1,66 +1,63 @@
 'use strict'
 
 require('date-utils')
-var Acho = require('..')
-var setDateout = require('set-dateout')
+const acho = require('..')
+const setDateout = require('set-dateout')
 
-var base = Acho({})
+const base = acho({})
 
-var diff = Acho({
+const diff = acho({
   diff: true
 })
 
-var label = Acho({
+const label = acho({
   align: false,
   keyword: 'worker#1'
 })
 
-var production = Acho({
-  color: false,
-  align: false
+const visit = acho({
+  types: require('acho-skin-cli'),
+  keyword: 'symbol'
 })
 
-var visit = Acho({
-  keyword: 'visit'
+const log = acho({
+  keyword: 'log'
 })
 
-var getStep = (function () {
-  var start = 0
+const getStep = (function () {
+  let start = 0
   return function (value) {
     if (value) start += value
     else ++start
     return start
   }
 })()
 
-var messageTimeout = (function () {
+const messageTimeout = (function () {
   return function (level, message, logger, time) {
     setDateout(function () {
       logger[level](message)
     }, new Date().add({seconds: getStep(0.8)}))
   }
 })()
 
-var lineBreakTimeout = (function () {
+const lineBreakTimeout = (function () {
   return function (time) {
     setDateout(function () {
       console.log()
     }, new Date().add({seconds: getStep(time || 0.2)}))
   }
 })()
 
-messageTimeout('info', 'Hackable', base)
-messageTimeout('debug', 'Logging', base)
-messageTimeout('warn', 'for NodeJS and Browser', base)
+console.log()
+messageTimeout('info', 'The', base)
+messageTimeout('debug', 'Hackable', base)
+messageTimeout('warn', 'Log', base)
 messageTimeout('error', 'in less than', base)
 messageTimeout('fatal', '10KB!.', base)
 
 lineBreakTimeout(1)
 
-messageTimeout('info', 'Do you wanna to know more?', base)
-
-lineBreakTimeout()
-
 messageTimeout('debug', 'support diff', diff)
 messageTimeout('debug', 'between messages', diff)
 
@@ -71,21 +68,10 @@ messageTimeout('warn', 'easily', label)
 
 lineBreakTimeout()
 
-messageTimeout('error', 'automatically color and align disabled', production)
-messageTimeout('error', 'under production scenario', production)
-
-lineBreakTimeout()
-
-messageTimeout('debug', 'and more more more...', base)
-
-lineBreakTimeout()
+messageTimeout('info', 'pretty serialization', log)
 
-messageTimeout('debug', 'string interpolation', base)
-messageTimeout('debug', 'logs align', base)
-messageTimeout('info', 'custom levels and transports', base)
-messageTimeout('info', 'object serialization', base)
-messageTimeout('info', {foo: 'bar', hello: 'world'}, base)
+messageTimeout('info', { foo: 'bar', hello: 'world' }, log)
 
 lineBreakTimeout()
 
-messageTimeout('debug', 'https://github.com/Kikobeats/acho', visit)
+messageTimeout('success', 'See more at https://github.com/Kikobeats/acho', visit)

examples/interpolation.js

@@ -0,0 +1,23 @@
+'use strict'
+
+const acho = require('..')
+const log = acho()
+
+console.log()
+
+log.info('format text', 'hello world')
+log.info('format number interpolation %d', 123)
+log.info('format float interpolation %d', 3.14)
+log.info('format string interpolation %s', 'hello world')
+log.info('format object interpolation %j', {
+  hello: 'world', foo: 'bar'
+})
+
+log.info('format beauty object interpolation %J', {
+  hello: 'world',
+  foo: 'bar',
+  deep: {
+    foo: 'bar',
+    arr: [1, 2, 3, 4, 5]
+  }
+})

examples/levels.js

@@ -1,30 +1,9 @@
 'use strict'
 
-var Acho = require('..')
-var acho = Acho({
-  diff: true,
-  timestamp: 1000,
-  upperCase: true,
-  context: 'generated'
-  // keyword: 'symbol'
-})
-
-var levels = Object.keys(acho.types)
-
-var fixtureObj = {
-  foo: 'bar',
-  hello: 'world'
-}
-
-var fixtureArr = [1, 2, 3, 4, 5]
-
-acho.debug('%j', fixtureObj)
-acho.debug(fixtureObj)
-acho.debug(fixtureArr)
+const acho = require('acho')
 
-levels.forEach(function (level) {
-  setInterval(function () {
-    acho[level]('This is a auto-generated ' + level + ' message')
-    acho[level](fixtureObj)
-  }, 1000)
+const log = acho()
+const types = Object.keys(log.types)
+types.forEach(type => {
+  log[type]('hello world')
 })

examples/skin-cli.js

@@ -0,0 +1,16 @@
+'use strict'
+
+const acho = require('acho')
+const skinCli = require('acho-skin-cli')
+
+const log = acho({
+  types: skinCli,
+  keyword: 'symbol'
+})
+
+console.log()
+
+const types = Object.keys(log.types)
+types.forEach(type => {
+  log[type]('hello world')
+})

examples/skin-syslog.js

@@ -0,0 +1,15 @@
+'use strict'
+
+const acho = require('acho')
+const skinCli = require('acho-skin-syslog')
+
+const log = acho({
+  types: skinCli
+})
+
+console.log()
+
+const types = Object.keys(log.types)
+types.forEach(type => {
+  log[type]('hello world')
+})

examples/trace.js

@@ -0,0 +1,29 @@
+'use strict'
+
+const Acho = require('..')
+const acho = Acho({
+  diff: true,
+  trace: 1000
+  // upperCase: true,
+  // keyword: 'symbol'
+})
+
+const levels = Object.keys(acho.types)
+
+const fixtureObj = {
+  foo: 'bar',
+  hello: 'world'
+}
+
+const fixtureArr = [1, 2, 3, 4, 5]
+
+acho.debug('%j', fixtureObj)
+acho.debug(fixtureObj)
+acho.debug(fixtureArr)
+
+levels.forEach(function (level) {
+  setInterval(function () {
+    acho[level]('This is a auto-generated ' + level + ' message')
+    acho[level](fixtureObj)
+  }, 1000)
+})

examples/uppercase.js

@@ -0,0 +1,9 @@
+'use strict'
+
+const acho = require('acho')
+
+const log = acho({upperCase: true})
+const types = Object.keys(log.types)
+types.forEach(type => {
+  log[type]('hello world')
+})

index.js

@@ -1,3 +1,2 @@
-'use strict'
 require('coffee-script/register')
 module.exports = require('./lib/Acho')

lib/Acho.coffee

@@ -1,19 +1,18 @@
 'use strict'
 
-DEFAULT  = require './Default'
 CONST    = require './Constants'
+DEFAULT  = require './Default'
 
-Acho = (params = {}) ->
-  return new Acho params unless this instanceof Acho
+Acho = (opts = {}) ->
+  return new Acho opts unless this instanceof Acho
 
-  acho = Object.assign({}, DEFAULT, params)
+  acho = Object.assign({}, DEFAULT(), opts)
   acho.diff = [] if acho.diff
-  acho[key] = value for key, value of acho
 
   acho.messages = do ->
     messages = {}
     for type of acho.types
-      messages[type] = params.messages?[type] or []
+      messages[type] = opts.messages?[type] or []
       acho[type] = acho.generateTypeMessage type
     messages
 
@@ -30,11 +29,5 @@ Acho = (params = {}) ->
 
   acho
 
-Acho.skin = (skinFn) ->
-  skin = skinFn(CONST)
-  (params = {}) ->
-    Acho(Object.assign({}, params, skin))
-
-Acho.defaults = DEFAULT
-
 module.exports = Acho
+module.exports.constants = CONST

lib/Constants.coffee

@@ -16,7 +16,7 @@ figure =
 module.exports =
   DECORATE_COUNTER_ZERO_N : 4
   UNMUTED                 : 'all'
-  LINE_COLOR              : 'gray'
+  LINE_COLOR              : ['gray']
   SYMBOL_KEYWORD          : 'symbol'
   MUTED                   : 'muted'
   FIGURE                  : figure[process.platform is 'win32']