Refactor config.

* version: only display user related configs.
* version: display available themes.
* show: display available langs in help.

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

Author: skygragon

lib/commands/show.js

@@ -25,7 +25,8 @@ var cmd = {
       alias:    'l',
       type:     'string',
       default:  config.LANG,
-      describe: 'Program language to use'
+      describe: 'Program language to use',
+      choices:  config.LANGS
     },
     extra: {
       alias:    'x',

lib/commands/version.js

@@ -1,5 +1,8 @@
+var _ = require('underscore');
 var sprintf = require('sprintf-js').sprintf;
 
+var chalk = require('../chalk');
+var icon = require('../icon');
 var log = require('../log');
 
 var cmd = {
@@ -51,9 +54,13 @@ cmd.handler = function(argv) {
   prettyLine('Config', h.getConfigFile());
 
   log.info('\n[Configuration]');
-  Object.getOwnPropertyNames(config).sort().forEach(function(k) {
-    prettyLine(k, config[k]);
+  _.each(config.getUserConfig(), function(v, k) {
+    prettyLine(k, v);
   });
+
+  log.info('\n[Themes]');
+  prettyLine('Colors', _.keys(chalk.themes));
+  prettyLine('Icons', _.keys(icon.themes));
 };
 
 module.exports = cmd;

lib/config.js

@@ -2,8 +2,8 @@ var _ = require('underscore');
 
 var h = require('./helper');
 
-var DEFAULT_CONFIG = {
-  // usually you don't wanna change those
+// usually you don't wanna change those
+var DEFAULT_SYS_CONFIG = {
   URL_BASE:            'https://leetcode.com',
   URL_LOGIN:           'https://leetcode.com/accounts/login/',
   URL_PROBLEMS:        'https://leetcode.com/api/problems/$category/',
@@ -16,23 +16,53 @@ var DEFAULT_CONFIG = {
   URL_FAVORITES:       'https://leetcode.com/list/api/questions',
   URL_FAVORITE_DELETE: 'https://leetcode.com/list/api/questions/$hash/$id',
 
-  // but you will want change these
-  LANG:        'cpp', // avail: [c,cpp,csharp,golang,java,javascript,python,ruby,swift]
+  LANGS: [
+    'bash',
+    'c',
+    'cpp',
+    'csharp',
+    'golang',
+    'java',
+    'javascript',
+    'mysql',
+    'python',
+    'python3',
+    'ruby',
+    'scala',
+    'swift'
+  ]
+};
+
+// but you will want change these
+var DEFAULT_USER_CONFIG = {
   AUTO_LOGIN:  false,
-  USE_COLOR:   true,
   COLOR_THEME: 'default',
   ICON_THEME:  '',
-  MAX_WORKERS: 10
+  LANG:        'cpp',
+  MAX_WORKERS: 10,
+  USE_COLOR:   true
 };
 
 function Config() {}
 
 Config.prototype.init = function() {
-  _.extendOwn(this, DEFAULT_CONFIG);
-
   // check local config: ~/.lcconfig
   var localConfig = JSON.parse(h.getFileData(h.getConfigFile())) || {};
+  _.extendOwn(this, this.getDefaultConfig());
   _.extendOwn(this, localConfig);
 };
 
+Config.prototype.getDefaultConfig = function() {
+  var cfg = {};
+  _.extendOwn(cfg, DEFAULT_SYS_CONFIG);
+  _.extendOwn(cfg, DEFAULT_USER_CONFIG);
+  return cfg;
+};
+
+Config.prototype.getUserConfig = function() {
+  return _.pick(this, function(v, k) {
+    return k in DEFAULT_USER_CONFIG;
+  });
+};
+
 module.exports = new Config();

test/test_config.js

@@ -13,13 +13,17 @@ describe('config', function() {
     config.__set__('h', h);
     config.init();
 
-    var expect = config.__get__('DEFAULT_CONFIG');
+    var expect = config.getDefaultConfig();
     var actual = _.extendOwn({}, config); // remove 'init' function
     assert.equal(_.isEqual(actual, expect), true);
   });
 
   it('should ok w/ local config', function() {
-    var localConfig = {LANG: 'ruby', USE_COLOR: false, AUTO_LOGIN: false};
+    var localConfig = {
+      AUTO_LOGIN: false,
+      LANG:       'ruby',
+      USE_COLOR:  false
+    };
 
     var h = rewire('../lib/helper');
     h.getFileData = function() {
@@ -30,8 +34,9 @@ describe('config', function() {
     config.__set__('h', h);
     config.init();
 
-    var expect = _.extendOwn(config.__get__('DEFAULT_CONFIG'), localConfig);
+    var expect = config.getDefaultConfig();
     var actual = _.extendOwn({}, config); // remove 'init' function
+    _.extendOwn(expect, localConfig);
     assert.equal(_.isEqual(actual, expect), true);
   });
 });