renamed run module to director

caolan · Apr 26, 2010 · 9828235 · 9828235
1 parent 01103b9
commit 9828235
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/lib/run.js → lib/director.js b/lib/run.js → lib/director.js
diff --git a/lib/petrify.js b/lib/petrify.js
@@ -1,7 +1,7 @@
 var fs = require('fs'),
     sys = require('sys'),
     path = require('path'),
-    run = require('run'),
+    director = require('director'),
     events = require('events'),
     behaviours = require('behaviours'),
     jsontemplate = require('json-template'),
@@ -86,7 +86,7 @@ exports.runViews = function(opts){
     var tasks = Object.keys(opts.views).reduce(function(a,k){
         var view = opts.views[k];
         emits_pending[k] = 0;
-        a[k] = run.requires(view.requires, function(task){
+        a[k] = director.requires(view.requires, function(task){
             var viewEnv = {
                 emit: function(path, data){
                     emits_pending[k]++;
@@ -140,7 +140,7 @@ exports.runViews = function(opts){
         });
         return a;
     }, {});
-    run.auto(tasks, function(){
+    director.auto(tasks, function(){
         process.nextTick(function(){emitter.emit('finished');});
     });
     return emitter;
@@ -265,7 +265,7 @@ exports.loadTemplates = function(template_dir){
 // builds a site
 exports.run = function(opt){
     var emitter = new events.EventEmitter();
-    run.auto({
+    director.auto({
         templates: function(task){
             emitter.templates = exports.loadTemplates(opt.template_dir);
             emitter.templates.addListener('error', function(err, templates){
@@ -307,7 +307,7 @@ exports.run = function(opt){
                 else task.done();
             });
         },
-        mkdir: run.requires(['removedir'], function(task){
+        mkdir: director.requires(['removedir'], function(task){
             child_process.exec('mkdir ' + opt.output_dir, function(err){
                 if(err) emitter.emit('error', err);
                 task.done();

diff --git a/test/test-run.js → test/test-director.js b/test/test-run.js → test/test-director.js
@@ -1,10 +1,10 @@
-var run = require('run');
+var director = require('director');
 
 
 exports.testRequires = function(test){
     var fn = function(){return 'test';};
     test.same(
-        run.requires(['task1','task2'], fn),
+        director.requires(['task1','task2'], fn),
         {requires: ['task1','task2'], run: fn}
     );
     test.done();
@@ -13,7 +13,7 @@ exports.testRequires = function(test){
 exports.testAuto = function(test){
     var callOrder = [];
     var testdata = [{test: 'test'}];
-    run.auto({
+    director.auto({
         task1: {
             requires: ['task2'],
             run: function(task){

diff --git a/test/test-petrify.js b/test/test-petrify.js
@@ -602,6 +602,7 @@ exports.testRunErrors = function(test){
         var emitter = new events.EventEmitter();
         process.nextTick(function(){
             emitter.emit('error', 'runViews_error', 'view');
+            emitter.emit('finished');
         });
         return emitter;
     };