Permalink
Browse files

Merge pull request #3 from frst/master

Load config files after loading the deploy.coffee file in roco
  • Loading branch information...
2 parents 1b630b3 + 951b3d0 commit 6780c7d970f28b2cd670bd57a7489dd766290d77 @1602 committed Nov 30, 2012
Showing with 7 additions and 7 deletions.
  1. +1 −1 bin/roco
  2. +6 −6 lib/rockout.js
View
@@ -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
@@ -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 () {

0 comments on commit 6780c7d

Please sign in to comment.