From 1f924d290dadb41640953fdb2c2c05ed74909aa0 Mon Sep 17 00:00:00 2001 From: oleg Date: Sat, 13 Jun 2015 22:25:18 +0300 Subject: [PATCH] remove project entity, it is just config now --- app.js | 5 +---- lib/distributor.js | 6 ++---- lib/project.js | 9 +++------ resources/projects.js | 2 +- test/distributor.js | 4 +--- 5 files changed, 8 insertions(+), 18 deletions(-) diff --git a/app.js b/app.js index 5ce240d..bfc125c 100644 --- a/app.js +++ b/app.js @@ -77,10 +77,7 @@ Steppy( }, function(err, projects) { app.projects = projects; - console.log( - 'Loaded projects: ', - _(projects).chain().pluck('config').pluck('name').value() - ); + console.log('Loaded projects: ', _(projects).pluck('name')); // init resources require('./resources')(app); diff --git a/lib/distributor.js b/lib/distributor.js index 81d1eaa..10a2012 100644 --- a/lib/distributor.js +++ b/lib/distributor.js @@ -21,9 +21,7 @@ function Distributor(params) { callback(null, build); }; - self.projectsHash = _(params.projects).indexBy(function(project) { - return project.config.name; - }); + self.projectsHash = _(params.projects).indexBy('name'); } inherits(Distributor, EventEmitter); @@ -165,7 +163,7 @@ Distributor.prototype.run = function(params, callback) { project; Steppy( function() { - project = self.projectsHash[params.projectName].config; + project = self.projectsHash[params.projectName]; self._updateBuild({}, { project: project, params: params.params, diff --git a/lib/project.js b/lib/project.js index 417b3d3..897f233 100644 --- a/lib/project.js +++ b/lib/project.js @@ -7,9 +7,6 @@ var Steppy = require('twostep').Steppy, reader = require('./reader'), utils = require('./utils'); -function Project(config) { - this.config = config; -} /** * Validates and returns given `config` to the `callback`(err, config) @@ -19,7 +16,7 @@ exports.validateConfig = function(config, callback) { }; /** - * Loads and returns project instance + * Loads and returns project */ exports.load = function(baseDir, name, callback) { var dir = path.join(baseDir, name); @@ -35,14 +32,14 @@ exports.load = function(baseDir, name, callback) { }, function(err, config) { config.dir = dir; - this.pass(new Project(config)); + this.pass(config); }, callback ); }; /** - * Loads all projects from `baseDir` and returns array of project instances + * Loads all projects from `baseDir` and returns array of projects */ exports.loadAll = function(baseDir, callback) { Steppy( diff --git a/resources/projects.js b/resources/projects.js index d5bd301..fa5598c 100644 --- a/resources/projects.js +++ b/resources/projects.js @@ -104,7 +104,7 @@ module.exports = function(app) { }); resource.use('readAll', function(req, res) { - res.send(_(app.projects).pluck('config')); + res.send(app.projects); }); resource.use('run', function(req, res) { diff --git a/test/distributor.js b/test/distributor.js index 8ded0e9..0d52980 100644 --- a/test/distributor.js +++ b/test/distributor.js @@ -9,9 +9,7 @@ var Distributor = require('../lib/distributor').Distributor, describe('Distributor', function() { var distributor, - projects = [{ - config: {name: 'project1'} - }]; + projects = [{name: 'project1'}]; var createNodeMock = function(executorRun) { return function(params) {