martin/nci
1
0
Fork 0
mirror of https://gitlab.silvrtree.co.uk/martind2000/nci.git synced 2025-02-11 03:09:16 +00:00
Code Issues Projects Releases Wiki Activity

remove project entity, it is just config now

Browse Source
This commit is contained in:
oleg 2015-06-13 22:25:18 +03:00
parent a704129a16
commit 1f924d290d
5 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app.js
View File

@ -77,10 +77,7 @@ Steppy(
}, },
function(err, projects) { function(err, projects) {
app.projects = projects; app.projects = projects;
console.log( console.log('Loaded projects: ', _(projects).pluck('name'));
'Loaded projects: ',
_(projects).chain().pluck('config').pluck('name').value()
);
// init resources // init resources
require('./resources')(app); require('./resources')(app);

6
lib/distributor.js
View File

@ -21,9 +21,7 @@ function Distributor(params) {
callback(null, build); callback(null, build);
}; };
self.projectsHash = _(params.projects).indexBy(function(project) { self.projectsHash = _(params.projects).indexBy('name');
return project.config.name;
});
} }
inherits(Distributor, EventEmitter); inherits(Distributor, EventEmitter);
@ -165,7 +163,7 @@ Distributor.prototype.run = function(params, callback) {
project; project;
Steppy( Steppy(
function() { function() {
project = self.projectsHash[params.projectName].config; project = self.projectsHash[params.projectName];
self._updateBuild({}, { self._updateBuild({}, {
project: project, project: project,
params: params.params, params: params.params,

9
lib/project.js
View File

@ -7,9 +7,6 @@ var Steppy = require('twostep').Steppy,
reader = require('./reader'), reader = require('./reader'),
utils = require('./utils'); utils = require('./utils');
function Project(config) {
this.config = config;
}
/** /**
* Validates and returns given `config` to the `callback`(err, 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) { exports.load = function(baseDir, name, callback) {
var dir = path.join(baseDir, name); var dir = path.join(baseDir, name);
@ -35,14 +32,14 @@ exports.load = function(baseDir, name, callback) {
}, },
function(err, config) { function(err, config) {
config.dir = dir; config.dir = dir;
this.pass(new Project(config)); this.pass(config);
}, },
callback 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) { exports.loadAll = function(baseDir, callback) {
Steppy( Steppy(

2
resources/projects.js
View File

@ -104,7 +104,7 @@ module.exports = function(app) {
}); });
resource.use('readAll', function(req, res) { resource.use('readAll', function(req, res) {
res.send(_(app.projects).pluck('config')); res.send(app.projects);
}); });
resource.use('run', function(req, res) { resource.use('run', function(req, res) {

4
test/distributor.js
View File

@ -9,9 +9,7 @@ var Distributor = require('../lib/distributor').Distributor,
describe('Distributor', function() { describe('Distributor', function() {
var distributor, var distributor,
projects = [{ projects = [{name: 'project1'}];
config: {name: 'project1'}
}];
var createNodeMock = function(executorRun) { var createNodeMock = function(executorRun) {
return function(params) { return function(params) {