Merge pull request #527 from gamechanger/js-bundle-services

Js bundle services

docs/changelog.md

@@ -8,6 +8,7 @@
     * The `restart` command no longer takes a `--no-sync` flag, due to the move to NFS.
 * **New**
     * Dusty now attempts to fix a known problem with boot2docker networking, resulting in up to a 10x improvement in network performance. See [this boot2docker issue](https://github.com/boot2docker/boot2docker/issues/1022) for more information.
+    * Bundles can now specify services, just as they specify apps.
 * **Misc**
     * `test.once` commands that fail now cause the entire test run to fail immediately.
     * When running all test suites, a tabular summary of test results is now printed at the end of the run

docs/specs/bundle-specs.md

@@ -28,3 +28,18 @@ apps:
 The list of apps to be run by `dusty up` if this bundle is activated.
 These apps are used as entrypoints into the dependency graph defined by
 your app and service specs.
+
+Each bundle must specify at least one app (in `apps`) or service (in `services`).
+
+## services
+
+```
+services:
+  - postgres
+```
+
+A list of services which will be run by `dusty up` if this bundle is activated.
+Services specified here will be launched in addition to services
+that specified apps depend on.
+
+Each bundle must specify at least one app (in `apps`) or service (in `services`).

dusty/compiler/spec_assembler.py

@@ -67,12 +67,16 @@ def _get_referenced_libs(specs):
 
 def _get_referenced_services(specs):
     """
-    Returns all services that are referenced in specs.apps.depends.services
+    Returns all services that are referenced in specs.apps.depends.services,
+    or in specs.bundles.services
     """
     active_services = set()
     for app_spec in specs['apps'].values():
         for service in app_spec['depends']['services']:
             active_services.add(service)
+    for bundle_spec in specs['bundles'].values():
+        for service in bundle_spec['services']:
+            active_services.add(service)
     return active_services
 
 def _filter_active(spec_type, specs):

dusty/schemas/bundle_schema.py

@@ -1,6 +1,13 @@
 from schemer import Schema, Array
 
+def app_or_service_required_validator():
+    def validator(document):
+        if 'apps' not in document and 'services' not in document:
+            return 'Bundles must specify `apps` or `services`'
+    return validator
+
 bundle_schema = Schema({
     'description': {'type': basestring, 'default': ''},
-    'apps': {'type': Array(basestring), 'required': True}
-    })
+    'apps': {'type': Array(basestring), 'default': list},
+    'services': {'type': Array(basestring), 'default': list},
+    }, validates=[app_or_service_required_validator()])

tests/unit/compiler/test_configs/bundle_with_service/apps/simpleapp.yml

@@ -0,0 +1,9 @@
+repo:  github.com/gamechanger/simpleapp
+image: docker.gamechanger.io/simpleapp
+mount: /simpleapp
+commands:
+  always:
+    - run-script.sh
+compose:
+  environment:
+    gcenv: local

tests/unit/compiler/test_configs/bundle_with_service/assembled_spec.yml

@@ -0,0 +1,25 @@
+bundles:
+    simple:
+        apps:
+            - simpleapp
+        services:
+            - bundle-specified-service
+apps:
+    simpleapp:
+        image: docker.gamechanger.io/simpleapp
+        commands:
+          always:
+            - run-script.sh
+          once: []
+        compose:
+          environment:
+            gcenv: local
+          volumes: []
+        depends:
+            apps: []
+            libs: []
+            services: []
+libs: {}
+services:
+    bundle-specified-service:
+        image: someimage

tests/unit/compiler/test_configs/bundle_with_service/bundles/simple.yml

@@ -0,0 +1,4 @@
+apps:
+    - simpleapp
+services:
+    - bundle-specified-service

tests/unit/compiler/test_configs/bundle_with_service/docker-compose.yml

@@ -0,0 +1,7 @@
+simpleapp:
+  image: docker.gamechanger.io/simpleapp
+  command: run-script.sh
+  environment:
+    gcenv: local
+bundle-specified-service:
+  image: someimage

tests/unit/compiler/test_configs/bundle_with_service/nginx.conf

@@ -0,0 +1,21 @@
+worker_processes  1;
+
+error_log  /var/log/dusty/nginx/error.log;
+
+pid        /var/log/dusty/nginx/nginx.pid;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+
+    access_log  /var/log/dusty/nginx/access.log;
+
+    sendfile        on;
+
+    keepalive_timeout  65;
+
+}

tests/unit/compiler/test_configs/bundle_with_service/services/bundle-specified-service.yml

@@ -0,0 +1 @@
+image: someimage

tests/unit/compiler/test_configs/bundle_without_app/apps/simpleapp.yml

@@ -0,0 +1,9 @@
+repo:  github.com/gamechanger/simpleapp
+image: docker.gamechanger.io/simpleapp
+mount: /simpleapp
+commands:
+  always:
+    - run-script.sh
+compose:
+  environment:
+    gcenv: local

tests/unit/compiler/test_configs/bundle_without_app/assembled_spec.yml

@@ -0,0 +1,26 @@
+bundles:
+    simple:
+        apps:
+            - simpleapp
+    serviceonly:
+        services:
+            - bundle-specified-service
+apps:
+    simpleapp:
+        image: docker.gamechanger.io/simpleapp
+        commands:
+          always:
+            - run-script.sh
+          once: []
+        compose:
+          environment:
+            gcenv: local
+          volumes: []
+        depends:
+            apps: []
+            libs: []
+            services: []
+libs: {}
+services:
+    bundle-specified-service:
+        image: someimage

tests/unit/compiler/test_configs/bundle_without_app/bundles/serviceonly.yml

@@ -0,0 +1,2 @@
+services:
+    - bundle-specified-service

tests/unit/compiler/test_configs/bundle_without_app/bundles/simple.yml

@@ -0,0 +1,2 @@
+apps:
+    - simpleapp

tests/unit/compiler/test_configs/bundle_without_app/docker-compose.yml

@@ -0,0 +1,7 @@
+simpleapp:
+  image: docker.gamechanger.io/simpleapp
+  command: run-script.sh
+  environment:
+    gcenv: local
+bundle-specified-service:
+  image: someimage

tests/unit/compiler/test_configs/bundle_without_app/nginx.conf

@@ -0,0 +1,21 @@
+worker_processes  1;
+
+error_log  /var/log/dusty/nginx/error.log;
+
+pid        /var/log/dusty/nginx/nginx.pid;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+
+    access_log  /var/log/dusty/nginx/access.log;
+
+    sendfile        on;
+
+    keepalive_timeout  65;
+
+}

tests/unit/compiler/test_configs/bundle_without_app/services/bundle-specified-service.yml

@@ -0,0 +1 @@
+image: someimage