Load config files after loading the deploy.coffee file in roco #3

Merged
merged 2 commits into from Nov 30, 2012
View
2 bin/roco
@@ -6,7 +6,7 @@ var argv = optimist
.describe('T', 'list avaliable tasks with descriptions')
.argv;
-console.log(argv);
+//console.log(argv);
var roco = require('../lib/rockout');
View
12 lib/rockout.js
@@ -116,17 +116,17 @@ Roco.prototype.init = function () {
roco.application = process.env.APP;
}
- configFiles.forEach(function (configFile) {
- if (existsSync(path.resolve(configFile))) {
- roco.load(configFile);
- }
- });
-
fs.readdirSync(cockOutDir).forEach(function (file) {
if (file.match(/\.coffee$/)) {
roco.load(path.resolve(cockOutDir, file));
}
});
+
+ configFiles.forEach(function (configFile) {
+ if (existsSync(path.resolve(configFile))) {
+ roco.load(configFile);
+ }
+ });
};
Roco.prototype.log = function () {