From 2f0c87ceac486b1f40f0b474838a536cfe568051 Mon Sep 17 00:00:00 2001
From: oleg <oleg.korobenko@gmail.com>
Date: Tue, 28 Jul 2015 23:40:26 +0300
Subject: [PATCH] move avg build calculation from lib distributor - fix tests

---
 distributor.js     | 12 ++++++++++++
 lib/distributor.js | 12 +++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/distributor.js b/distributor.js
index 33561bc..d011367 100644
--- a/distributor.js
+++ b/distributor.js
@@ -3,6 +3,9 @@
 var Steppy = require('twostep').Steppy,
 	_ = require('underscore'),
 	Distributor = require('./lib/distributor').Distributor,
+	getAvgProjectBuildDuration = (
+		require('./lib/project').getAvgProjectBuildDuration
+	),
 	db = require('./db'),
 	path = require('path'),
 	fs = require('fs'),
@@ -16,6 +19,15 @@ exports.init = function(app, callback) {
 		saveBuild: function(build, callback) {
 			Steppy(
 				function() {
+					if (!_(build.project).has('avgBuildDuration')) {
+						getAvgProjectBuildDuration(build.project.name, this.slot());
+					} else {
+						this.pass(build.project.avgBuildDuration);
+					}
+				},
+				function(err, avgBuildDuration) {
+					build.project.avgBuildDuration = avgBuildDuration;
+
 					db.builds.put(build, this.slot());
 				},
 				function() {
diff --git a/lib/distributor.js b/lib/distributor.js
index 3ce3dcb..d15d925 100644
--- a/lib/distributor.js
+++ b/lib/distributor.js
@@ -3,7 +3,6 @@
 var	Steppy = require('twostep').Steppy,
 	_ = require('underscore'),
 	Node = require('./node').Node,
-	getAvgProjectBuildDuration = require('./project').getAvgProjectBuildDuration,
 	EventEmitter = require('events').EventEmitter,
 	inherits = require('util').inherits,
 	notifier = require('./notifier'),
@@ -220,17 +219,18 @@ Distributor.prototype.run = function(params, callback) {
 	};
 	Steppy(
 		function() {
-			project = _(self.projects).findWhere({name: params.projectName});
+			project = _(self.projects).chain()
+				.findWhere({name: params.projectName})
+				.clone()
+				.value();
 
 			if (params.withScmChangesOnly) {
 				self.nodes[0].hasScmChanges(project, this.slot());
 			} else {
 				this.pass(null);
 			}
-
-			getAvgProjectBuildDuration(params.projectName, this.slot());
 		},
-		function(err, hasScmChanges, avgProjectBuildDuration) {
+		function(err, hasScmChanges) {
 			if (params.withScmChangesOnly && !hasScmChanges) {
 				logger.log(
 					'Building of "%s" skipped coz no scm changes',
@@ -239,8 +239,6 @@ Distributor.prototype.run = function(params, callback) {
 				return callback();
 			}
 
-			project.avgBuildDuration = avgProjectBuildDuration;
-
 			self._updateBuild({}, {
 				project: project,
 				initiator: params.initiator,