#50 搜索功能增加-S参数

Author: icefox0801

i18n/lang.yml

@@ -228,4 +228,8 @@ NO_MATCHED_RESULTS:
 
 SEARCH_RESULTS:
   en_US: "Search results\n{0}"
-  zh_CN: "搜索结果\n{0}"
+  zh_CN: "搜索结果\n{0}"
+
+ERROR_INVALID_COMPONENT:
+  en_US: "Invalid component: {0}"
+  zh_CN: "无效的组件: {0}"

lib/cli.js

@@ -118,13 +118,14 @@ cli.run = function (env) {
     .command('search <pattern>')
     .alias('s')
     .option('-O, --owner', 'search components by owner')
+    .option('-S, --semantic', 'show semantic component name')
     .description(fecom.i18n('SEARCH_COMPONENTS'))
     .action(function () {
       var search = require('./search');
       var args = [].slice.call(arguments);
       var options = args.pop();
       var pattern = args[0];
-      options = _(options).pick(['owner']).value();
+      options = _(options).pick(['owner', 'semantic']).value();
       // fecom.logger.info('Listing component versions...');
       search(pattern, options);
     });
@@ -187,7 +188,7 @@ cli.run = function (env) {
     .action(function () {
       var update = require('./update');
       var args = [].slice.call(arguments);
-      var options = args.pop();
+      var options = {};
       var semList = args[0];
       options = {};
       // fecom.logger.info(fecom.i18n('INSTALLING_COMPONENTS'));

lib/component/Component.js

@@ -38,6 +38,7 @@ var Component = function (parsed, type, options) {
   this.author = '';
   this.args = parsed.args || '';
   this.script = '';
+  this.main = '';
 
   this.specified = !!parsed.specified;
   this.conflict = !!parsed.conflict;
@@ -82,6 +83,7 @@ Component.prototype = {
       self.version = json.version;
       self.author = json.author;
       self.exclude = json.exclude || [];
+      self.main = json.main || 'index.js';
     }
 
     self.tree = new Tree(model);

lib/remote/gitlab.js

@@ -90,7 +90,7 @@ GitlabRepo.prototype = {
       .then(function (json) {
 
         if (json.version !== latestTag) {
-          return null;
+          throw new Error(fecom.i18n('ERROR_INVALID_COMPONENT', projectName));
         }
 
         return json;

lib/search.js

@@ -14,7 +14,7 @@ module.exports = function (pattern, options) {
   return gitlabRepo.searchComponents(pattern, options.owner)
     .then(function (results) {
       var lines = results.map(function (result) {
-        return fecom.stringify(result) + ': ' + result.description;
+        return (options.semantic ? fecom.stringify(result) : result.name) + ': ' + result.description;
       }).join('\n');
 
       if (!lines) {