Add base for code search

Refactor search module

Author: SamyPesse

core/cb.search/code.js

@@ -0,0 +1,40 @@
+var os = require("os");
+var path = require("path");
+var _ = require("lodash");
+var Q = require("q");
+var spawn = require('child_process').spawn;
+
+var search = function(root, args) {
+    var d = Q.defer();
+    var results = {};
+
+    var proc = spawn('ack', ['"'+args.query+'"', '--nocolor'], {
+        cwd: root,
+        env: process.env
+    });
+    proc.stdout.on('data', function(data) {
+        data = data.toString();
+
+        _.each(data.toString().split("\n"), function(line) {
+            var parts = line.split(":");
+            if (parts.length < 3) return;
+
+            results[parts[0]] = results[parts[0]] || [];
+            results[parts[0]].push({
+                'line': parts[1],
+                'content': parts[2]
+            });
+        });
+    });
+
+    proc.on('error', function(err) {
+        d.reject(err)
+    });
+    proc.on('exit', function(code) {
+        d.resolve(results)
+    });
+
+    return d.promise;
+};
+
+module.exports = search;

core/cb.search/files.js

@@ -0,0 +1,39 @@
+var _ = require('lodash');
+var glob = require("glob");
+var Q = require('q');
+
+var search = function(root, args) {
+    var d = Q.defer();
+
+    args = _.defaults({}, args || {}, {
+        'start': 0,
+        'limit': 30
+    });
+
+    glob("**/*"+args.query+"*", {
+        'cwd': root,
+        'mark': true
+    }, function (err, files) {
+        if (err) {
+            d.reject(err);
+        } else {
+            var results = _.chain(files)
+            .filter(function(path) {
+                return !(!path.length || path[path.length-1] == "/");
+            })
+            .map(function(path) {
+                return "/"+path;
+            })
+            .value();
+
+            d.resolve({
+                'files': results.slice(args.start, args.start+args.limit),
+                'n': _.size(results)
+            });
+        }
+    });
+
+    return d.promise;
+};
+
+module.exports = search;

core/cb.search/main.js

@@ -1,53 +1,18 @@
-// Requires
 var _ = require('lodash');
-var glob = require("glob");
-var Q = require('q');
 
+var filesSearch = require("./files");
+var codeSearch = require("./code");
 
 function setup(options, imports, register) {
     // Import
     var vfs = imports.vfs;
     var workspace = imports.workspace;
 
-    // Construct
-    var filesSearch = function(args) {
-        var d = Q.defer();
-
-        args = _.defaults({}, args || {}, {
-            'start': 0,
-            'limit': 30
-        });
-
-        glob("**/*"+args.query+"*", {
-            'cwd': workspace.root,
-            'mark': true
-        }, function (err, files) {
-            if (err) {
-                d.reject(err);
-            } else {
-                var results = _.chain(files)
-                .filter(function(path) {
-                    return !(!path.length || path[path.length-1] == "/");
-                })
-                .map(function(path) {
-                    return "/"+path;
-                })
-                .value();
-
-                d.resolve({
-                    'files': results.slice(args.start, args.start+args.limit),
-                    'n': _.size(results)
-                });
-            }
-        });
-
-        return d.promise;
-    };
-
     // Register
     register(null, {
         "search": {
-            files: filesSearch
+            files: _.partial(filesSearch, workspace.root),
+            code: _.partial(codeSearch, workspace.root)
         }
     });
 }