Merged branch addprocesses into master

src/cli/helpers/abe-plugins.js

@@ -51,6 +51,18 @@ class Plugins {
           plugin.templates = null
         }
 
+        // has process
+        var plugProcess = path.join(plugin.path, 'process')
+        if(folderUtils.isFolder(plugProcess)) {
+          plugin.process = {}
+          var processFiles = FileParser.getFiles(plugProcess, true, 0)
+          Array.prototype.forEach.call(processFiles, (processFile) => {
+            plugin.process[processFile.cleanNameNoExt] = processFile.path
+          })
+        }else {
+          plugin.process = null
+        }
+
         // has routes
         var plugRoutes = path.join(plugin.path, 'routes')
         if(folderUtils.isFolder(plugRoutes)) {
@@ -87,6 +99,20 @@ class Plugins {
     return this[singleton]
   }
 
+  getProcess(fn) {
+    var proc = null
+    if(typeof this._plugins !== 'undefined' && this._plugins !== null) {
+      Array.prototype.forEach.call(this._plugins, (plugin) => {
+        if(typeof plugin.process !== 'undefined' && plugin.process !== null
+          && typeof plugin.process[fn] !== 'undefined' && plugin.process[fn] !== null) {
+          proc = plugin.process[fn]
+        }
+      })
+    }
+
+    return proc
+  }
+
   hooks() {
     if(arguments.length > 0) {
       var args = [].slice.call(arguments)

src/cli/helpers/abe-process.js

@@ -1,7 +1,9 @@
 import process from 'child_process'
+import fse from 'fs-extra'
 
 import {
   config
+  ,Plugins
 } from '../'
 
 function prepend(value, array) {
@@ -10,9 +12,27 @@ function prepend(value, array) {
   return newArray
 }
 
-var abeProcess = function(name, args) {
+var abeProcess = function(name, args = []) {
   args = prepend(`ABE_WEBSITE=${config.root}`, args)
-  var publishAll = process.fork(`${__dirname}/../../cli/process/${name}.js`, args)
+  args = prepend(`ABEJS_PATH=${__dirname}/../../../dist`, args)
+
+  var file = `${__dirname}/../../cli/process/${name}.js`
+  try {
+		var stats = fse.statSync(file)
+		if (stats.isFile()) {
+			process.fork(file, args)
+		}
+	}catch(err) {
+		try {
+			file = Plugins.instance.getProcess(name)
+			var stats = fse.statSync(file)
+			if (stats.isFile()) {
+				process.fork(file, args)
+			}
+		}catch(err) {
+
+		}
+	}
 }
 
 export default abeProcess

test/fixtures/plugins/test/hooks/hooks.js

@@ -0,0 +1,9 @@
+'use strict';
+
+var hooks = {
+  afterEditorInput: function() {
+    return 'test';
+  }
+};
+
+exports.default = hooks;

test/fixtures/plugins/test/process/test.js

@@ -0,0 +1 @@
+console.log('test')

test/fixtures/plugins/test/routes/get/test.js

@@ -0,0 +1,8 @@
+'use strict';
+
+var route = function route(req, res, next, abe) {
+  res.set('Content-Type', 'text/html');
+  return res.send('test');
+}
+
+exports.default = route

test/plugin.js

@@ -0,0 +1,38 @@
+var chai = require('chai');
+
+var config = require('../src/cli').config
+config.set({root: __dirname + '/fixtures'})
+
+var Hooks = require('../src/cli').Hooks;
+var Plugins = require('../src/cli').Plugins;
+var Manager = require('../src/cli').Manager;
+var fse = require('fs-extra');
+
+describe('Plugin', function() {
+  before( function(done) {
+    Manager.instance.init()
+      .then(function () {
+        this.fixture = {}
+        done()
+
+      }.bind(this))
+  });
+
+  /**
+   * getRoutes
+   * 
+   */
+  it('getRoutes()', function() {
+    var routes = Plugins.instance.getRoutes()
+    chai.expect(routes[0].get).to.have.length(1);
+  });
+
+  /**
+   * Hooks.instance.trigger
+   * 
+   */
+  it('Hooks.instance.trigger', function() {
+    var res = Hooks.instance.trigger('afterEditorInput')
+    chai.assert.equal(res, 'test', 'Hook test failed !')
+  });
+});

test/process.js

@@ -0,0 +1,38 @@
+var chai = require('chai');
+
+var config = require('../src/cli').config
+config.set({root: __dirname + '/fixtures'})
+
+var Manager = require('../src/cli').Manager;
+var Plugins = require('../src/cli').Plugins;
+var abeProcess = require('../src/cli/helpers/abe-process').default
+
+describe('Process', function() {
+  before( function(done) {
+    Manager.instance.init()
+      .then(function () {
+        this.fixture = {}
+        done()
+
+      }.bind(this))
+  });
+
+  /**
+   * getRoutes
+   * 
+   */
+  it('getProcess()', function() {
+    var file = Plugins.instance.getProcess('test')
+    chai.expect(file).to.not.be.null;
+  });
+
+
+  /**
+   * Hooks.instance.trigger
+   * 
+   */
+  it('abeProcess', function() {
+    var res = abeProcess('test', [])
+    // chai.assert.equal(res, 'test', 'Hook test failed !')
+  });
+});