Merge branch 'develop' of github.com:projmate/projmate-core into develop

projmate · Mar 17, 2013 · 6f32729 · 6f32729
2 parents 6ee3170 + e828d8e
commit 6f32729
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/dist/lib/run/runner.js b/dist/lib/run/runner.js
@@ -93,13 +93,13 @@ Runner = (function() {
             return cb("PM_SILENT");
           }
         }
-        task.log.info("BEGIN dependencies");
+        task.log.info("BEGIN T." + task.name + " deps");
         return that.executeTasks(task.dependencies, function(err) {
           if (err) {
             return cb(err);
           } else {
             if (task.dependencies) {
-              task.log.info("END dependencies");
+              task.log.info("END T." + task.name + " deps");
             }
             return task.execute(cb);
           }

diff --git a/dist/lib/run/task.js b/dist/lib/run/task.js
@@ -98,6 +98,9 @@ Task = (function() {
     for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
       name = _ref1[_i];
       pipeline = config[name];
+      if (!pipeline) {
+        continue;
+      }
       if (Array.isArray(pipeline)) {
         if (load) {
           if (!(pipeline[0] instanceof this.filters.loadFiles)) {

diff --git a/src/lib/run/runner.coffee b/src/lib/run/runner.coffee
@@ -78,13 +78,13 @@ class Runner
             task.log.error "Invalid dependency: #{name}"
             return cb("PM_SILENT")
 
-        task.log.info "BEGIN dependencies"
+        task.log.info "BEGIN T.#{task.name} deps"
 
         that.executeTasks task.dependencies, (err) ->
           if err
             cb err
           else
-            task.log.info("END dependencies") if task.dependencies
+            task.log.info("END T.#{task.name} deps") if task.dependencies
             task.execute cb
       else
         task.execute cb

diff --git a/src/lib/run/task.coffee b/src/lib/run/task.coffee
@@ -93,6 +93,7 @@ class Task
     for name in config.environments
       # The pipeline can either be an array of filters, OR a function.
       pipeline = config[name]
+      continue unless pipeline
 
       if Array.isArray(pipeline)
         # Each pipeline starts by loading files or just the filenames.
@@ -114,6 +115,8 @@ class Task
 
       @pipelines[name] = { pipeline, ran: false }
 
+    # TODO find pipeline via hierarchy
+
 
   # Watch files in `files.watch` or `files.include` and execute this
   # tasks whenever any matching files changes.