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

change exposed reader api

Browse Source
This commit is contained in:
oleg 2016-03-16 22:20:08 +03:00
parent 84c6b8ee05
commit dbd84ea32f
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app.js
View File

@ -8,14 +8,13 @@ var env = process.env.NODE_ENV || 'development',
Steppy = require('twostep').Steppy, Steppy = require('twostep').Steppy,
_ = require('underscore'), _ = require('underscore'),
Reader = require('./lib/reader').Reader, Reader = require('./lib/reader').Reader,
BaseReaderLoader = require('./lib/reader/loader/base').Loader,
JsonReaderLoader = require('./lib/reader/loader/json').Loader,
Notifier = require('./lib/notifier').Notifier, Notifier = require('./lib/notifier').Notifier,
BaseNotifierTransport = require('./lib/notifier/transport/base').Transport, BaseNotifierTransport = require('./lib/notifier/transport/base').Transport,
ConsoleNotifierTransport = require('./lib/notifier/transport/console').Transport, ConsoleNotifierTransport = require('./lib/notifier/transport/console').Transport,
ProjectsCollection = require('./lib/project').ProjectsCollection, ProjectsCollection = require('./lib/project').ProjectsCollection,
BuildsCollection = require('./lib/build').BuildsCollection, BuildsCollection = require('./lib/build').BuildsCollection,
libLogger = require('./lib/logger'), libLogger = require('./lib/logger'),
libReader = require('./lib/reader'),
libNode = require('./lib/node'), libNode = require('./lib/node'),
libCommand = require('./lib/command'), libCommand = require('./lib/command'),
libExecutor = require('./lib/executor'), libExecutor = require('./lib/executor'),
@ -28,7 +27,6 @@ var app = new EventEmitter(),
logger = libLogger('app'); logger = libLogger('app');
app.reader = new Reader(); app.reader = new Reader();
app.reader.register('json', JsonReaderLoader);
var httpServerLogger = libLogger('http server'); var httpServerLogger = libLogger('http server');
@ -65,9 +63,9 @@ app.httpServer.addRequestListener(function(req, res, next) {
}); });
app.lib = {}; app.lib = {};
app.lib.BaseReaderLoader = BaseReaderLoader;
app.lib.BaseNotifierTransport = BaseNotifierTransport; app.lib.BaseNotifierTransport = BaseNotifierTransport;
app.lib.logger = libLogger; app.lib.logger = libLogger;
app.lib.reader = libReader;
app.lib.command = libCommand; app.lib.command = libCommand;
app.lib.executor = libExecutor; app.lib.executor = libExecutor;
app.lib.scm = libScm; app.lib.scm = libScm;

26
lib/reader/index.js
View File

@ -3,22 +3,26 @@
var Steppy = require('twostep').Steppy, var Steppy = require('twostep').Steppy,
_ = require('underscore'), _ = require('underscore'),
fs = require('fs'), fs = require('fs'),
path = require('path'); path = require('path'),
BaseReaderLoader = require('./loader/base').Loader,
JsonReaderLoader = require('./loader/json').Loader;
var constructors = {
json: JsonReaderLoader
};
exports.BaseReaderLoader = BaseReaderLoader;
exports.register = function(ext, constructor) {
constructors[ext] = constructor;
};
function Reader() { function Reader() {
this.constructors = {};
} }
exports.Reader = Reader; exports.Reader = Reader;
Reader.prototype.register = function(ext, constructor) {
this.constructors[ext] = constructor;
};
Reader.prototype.load = function(dir, name, callback) { Reader.prototype.load = function(dir, name, callback) {
var self = this;
Steppy( Steppy(
function() { function() {
fs.readdir(dir, this.slot()); fs.readdir(dir, this.slot());
@ -28,19 +32,19 @@ Reader.prototype.load = function(dir, name, callback) {
var filePath = _(filePaths).find(function(filePath) { var filePath = _(filePaths).find(function(filePath) {
ext = path.extname(filePath).replace(/^\./, ''); ext = path.extname(filePath).replace(/^\./, '');
return ( return (
ext in self.constructors && ext in constructors &&
path.basename(filePath, '.' + ext) === name path.basename(filePath, '.' + ext) === name
); );
}); });
if (filePath) { if (filePath) {
var Constructor = self.constructors[ext], var Constructor = constructors[ext],
reader = new Constructor(); reader = new Constructor();
reader.load(dir, name, this.slot()); reader.load(dir, name, this.slot());
} else { } else {
throw new Error( throw new Error(
'Can`t load "' + name + '" from "' + dir + '" using ' + 'Can`t load "' + name + '" from "' + dir + '" using ' +
'readers: ' + _(self.constructors).keys().join(', ') 'readers: ' + _(constructors).keys().join(', ')
); );
} }
}, },