✨ make ghost run wait for Ghost to finish starting

closes #66,#61 - breaking: won't work with any ghost versions < 1.0.0-alpha.8
TryGhost · Nov 7, 2016 · c9a4aaf · c9a4aaf
1 parent ab72ec3
commit c9a4aaf
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/lib/commands/run.js b/lib/commands/run.js
@@ -49,19 +49,26 @@ module.exports.Command = BaseCommand.extend({
                     process.exit(1);
                 });
 
-                // TODO: once Ghost itself supports sending messages to parent
-                // process upon successful startup, change this to wait for Ghost
-                // to send a message
-                if (process.send) {
-                    process.send({started: true});
-                }
+                self.child.on('message', function (message) {
+                    console.log(message);
+                    if (message.started) {
+                        self.sendMessage(message);
+                        return;
+                    }
+
+                    self.sendMessage({started: false, error: message.error});
+                });
             }).catch(function (error) {
-                if (process.send) {
-                    process.send({error: true, message: error.message});
-                }
+                this.sendMessage({started: false, error: error.message});
             });
     },
 
+    sendMessage: function sendMessage(message) {
+        if (process.send) {
+            process.send(message);
+        }
+    },
+
     exit: function exit() {
         if (this.child) {
             this.child.kill();

diff --git a/lib/process/local.js b/lib/process/local.js
@@ -28,7 +28,7 @@ module.exports = BaseProcess.extend({
                 if (msg.error) {
                     fs.unlinkSync(path.join(cwd, PID_FILE));
 
-                    reject(msg.message);
+                    reject(msg.error);
                 }
 
                 if (msg.started) {

diff --git a/lib/utils/resolve-version.js b/lib/utils/resolve-version.js
@@ -1,7 +1,7 @@
 var semver = require('semver'),
     Promise = require('bluebird'),
     npm = require('./npm'),
-    MIN_RELEASE = '>= 1.0.0-alpha.5';
+    MIN_RELEASE = '>= 1.0.0-alpha.8';
 
 module.exports = function resolveVersion(version, update) {
     if (version && !semver.satisfies(version, MIN_RELEASE)) {