local to base node, add register, create functions

lib/distributor.js

@@ -2,7 +2,7 @@
 
 var	Steppy = require('twostep').Steppy,
 	_ = require('underscore'),
-	Node = require('./node').Node,
+	createNode = require('./node').createNode,
 	EventEmitter = require('events').EventEmitter,
 	inherits = require('util').inherits,
 	logger = require('./logger')('distributor');
@@ -36,8 +36,8 @@ inherits(Distributor, EventEmitter);
 
 exports.Distributor = Distributor;
 
-Distributor.prototype._createNode = function(nodeParams) {
+Distributor.prototype._createNode = function(params) {
-	return new Node(nodeParams);
+	return createNode(params);
 };
 
 Distributor.prototype._runNext = function(callback) {

lib/node/base.js

@@ -1,7 +1,6 @@
 'use strict';
 
-var _ = require('underscore'),
+var _ = require('underscore');
-	createExecutor = require('./executor').createExecutor;
 
 
 function Node(params) {
@@ -76,13 +75,6 @@ Node.prototype.getFreeExecutorsCount = function() {
 	return this.maxExecutorsCount - _(this.executors).size();
 };
 
-Node.prototype._createExecutor = function(project) {
-	return createExecutor({
-		type: this.type,
-		project: project
-	});
-};
-
 Node.prototype.hasScmChanges = function(project, callback) {
 	this._createExecutor(project).hasScmChanges(callback);
 };

lib/node/index.js

@@ -0,0 +1,18 @@
+'use strict';
+
+var constructors = {
+	local: require('./local').Node
+};
+
+exports.register = function(type, constructor) {
+	constructor[type] = constructor;
+};
+
+exports.createNode = function(params) {
+	if (params.type in constructors === false) {
+		throw new Error('Unknown node type: ', params.type);
+	}
+
+	var Constructor = constructors[params.type];
+	return new Constructor(params);
+};

lib/node/local.js

@@ -0,0 +1,20 @@
+'user strict';
+
+var inherits = require('util').inherits,
+	ParentNode = require('./base').Node,
+	LocalExecutor = require('../executor/local').Executor;
+
+function Node(params) {
+	ParentNode.call(this, params);
+}
+
+inherits(Node, ParentNode);
+
+exports.Node = Node;
+
+Node.prototype._createExecutor = function(project) {
+	return new LocalExecutor({
+		type: this.type,
+		project: project
+	});
+};

test/distributor/helpers.js

@@ -2,16 +2,16 @@
 
 var _ = require('underscore'),
 	sinon = require('sinon'),
-	Node = require('../../lib/node').Node,
+	createNode = require('../../lib/node').createNode,
 	EventEmitter = require('events').EventEmitter,
 	ProjectsCollection = require('../../lib/project').ProjectsCollection,
 	Distributor = require('../../lib/distributor').Distributor,
 	Notifier = require('../../lib/notifier').Notifier;
 
 
-var createNode = function(executorRun) {
+var createMockedNode = function(executorRun) {
 	return function(params) {
-		var node = new Node(params);
+		var node = createNode(params);
 		node._createExecutor = function(project) {
 			var executor = new EventEmitter();
 			executor.project = project;
@@ -38,7 +38,7 @@ exports.createDistributor = function(params) {
 			distributorParams.executorRun || sinon.stub().callsArgAsync(1)
 		);
 		// patch method which will be called at constructor
-		sinon.stub(Distributor.prototype, '_createNode', createNode(
+		sinon.stub(Distributor.prototype, '_createNode', createMockedNode(
 			executorRun
 		));
 		delete distributorParams.executorRun;

test/node.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Node = require('../lib/node').Node,
+var createNode = require('../lib/node').createNode,
 	expect = require('expect.js');
 
 
@@ -19,7 +19,7 @@ describe('Node', function() {
 
 	describe('basic', function() {
 		it('instance should be created without errors', function() {
-			node = new Node({
+			node = createNode({
 				type: 'local',
 				maxExecutorsCount: 1
 			});