Merge pull request #15 from userlerueda/fix-depends-on

Fix depends_on not working for Long Syntax

lib/tools.js

@@ -17,7 +17,13 @@ module.exports = {
     while (order.length !== serviceNames.length) {
       for (var serviceName of serviceNames) {
         if (order.indexOf(serviceName) === -1) {
-          insertService(serviceName, recipe.services[serviceName].depends_on || [], order);
+          let depends_on = recipe.services[serviceName].depends_on;
+          if (typeof depends_on === "object" && !Array.isArray(depends_on)) {
+            // if we are using Long Syntax https://github.com/compose-spec/compose-spec/blob/master/spec.md#long-syntax-1
+            // we will need to get keys from object and use them as dependencies
+            depends_on = Object.keys(depends_on)
+          } 
+          insertService(serviceName, depends_on || [], order);
         }
       }
     }

test/assets/depends.yml

@@ -27,6 +27,22 @@ services:
       WORDPRESS_DB_PASSWORD: wordpress
       WORDPRESS_DB_NAME: wordpress
 
+  wordpress6:
+    depends_on:
+      db:
+        condition: service_started
+      wordpress2:
+        condition: service_started
+    image: wordpress:latest
+    ports:
+      - "8000:80"
+    restart: always
+    environment:
+      WORDPRESS_DB_HOST: db:3306
+      WORDPRESS_DB_USER: wordpress
+      WORDPRESS_DB_PASSWORD: wordpress
+      WORDPRESS_DB_NAME: wordpress
+
   db:
     image: mysql:5.7
     volumes:

test/tools.js

@@ -14,6 +14,7 @@ describe('tools', function () {
         'db',
         'wordpress1',
         'wordpress2',
+        'wordpress6',
         'wordpress4',
         'wordpress5'
       ]);