Refactor: extract into getDirData()

Signed-off-by: Eric Wang <[email protected]>

Author: skygragon

lib/chalk.js

@@ -46,13 +46,9 @@ chalk.wrap = function(pre, post) {
 };
 
 chalk.init = function() {
-  var fs = require('fs');
-  var path = require('path');
-
-  var dir = path.join(__dirname, '..', 'colors');
-  _.each(fs.readdirSync(dir), function(f) {
-    var theme = JSON.parse(fs.readFileSync(path.join(dir, f)));
-    chalk.themes[path.basename(f, '.json')] = _.mapObject(theme, function(v, k) {
+  var h = require('./helper');
+  _.each(h.getDirData('colors'), function(f) {
+    chalk.themes[f.name] = _.mapObject(f.data, function(v, k) {
       return chalk.use256 ? style.color.ansi256.hex(v) : style.color.ansi.hex(v);
     });
   });

lib/helper.js

@@ -1,6 +1,8 @@
 var fs = require('fs');
 var path = require('path');
 
+var _ = require('underscore');
+
 var h = {};
 
 h.prettyState = function(state) {
@@ -100,8 +102,18 @@ h.langToCommentStyle = function(lang) {
   }
 };
 
-h.getFileData = function(path) {
-  return fs.existsSync(path) ? fs.readFileSync(path).toString() : null;
+h.getFileData = function(p) {
+  return fs.existsSync(p) ? fs.readFileSync(p).toString() : null;
+};
+
+h.getDirData = function(p) {
+  var dir = path.join(__dirname, '..', p);
+  return _.map(fs.readdirSync(dir), function(f) {
+    return {
+      name: path.basename(f, '.json'),
+      data: JSON.parse(fs.readFileSync(path.join(dir, f)))
+    };
+  });
 };
 
 h.getFilename = function(fullpath) {