fix Transport#waitFor()

pstadler · Nov 11, 2014 · 7e529a6 · 7e529a6
1 parent 97bff09
commit 7e529a6
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/lib/flight.js b/lib/flight.js
@@ -41,7 +41,7 @@ Flight.prototype = {
     var future = new Future();
 
     var task = function() {
-      new Fiber(function() {
+      Fiber(function() {
         var t = process.hrtime();
 
         var transport = new this.transportClass(this);

diff --git a/lib/flightplan.js b/lib/flightplan.js
@@ -349,8 +349,7 @@ Flightplan.prototype = {
                       , 'with '.info + String(flightsForTask.length).magenta + ' flight(s)'.info);
     this.logger.space();
 
-    new Fiber(function() {
-
+    Fiber(function() {
       var t = process.hrtime();
 
       for(var i=0, len=flightsForTask.length; i < len; i++) {
@@ -393,7 +392,6 @@ Flightplan.prototype = {
         this.debriefingCallback();
         process.exit(0);
       }
-
     }.bind(this)).run();
   }
 

diff --git a/lib/remote.js b/lib/remote.js
@@ -18,7 +18,7 @@ RemoteFlight.prototype.__start = function() {
   var task = function(host) {
     var future = new Future();
     var flight = new RemoteFlight(this.flightplan, this.fn);
-    new Fiber(function() {
+    Fiber(function() {
       var t = process.hrtime();
 
       var transport = new flight.transportClass(flight, host);

diff --git a/lib/transport/index.js b/lib/transport/index.js
@@ -1,5 +1,6 @@
 var util = require('util')
   , Fiber = require('fibers')
+  , Future = require('fibers/future')
   , prompt = require('prompt')
   , commands = require('./commands');
 
@@ -303,9 +304,14 @@ Transport.prototype = {
    * @return mixed
    */
   waitFor: function(fn) {
-    var fiber = Fiber.current;
-    fn(function(ret) { fiber.run(ret); });
-    return Fiber.yield();
+    function task() {
+      var future = new Future();
+      fn(function(ret) {
+        future.return(ret);
+      });
+      return future;
+    }
+    Future.wait(task());
   },
 
   /**

diff --git a/lib/transport/shell.js b/lib/transport/shell.js
@@ -88,7 +88,7 @@ ShellTransport.prototype.__transfer = function(files, remoteDir, options) {
   var task = function(config) {
     var future = new Future();
 
-    new Fiber(function() {
+    Fiber(function() {
       var sshFlags = (config.privateKey ? ' -i ' + config.privateKey : '');
       var remoteUrl = util.format('%s%s:%s'
                                 , (config.username ? config.username + '@' : '')

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "flightplan",
   "description": "Library for streamlining application deployment or systems administration tasks",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "author": "Patrick Stadler <[email protected]>",
   "keywords": [
     "deploy",