Refactor dir functions in helper.

Signed-off-by: Eric Wang <skygragon@gmail.com>

Author: skygragon

lib/chalk.js

@@ -47,7 +47,7 @@ chalk.wrap = function(pre, post) {
 
 chalk.init = function() {
   var h = require('./helper');
-  _.each(h.getDirData(['colors']), function(f) {
+  _.each(h.getCodeDirData('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/commands/plugin.js

@@ -65,19 +65,19 @@ cmd.handler = function(argv) {
   if (plugins.length === 0) return log.error('Plugin not found!');
 
   var plugin = plugins[0];
-  var oldname = Plugin.fullpath(plugin.file);
+  var oldname = h.getPluginFile(plugin.file);
   var newname;
 
   if (argv.enable) {
     if (plugin.file[0] !== '.') return;
-    newname = Plugin.fullpath(plugin.file.substr(1));
+    newname = h.getPluginFile(plugin.file.substr(1));
 
     fs.rename(oldname, newname, function(e) {
       if (e) log.error(e.message);
     });
   } else if (argv.disable) {
     if (plugin.file[0] === '.') return;
-    newname = Plugin.fullpath('.' + plugin.file);
+    newname = h.getPluginFile('.' + plugin.file);
 
     fs.rename(oldname, newname, function(e) {
       if (e) log.error(e.message);

lib/core.js

@@ -64,7 +64,7 @@ core.exportProblem = function(problem, opts) {
     input.desc = wrap(desc).split('\n');
   }
 
-  var tplfile = path.resolve(__dirname, '../templates/' + opts.tpl + '.tpl');
+  var tplfile = path.join(h.getCodeDir('templates'), opts.tpl + '.tpl');
   var output = _.template(h.getFileData(tplfile))(input);
 
   if (h.isWindows()) {

lib/helper.js

@@ -150,11 +150,8 @@ h.mkdir = function(fullpath) {
   mkdirp.sync(fullpath);
 };
 
-h.getDirData = function(paths) {
-  paths.unshift('..');
-  paths.unshift(__dirname);
-  var dir = path.join.apply(path, paths);
-
+h.getCodeDirData = function(dir) {
+  dir = h.getCodeDir(dir);
   return _.map(fs.readdirSync(dir), function(file) {
     var fullpath = path.join(dir, file);
     var ext = path.extname(file);
@@ -163,14 +160,8 @@ h.getDirData = function(paths) {
     var data = null;
 
     switch (ext) {
-      case '.js':
-        data = require(fullpath);
-        break;
-      case '.json':
-        data = JSON.parse(h.getFileData(fullpath));
-        break;
-      default:
-        break;
+      case '.js':   data = require(fullpath); break;
+      case '.json': data = JSON.parse(h.getFileData(fullpath)); break;
     }
     return {name: name, data: data, file: file};
   });
@@ -192,6 +183,10 @@ h.getCacheDir = function() {
   return path.join(this.getHomeDir(), '.lc');
 };
 
+h.getCodeDir = function(dir) {
+  return path.join(__dirname, '..', dir || '');
+};
+
 h.getCacheFile = function(k) {
   return path.join(this.getCacheDir(), k + '.json');
 };
@@ -200,6 +195,10 @@ h.getConfigFile = function() {
   return path.join(this.getHomeDir(), '.lcconfig');
 };
 
+h.getPluginFile = function(name) {
+  return path.join(this.getCodeDir('lib/plugins'), path.basename(name));
+};
+
 h.readStdin = function(cb) {
   var stdin = process.stdin;
   var bufs = [];

lib/icon.js

@@ -20,7 +20,7 @@ icons.setTheme = function(name) {
 };
 
 icons.init = function() {
-  _.each(h.getDirData(['icons']), function(f) {
+  _.each(h.getCodeDirData('icons'), function(f) {
     icons.themes[f.name] = f.data;
   });
 };

lib/plugin.js

@@ -38,7 +38,7 @@ Plugin.prototype.install = function(cb) {
   var cmd = 'npm install --save ' + this.deps.join(' ');
   log.debug(cmd);
   var spin = h.spin(cmd);
-  require('child_process').exec(cmd, {cwd: Plugin.root}, function() {
+  require('child_process').exec(cmd, {cwd: h.getCodeDir()}, function() {
     spin.stop();
     return cb();
   });
@@ -49,11 +49,8 @@ Plugin.prototype.help = function() {};
 Plugin.plugins = [];
 
 Plugin.init = function(head) {
-  Plugin.dir = path.resolve(__dirname, 'plugins/');
-  Plugin.root = path.resolve(__dirname, '../');
-
   var plugins = [];
-  h.getDirData(['lib', 'plugins']).forEach(function(f) {
+  h.getCodeDirData('lib/plugins').forEach(function(f) {
     var p = f.data;
     if (!p) return;
 
@@ -91,7 +88,7 @@ Plugin.copy = function(src, cb) {
   if (path.extname(src) !== '.js') {
     src = config.sys.urls.plugin.replace('$name', src);
   }
-  var dst = Plugin.fullpath(src);
+  var dst = h.getPluginFile(src);
 
   var srcstream = src.startsWith('https://') ? request(src) : fs.createReadStream(src);
   srcstream.on('response', function(resp) {
@@ -127,8 +124,4 @@ Plugin.install = function(name, cb) {
   });
 };
 
-Plugin.fullpath = function(file) {
-  return path.join(Plugin.dir, path.basename(file));
-};
-
 module.exports = Plugin;

test/test_helper.js

@@ -1,3 +1,5 @@
+var path = require('path');
+
 var assert = require('chai').assert;
 
 var chalk = require('../lib/chalk');
@@ -169,6 +171,8 @@ describe('helper', function() {
   }); // #langToCommentStyle
 
   describe('#dirAndFiles', function() {
+    var root = path.join(__dirname, '..');
+
     it('should ok', function() {
       process.env.HOME = '/home/skygragon';
 
@@ -183,13 +187,27 @@ describe('helper', function() {
       assert.equal(h.getHomeDir(), 'C:\\Users\\skygragon');
     });
 
-    it('should getDirData ok', function() {
-      var files = h.getDirData(['lib', 'plugins']);
+    it('should getCodeDir ok', function() {
+      assert.equal(h.getCodeDir(), root);
+      assert.equal(h.getCodeDir('.'), root);
+      assert.equal(h.getCodeDir('icons'), path.join(root, 'icons'));
+      assert.equal(h.getCodeDir('lib/plugins'), path.join(root, 'lib', 'plugins'));
+    });
+
+    it('should getCodeDirData ok', function() {
+      var files = h.getCodeDirData('lib/plugins');
       assert.equal(files.length, 3);
       assert.equal(files[0].name, 'cache');
       assert.equal(files[1].name, 'leetcode');
       assert.equal(files[2].name, 'retry');
     });
+
+    it('should getPluginFile ok', function() {
+      var expect = path.join(root, 'lib/plugins/cache.js');
+      assert.equal(h.getPluginFile('cache.js'), expect);
+      assert.equal(h.getPluginFile('./cache.js'), expect);
+      assert.equal(h.getPluginFile('https://github.com/skygragon/cache.js'), expect);
+    });
   }); // #dirAndFiles
 
   describe('#getSetCookieValue', function() {

test/test_icon.js

@@ -7,7 +7,7 @@ describe('icon', function() {
   var icon = null;
 
   before(function() {
-    h.getDirData = function() {
+    h.getCodeDirData = function() {
       return [
         {
           name: 'word',

test/test_plugin.js

@@ -20,7 +20,7 @@ describe('plugin', function() {
     retry.init = noop;
     core.init = noop;
 
-    h.getDirData = function() {
+    h.getCodeDirData = function() {
       return [
         {name: 'cache', data: cache},
         {name: 'leetcode', data: leetcode},