marathon-api 1.1.0 → 1.2.0

data/fixtures/vcr/Marathon_Group/_list/lists_apps.yml

@@ -12,12 +12,18 @@ http_interactions:
       Accept:
       - application/json
       User-Agent:
-      - ub0r/Marathon-API 0.9.0
+      - ub0r/Marathon-API 1.1.0
   response:
     status:
       code: 200
       message: OK
     headers:
+      Cache-Control:
+      - no-cache, no-store, must-revalidate
+      Pragma:
+      - no-cache
+      Expires:
+      - '0'
       Content-Type:
       - application/json
       Transfer-Encoding:
@@ -26,8 +32,10 @@ http_interactions:
       - Jetty(8.y.z-SNAPSHOT)
     body:
       encoding: UTF-8
-      string: '{"id":"/","apps":[],"groups":[{"id":"/ubuntu2","apps":[],"groups":[],"dependencies":[],"version":"2015-03-09T10:33:39.889Z"},{"id":"/test-group","apps":[{"id":"/test-group/app","cmd":"sleep
-        30","args":null,"user":null,"env":{},"instances":1,"cpus":1.0,"mem":128.0,"disk":0.0,"executor":"","constraints":[],"uris":[],"storeUrls":[],"ports":[10000],"requirePorts":false,"backoffSeconds":1,"backoffFactor":1.15,"maxLaunchDelaySeconds":3600,"container":null,"healthChecks":[],"dependencies":[],"upgradeStrategy":{"minimumHealthCapacity":1.0,"maximumOverCapacity":0.0},"labels":{},"version":"2015-03-09T10:33:39.889Z"}],"groups":[],"dependencies":[],"version":"2015-03-09T10:33:39.889Z"}],"dependencies":[],"version":"2015-03-09T10:33:39.889Z"}'
+      string: '{"id":"/","apps":[{"id":"/ubuntu","cmd":"while sleep 10; do date -u
+        +%T; done","args":null,"user":null,"env":{},"instances":1,"cpus":0.1,"mem":64.0,"disk":0.0,"executor":"","constraints":[],"uris":[],"storeUrls":[],"ports":[],"requirePorts":false,"backoffSeconds":1,"backoffFactor":1.15,"maxLaunchDelaySeconds":3600,"container":{"type":"DOCKER","volumes":[],"docker":{"image":"libmesos/ubuntu","network":null,"portMappings":null,"privileged":false,"parameters":[]}},"healthChecks":[],"dependencies":[],"upgradeStrategy":{"minimumHealthCapacity":1.0,"maximumOverCapacity":1.0},"labels":{},"version":"2015-03-17T11:56:26.532Z"},{"id":"/ubuntu2","cmd":"while
+        sleep 10; do date -u +%T; done","args":null,"user":null,"env":{},"instances":2,"cpus":0.1,"mem":64.0,"disk":0.0,"executor":"","constraints":[["hostname","GROUP_BY"]],"uris":[],"storeUrls":[],"ports":[],"requirePorts":false,"backoffSeconds":1,"backoffFactor":1.15,"maxLaunchDelaySeconds":3600,"container":{"type":"DOCKER","volumes":[],"docker":{"image":"libmesos/ubuntu","network":null,"portMappings":null,"privileged":false,"parameters":[]}},"healthChecks":[],"dependencies":[],"upgradeStrategy":{"minimumHealthCapacity":1.0,"maximumOverCapacity":1.0},"labels":{},"version":"2015-03-17T13:05:44.561Z"}],"groups":[{"id":"/test","apps":[],"groups":[],"dependencies":[],"version":"2015-03-17T13:06:07.888Z"},{"id":"/develop-ci","apps":[],"groups":[{"id":"/develop-ci/ops","apps":[],"groups":[],"dependencies":[],"version":"2015-03-17T13:06:07.888Z"}],"dependencies":[],"version":"2015-03-17T13:06:07.888Z"},{"id":"/spark","apps":[],"groups":[],"dependencies":[],"version":"2015-03-17T13:06:07.888Z"},{"id":"/test-group","apps":[{"id":"/test-group/app","cmd":"sleep
+        30","args":null,"user":null,"env":{},"instances":1,"cpus":1.0,"mem":128.0,"disk":0.0,"executor":"","constraints":[],"uris":[],"storeUrls":[],"ports":[10000],"requirePorts":false,"backoffSeconds":1,"backoffFactor":1.15,"maxLaunchDelaySeconds":3600,"container":null,"healthChecks":[],"dependencies":[],"upgradeStrategy":{"minimumHealthCapacity":1.0,"maximumOverCapacity":0.0},"labels":{},"version":"2015-03-17T13:06:07.888Z"}],"groups":[],"dependencies":[],"version":"2015-03-17T13:06:07.888Z"}],"dependencies":[],"version":"2015-03-17T13:06:07.888Z"}'
     http_version: 
-  recorded_at: Mon, 09 Mar 2015 10:33:40 GMT
+  recorded_at: Tue, 17 Mar 2015 13:06:08 GMT
 recorded_with: VCR 2.9.3

data/fixtures/vcr/Marathon_Group/_start/fails_getting_not_existing_group.yml

@@ -12,12 +12,18 @@ http_interactions:
       Accept:
       - application/json
       User-Agent:
-      - ub0r/Marathon-API 0.9.0
+      - ub0r/Marathon-API 1.1.0
   response:
     status:
       code: 404
       message: Not Found
     headers:
+      Cache-Control:
+      - no-cache, no-store, must-revalidate
+      Pragma:
+      - no-cache
+      Expires:
+      - '0'
       Content-Type:
       - application/json
       Transfer-Encoding:
@@ -28,5 +34,5 @@ http_interactions:
       encoding: UTF-8
       string: '{"message":"Group ''/fooo group'' does not exist"}'
     http_version: 
-  recorded_at: Mon, 09 Mar 2015 10:33:40 GMT
+  recorded_at: Tue, 17 Mar 2015 13:06:08 GMT
 recorded_with: VCR 2.9.3

data/fixtures/vcr/Marathon_Group/_start/starts_the_group.yml

@@ -13,12 +13,18 @@ http_interactions:
       Accept:
       - application/json
       User-Agent:
-      - ub0r/Marathon-API 0.9.0
+      - ub0r/Marathon-API 1.1.0
   response:
     status:
       code: 201
       message: Created
     headers:
+      Cache-Control:
+      - no-cache, no-store, must-revalidate
+      Pragma:
+      - no-cache
+      Expires:
+      - '0'
       Location:
       - http://localhost:8080/v2/groups/test-group
       Content-Type:
@@ -29,7 +35,7 @@ http_interactions:
       - Jetty(8.y.z-SNAPSHOT)
     body:
       encoding: UTF-8
-      string: '{"version":"2015-03-09T10:33:39.889Z","deploymentId":"ad618509-e8ee-4949-8267-ef35a619426f"}'
+      string: '{"version":"2015-03-17T13:06:07.888Z","deploymentId":"b8ec8dda-f910-4339-9aff-fde4b7da31d4"}'
     http_version: 
-  recorded_at: Mon, 09 Mar 2015 10:33:40 GMT
+  recorded_at: Tue, 17 Mar 2015 13:06:08 GMT
 recorded_with: VCR 2.9.3

data/fixtures/vcr/Marathon_Leader/_delete/delete/.yml

@@ -11,11 +11,19 @@ http_interactions:
       - application/json
       Accept:
       - application/json
+      User-Agent:
+      - ub0r/Marathon-API 1.1.0
   response:
     status:
       code: 200
       message: OK
     headers:
+      Cache-Control:
+      - no-cache, no-store, must-revalidate
+      Pragma:
+      - no-cache
+      Expires:
+      - '0'
       Content-Type:
       - application/json
       Transfer-Encoding:
@@ -26,5 +34,5 @@ http_interactions:
       encoding: UTF-8
       string: '{"message":"Leadership abdicted"}'
     http_version: 
-  recorded_at: Mon, 02 Mar 2015 10:49:28 GMT
+  recorded_at: Tue, 17 Mar 2015 13:06:09 GMT
 recorded_with: VCR 2.9.3

data/fixtures/vcr/Marathon_Leader/_get/get/.yml

@@ -11,11 +11,19 @@ http_interactions:
       - application/json
       Accept:
       - application/json
+      User-Agent:
+      - ub0r/Marathon-API 1.1.0
   response:
     status:
       code: 200
       message: OK
     headers:
+      Cache-Control:
+      - no-cache, no-store, must-revalidate
+      Pragma:
+      - no-cache
+      Expires:
+      - '0'
       Content-Type:
       - application/json
       Transfer-Encoding:
@@ -24,7 +32,7 @@ http_interactions:
       - Jetty(8.y.z-SNAPSHOT)
     body:
       encoding: UTF-8
-      string: '{"leader":"mesos:8080"}'
+      string: '{"leader":"mesos-dev-f999998.lhotse.ov.otto.de:8080"}'
     http_version: 
-  recorded_at: Mon, 02 Mar 2015 10:49:28 GMT
+  recorded_at: Tue, 17 Mar 2015 13:06:09 GMT
 recorded_with: VCR 2.9.3

data/fixtures/vcr/Marathon_Queue/_list/lists_queue.yml

@@ -12,12 +12,18 @@ http_interactions:
       Accept:
       - application/json
       User-Agent:
-      - ub0r/Marathon-API 0.8.0
+      - ub0r/Marathon-API 1.1.0
   response:
     status:
       code: 200
       message: OK
     headers:
+      Cache-Control:
+      - no-cache, no-store, must-revalidate
+      Pragma:
+      - no-cache
+      Expires:
+      - '0'
       Content-Type:
       - application/json
       Transfer-Encoding:
@@ -26,8 +32,7 @@ http_interactions:
       - Jetty(8.y.z-SNAPSHOT)
     body:
       encoding: UTF-8
-      string: '{"queue":[{"app":{"id":"/test","cmd":"sleep 10","args":null,"user":null,"env":{},"instances":1,"cpus":0.1,"mem":32.0,"disk":0.0,"executor":"","constraints":[],"uris":[],"storeUrls":[],"ports":[10002],"requirePorts":false,"backoffSeconds":1,"backoffFactor":1.15,"maxLaunchDelaySeconds":3600,"container":null,"healthChecks":[],"dependencies":[],"upgradeStrategy":{"minimumHealthCapacity":1.0,"maximumOverCapacity":1.0},"labels":{},"version":"2015-03-04T16:34:16.561Z"},"count":0},{"app":{"id":"/ubuntu2","cmd":"while
-        sleep 10; do date -u +%T; done","args":null,"user":null,"env":{},"instances":1,"cpus":0.1,"mem":64.0,"disk":0.0,"executor":"","constraints":[],"uris":[],"storeUrls":[],"ports":[10001],"requirePorts":false,"backoffSeconds":1,"backoffFactor":1.15,"maxLaunchDelaySeconds":3600,"container":{"type":"DOCKER","volumes":[],"docker":{"image":"libmesos/ubuntu","network":null,"portMappings":null,"privileged":false,"parameters":[]}},"healthChecks":[],"dependencies":[],"upgradeStrategy":{"minimumHealthCapacity":1.0,"maximumOverCapacity":1.0},"labels":{},"version":"2015-03-04T16:34:15.691Z"},"count":0}]}'
+      string: '{"queue":[]}'
     http_version: 
-  recorded_at: Wed, 04 Mar 2015 18:38:40 GMT
+  recorded_at: Tue, 17 Mar 2015 13:06:09 GMT
 recorded_with: VCR 2.9.3

data/fixtures/vcr/Marathon_Task/_delete/kills_a_tasks_of_an_app.yml

@@ -11,11 +11,19 @@ http_interactions:
       - application/json
       Accept:
       - application/json
+      User-Agent:
+      - ub0r/Marathon-API 1.1.0
   response:
     status:
       code: 200
       message: OK
     headers:
+      Cache-Control:
+      - no-cache, no-store, must-revalidate
+      Pragma:
+      - no-cache
+      Expires:
+      - '0'
       Content-Type:
       - application/json
       Transfer-Encoding:
@@ -24,34 +32,42 @@ http_interactions:
       - Jetty(8.y.z-SNAPSHOT)
     body:
       encoding: UTF-8
-      string: '{"tasks":[{"appId":"/ubuntu2","id":"ubuntu2.37fbe1bc-c1d0-11e4-82d4-46b02d3b7f9e","host":"mesos","ports":[31290],"startedAt":"2015-03-03T18:07:57.097Z","stagedAt":"2015-03-03T18:07:56.457Z","version":"2015-03-03T18:07:47.581Z"}]}'
+      string: '{"tasks":[{"appId":"/ubuntu2","id":"ubuntu2.52c55930-cca6-11e4-9cfc-080027d9edbf","host":"mesos-dev-f999999.lhotse.ov.otto.de","ports":[],"startedAt":"2015-03-17T13:05:46.755Z","stagedAt":"2015-03-17T13:05:45.326Z","version":"2015-03-17T13:05:39.490Z"},{"appId":"/ubuntu2","id":"ubuntu2.57c93911-cca6-11e4-9cfc-080027d9edbf","host":"mesos-dev-f999999.lhotse.ov.otto.de","ports":[],"startedAt":"2015-03-17T13:05:55.629Z","stagedAt":"2015-03-17T13:05:53.741Z","version":"2015-03-17T13:05:39.559Z"}]}'
     http_version: 
-  recorded_at: Tue, 03 Mar 2015 18:08:30 GMT
+  recorded_at: Tue, 17 Mar 2015 13:06:10 GMT
 - request:
-    method: delete
-    uri: http://localhost:8080/v2/apps//ubuntu2/tasks/ubuntu2.37fbe1bc-c1d0-11e4-82d4-46b02d3b7f9e
+    method: post
+    uri: http://localhost:8080/v2/tasks/delete
     body:
-      encoding: US-ASCII
-      string: ''
+      encoding: UTF-8
+      string: '{"ids":["ubuntu2.52c55930-cca6-11e4-9cfc-080027d9edbf"]}'
     headers:
       Content-Type:
       - application/json
       Accept:
       - application/json
+      User-Agent:
+      - ub0r/Marathon-API 1.1.0
   response:
     status:
       code: 200
       message: OK
     headers:
+      Cache-Control:
+      - no-cache, no-store, must-revalidate
+      Pragma:
+      - no-cache
+      Expires:
+      - '0'
       Content-Type:
       - application/json
-      Transfer-Encoding:
-      - chunked
+      Content-Length:
+      - '0'
       Server:
       - Jetty(8.y.z-SNAPSHOT)
     body:
       encoding: UTF-8
-      string: '{"task":{"id":"ubuntu2.37fbe1bc-c1d0-11e4-82d4-46b02d3b7f9e","host":"mesos","ports":[31290],"startedAt":"2015-03-03T18:07:57.097Z","stagedAt":"2015-03-03T18:07:56.457Z","version":"2015-03-03T18:07:47.581Z"}}'
+      string: ''
     http_version: 
-  recorded_at: Tue, 03 Mar 2015 18:08:30 GMT
+  recorded_at: Tue, 17 Mar 2015 13:06:10 GMT
 recorded_with: VCR 2.9.3

data/fixtures/vcr/Marathon_Task/_delete_all/kills_all_tasks_of_an_app.yml

@@ -11,11 +11,19 @@ http_interactions:
       - application/json
       Accept:
       - application/json
+      User-Agent:
+      - ub0r/Marathon-API 1.1.0
   response:
     status:
       code: 200
       message: OK
     headers:
+      Cache-Control:
+      - no-cache, no-store, must-revalidate
+      Pragma:
+      - no-cache
+      Expires:
+      - '0'
       Content-Type:
       - application/json
       Transfer-Encoding:
@@ -24,7 +32,7 @@ http_interactions:
       - Jetty(8.y.z-SNAPSHOT)
     body:
       encoding: UTF-8
-      string: '{"tasks":[{"id":"ubuntu2.37fbe1bc-c1d0-11e4-82d4-46b02d3b7f9e","host":"mesos","ports":[31290],"startedAt":"2015-03-03T18:07:57.097Z","stagedAt":"2015-03-03T18:07:56.457Z","version":"2015-03-03T18:07:47.581Z"}]}'
+      string: '{"tasks":[{"id":"ubuntu2.52c55930-cca6-11e4-9cfc-080027d9edbf","host":"mesos-dev-f999999.lhotse.ov.otto.de","ports":[],"startedAt":"2015-03-17T13:05:46.755Z","stagedAt":"2015-03-17T13:05:45.326Z","version":"2015-03-17T13:05:39.490Z"},{"id":"ubuntu2.57c93911-cca6-11e4-9cfc-080027d9edbf","host":"mesos-dev-f999999.lhotse.ov.otto.de","ports":[],"startedAt":"2015-03-17T13:05:55.629Z","stagedAt":"2015-03-17T13:05:53.741Z","version":"2015-03-17T13:05:39.559Z"}]}'
     http_version: 
-  recorded_at: Tue, 03 Mar 2015 18:08:30 GMT
+  recorded_at: Tue, 17 Mar 2015 13:06:10 GMT
 recorded_with: VCR 2.9.3

data/fixtures/vcr/Marathon_Task/_get/gets_tasks_of_an_app.yml

@@ -11,11 +11,19 @@ http_interactions:
       - application/json
       Accept:
       - application/json
+      User-Agent:
+      - ub0r/Marathon-API 1.1.0
   response:
     status:
       code: 200
       message: OK
     headers:
+      Cache-Control:
+      - no-cache, no-store, must-revalidate
+      Pragma:
+      - no-cache
+      Expires:
+      - '0'
       Content-Type:
       - application/json
       Transfer-Encoding:
@@ -24,7 +32,7 @@ http_interactions:
       - Jetty(8.y.z-SNAPSHOT)
     body:
       encoding: UTF-8
-      string: '{"tasks":[{"appId":"/ubuntu2","id":"ubuntu2.37fbe1bc-c1d0-11e4-82d4-46b02d3b7f9e","host":"mesos","ports":[31290],"startedAt":"2015-03-03T18:07:57.097Z","stagedAt":"2015-03-03T18:07:56.457Z","version":"2015-03-03T18:07:47.581Z"}]}'
+      string: '{"tasks":[{"appId":"/ubuntu2","id":"ubuntu2.52c55930-cca6-11e4-9cfc-080027d9edbf","host":"mesos-dev-f999999.lhotse.ov.otto.de","ports":[],"startedAt":"2015-03-17T13:05:46.755Z","stagedAt":"2015-03-17T13:05:45.326Z","version":"2015-03-17T13:05:39.490Z"},{"appId":"/ubuntu2","id":"ubuntu2.57c93911-cca6-11e4-9cfc-080027d9edbf","host":"mesos-dev-f999999.lhotse.ov.otto.de","ports":[],"startedAt":"2015-03-17T13:05:55.629Z","stagedAt":"2015-03-17T13:05:53.741Z","version":"2015-03-17T13:05:39.559Z"}]}'
     http_version: 
-  recorded_at: Tue, 03 Mar 2015 18:08:30 GMT
+  recorded_at: Tue, 17 Mar 2015 13:06:10 GMT
 recorded_with: VCR 2.9.3

data/fixtures/vcr/Marathon_Task/_list/lists_running_tasks.yml

@@ -11,11 +11,19 @@ http_interactions:
       - application/json
       Accept:
       - application/json
+      User-Agent:
+      - ub0r/Marathon-API 1.1.0
   response:
     status:
       code: 200
       message: OK
     headers:
+      Cache-Control:
+      - no-cache, no-store, must-revalidate
+      Pragma:
+      - no-cache
+      Expires:
+      - '0'
       Content-Type:
       - application/json
       Transfer-Encoding:
@@ -24,7 +32,7 @@ http_interactions:
       - Jetty(8.y.z-SNAPSHOT)
     body:
       encoding: UTF-8
-      string: '{"tasks":[{"appId":"/test","id":"test.482155d0-c1d0-11e4-82d4-46b02d3b7f9e","host":"mesos","ports":[31026],"startedAt":"2015-03-03T18:08:24.116Z","stagedAt":"2015-03-03T18:08:23.546Z","version":"2015-03-02T11:30:30.096Z","servicePorts":[10002]},{"appId":"/ubuntu2","id":"ubuntu2.37fbe1bc-c1d0-11e4-82d4-46b02d3b7f9e","host":"mesos","ports":[31290],"startedAt":"2015-03-03T18:07:57.097Z","stagedAt":"2015-03-03T18:07:56.457Z","version":"2015-03-03T18:07:47.581Z","servicePorts":[10001]}]}'
+      string: '{"tasks":[{"appId":"/ubuntu","id":"ubuntu.a6c4d769-cc9c-11e4-9cfc-080027d9edbf","host":"mesos-dev-f999999.lhotse.ov.otto.de","ports":[],"startedAt":"2015-03-17T11:56:36.225Z","stagedAt":"2015-03-17T11:56:31.284Z","version":"2015-03-17T11:56:26.532Z"},{"appId":"/ubuntu2","id":"ubuntu2.52c55930-cca6-11e4-9cfc-080027d9edbf","host":"mesos-dev-f999999.lhotse.ov.otto.de","ports":[],"startedAt":"2015-03-17T13:05:46.755Z","stagedAt":"2015-03-17T13:05:45.326Z","version":"2015-03-17T13:05:39.490Z"},{"appId":"/ubuntu2","id":"ubuntu2.57c93911-cca6-11e4-9cfc-080027d9edbf","host":"mesos-dev-f999999.lhotse.ov.otto.de","ports":[],"startedAt":"2015-03-17T13:05:55.629Z","stagedAt":"2015-03-17T13:05:53.741Z","version":"2015-03-17T13:05:39.559Z"}]}'
     http_version: 
-  recorded_at: Tue, 03 Mar 2015 18:08:30 GMT
+  recorded_at: Tue, 17 Mar 2015 13:06:09 GMT
 recorded_with: VCR 2.9.3

data/fixtures/vcr/Marathon_Task/_list/lists_tasks.yml

@@ -11,11 +11,19 @@ http_interactions:
       - application/json
       Accept:
       - application/json
+      User-Agent:
+      - ub0r/Marathon-API 1.1.0
   response:
     status:
       code: 200
       message: OK
     headers:
+      Cache-Control:
+      - no-cache, no-store, must-revalidate
+      Pragma:
+      - no-cache
+      Expires:
+      - '0'
       Content-Type:
       - application/json
       Transfer-Encoding:
@@ -24,7 +32,7 @@ http_interactions:
       - Jetty(8.y.z-SNAPSHOT)
     body:
       encoding: UTF-8
-      string: '{"tasks":[{"appId":"/test","id":"test.482155d0-c1d0-11e4-82d4-46b02d3b7f9e","host":"mesos","ports":[31026],"startedAt":"2015-03-03T18:08:24.116Z","stagedAt":"2015-03-03T18:08:23.546Z","version":"2015-03-02T11:30:30.096Z","servicePorts":[10002]},{"appId":"/ubuntu2","id":"ubuntu2.37fbe1bc-c1d0-11e4-82d4-46b02d3b7f9e","host":"mesos","ports":[31290],"startedAt":"2015-03-03T18:07:57.097Z","stagedAt":"2015-03-03T18:07:56.457Z","version":"2015-03-03T18:07:47.581Z","servicePorts":[10001]}]}'
+      string: '{"tasks":[{"appId":"/ubuntu","id":"ubuntu.a6c4d769-cc9c-11e4-9cfc-080027d9edbf","host":"mesos-dev-f999999.lhotse.ov.otto.de","ports":[],"startedAt":"2015-03-17T11:56:36.225Z","stagedAt":"2015-03-17T11:56:31.284Z","version":"2015-03-17T11:56:26.532Z"},{"appId":"/ubuntu2","id":"ubuntu2.52c55930-cca6-11e4-9cfc-080027d9edbf","host":"mesos-dev-f999999.lhotse.ov.otto.de","ports":[],"startedAt":"2015-03-17T13:05:46.755Z","stagedAt":"2015-03-17T13:05:45.326Z","version":"2015-03-17T13:05:39.490Z"},{"appId":"/ubuntu2","id":"ubuntu2.57c93911-cca6-11e4-9cfc-080027d9edbf","host":"mesos-dev-f999999.lhotse.ov.otto.de","ports":[],"startedAt":"2015-03-17T13:05:55.629Z","stagedAt":"2015-03-17T13:05:53.741Z","version":"2015-03-17T13:05:39.559Z"}]}'
     http_version: 
-  recorded_at: Tue, 03 Mar 2015 18:08:30 GMT
+  recorded_at: Tue, 17 Mar 2015 13:06:09 GMT
 recorded_with: VCR 2.9.3

data/lib/marathon/deployment.rb

@@ -2,13 +2,16 @@
 # See https://mesosphere.github.io/marathon/docs/rest-api.html#deployments for full list of API's methods.
 class Marathon::Deployment < Marathon::Base
 
-  ACCESSORS = %w[ id affectedApps steps currentActions version currentStep totalSteps ]
+  ACCESSORS = %w[ id affectedApps version currentStep totalSteps ]
+  attr_reader :steps, :currentActions
 
   # Create a new deployment object.
   # ++hash++: Hash including all attributes.
   #           See https://mesosphere.github.io/marathon/docs/rest-api.html#get-/v2/deployments for full details.
   def initialize(hash)
     super(hash, ACCESSORS)
+    @currentActions = (info[:currentActions] || []).map { |e| Marathon::DeploymentAction.new(e) }
+    @steps = (info[:steps] || []).map { |e| Marathon::DeploymentStep.new(e) }
   end
 
   # Cancel the deployment.
@@ -47,4 +50,4 @@ class Marathon::Deployment < Marathon::Base
     alias :cancel :delete
     alias :remove :delete
   end
-end
+end

data/lib/marathon/deployment_action.rb

@@ -0,0 +1,23 @@
+# This class represents a Marathon Deployment action.
+class Marathon::DeploymentAction < Marathon::Base
+
+  # Create a new deployment action object.
+  # ++hash++: Hash returned by API, including 'app' and 'type'
+  def initialize(hash)
+    super(hash, %w[app])
+  end
+
+  def type
+    info[:type] || info[:action]
+  end
+  alias :action :type
+
+  def to_pretty_s
+    "#{app}/#{type}"
+  end
+
+  def to_s
+    "Marathon::DeploymentAction { :app => #{app} :type => #{type} }"
+  end
+
+end

data/lib/marathon/deployment_info.rb

@@ -1,7 +1,11 @@
+require 'timeout'
+
 # This class represents a Marathon Deployment information.
 # It is returned by asynchronious deployment calls.
 class Marathon::DeploymentInfo < Marathon::Base
 
+  RECHECK_INTERVAL = 3
+
   # Create a new deployment info object.
   # ++hash++: Hash returned by API, including 'deploymentId' and 'version'
   def initialize(hash)
@@ -9,6 +13,18 @@ class Marathon::DeploymentInfo < Marathon::Base
     raise Marathon::Error::ArgumentError, 'version must not be nil' unless version
   end
 
+  # Wait for a deployment to finish.
+  # ++timeout++: Timeout in seconds.
+  def wait(timeout = 60)
+    Timeout::timeout(timeout) do
+      deployments = nil
+      while deployments.nil? or deployments.select{|e| e.id == deploymentId}.size > 0 do
+        sleep(RECHECK_INTERVAL) unless deployments.nil?
+        deployments = Marathon::Deployment.list
+      end
+    end
+  end
+
   def to_s
     if deploymentId
       "Marathon::DeploymentInfo { :version => #{version} :deploymentId => #{deploymentId} }"
@@ -17,4 +33,4 @@ class Marathon::DeploymentInfo < Marathon::Base
     end
   end
 
-end
+end

data/lib/marathon/deployment_step.rb

@@ -0,0 +1,21 @@
+# This class represents a Marathon Deployment step.
+class Marathon::DeploymentStep < Marathon::Base
+
+  attr_reader :actions
+
+  # Create a new deployment step object.
+  # ++hash++: Hash returned by API, including 'actions'
+  def initialize(hash)
+    super(hash)
+    if hash.is_a?(Array)
+      @actions = info.map { |e| Marathon::DeploymentAction.new(e) }
+    else
+      @actions = (info[:actions] || []).map { |e| Marathon::DeploymentAction.new(e) }
+    end
+  end
+
+  def to_s
+    "Marathon::DeploymentStep { :actions => #{actions.map{|e| e.to_pretty_s}.join(',')} }"
+  end
+
+end

data/lib/marathon/error.rb

@@ -65,4 +65,4 @@ module Marathon::Error
 
   module_function :error_class, :error_message, :from_response
 
-end
+end

data/lib/marathon/group.rb

@@ -17,7 +17,8 @@ class Marathon::Group < Marathon::Base
     super(Marathon::Util.merge_keywordized_hash(DEFAULTS, hash), ACCESSORS)
     raise ArgumentError, 'Group must have an id' unless id
     refresh_attributes
-    raise ArgumentError, 'Group can have either groups or apps, not both' if apps.size > 0 and groups.size > 0
+    raise ArgumentError, 'Group can have either groups or apps, not both' \
+      if apps.size > 0 and groups.size > 0 and id != '/'
   end
 
   # Reload attributes from marathon API.
@@ -54,7 +55,8 @@ class Marathon::Group < Marathon::Base
   # ++hash++: Hash of attributes to change.
   # ++force++: If the group is affected by a running deployment, then the update operation will fail.
   #            The current deployment can be overridden by setting the `force` query parameter.
-  def change!(hash, force = false)
+  # ++dry_run++: Get a preview of the deployment steps Marathon would run for a given group update.
+  def change!(hash, force = false, dry_run = false)
     Marathon::Util.keywordize_hash!(hash)
     if hash[:version] and hash.size > 1
       # remove :version if it's not the only key
@@ -62,7 +64,7 @@ class Marathon::Group < Marathon::Base
     else
       new_hash = hash
     end
-    self.class.change(id, new_hash, force)
+    self.class.change(id, new_hash, force, dry_run)
   end
 
   # Create a new version with parameters of an old version.
@@ -159,11 +161,17 @@ Version:    #{version}
     # ++hash++: Hash of attributes to change.
     # ++force++: If the group is affected by a running deployment, then the update operation will fail.
     #            The current deployment can be overridden by setting the `force` query parameter.
-    def change(id, hash, force = false)
+    # ++dry_run++: Get a preview of the deployment steps Marathon would run for a given group update.
+    def change(id, hash, force = false, dry_run = false)
       query = {}
       query[:force] = true if force
+      query[:dryRun] = true if dry_run
       json = Marathon.connection.put("/v2/groups/#{id}", query, :body => hash)
-      Marathon::DeploymentInfo.new(json)
+      if dry_run
+        json['steps'].map { |e| Marathon::DeploymentStep.new(e) }
+      else
+        Marathon::DeploymentInfo.new(json)
+      end
     end
   end
 end

data/lib/marathon/task.rb

@@ -14,8 +14,7 @@ class Marathon::Task < Marathon::Base
   # ++scale++: Scale the app down (i.e. decrement its instances setting by the number of tasks killed)
   #            after killing the specified tasks.
   def delete!(scale = false)
-    new_task = self.class.delete(appId, id, scale)
-    @info = new_task.info
+    new_task = self.class.delete(id, scale)
   end
   alias :kill! :delete!
 
@@ -55,16 +54,15 @@ Version:    #{version}
       json.map { |j| new(j) }
     end
 
-    # Kill the task that belongs to the application appId.
-    # ++appId++: Application's id
-    # ++id++: Id of target task.
+    # Kill the given list of tasks and scale apps if requested.
+    # ++ids++: Id or list of ids with target tasks.
     # ++scale++: Scale the app down (i.e. decrement its instances setting by the number of tasks killed)
     #            after killing the specified tasks.
-    def delete(appId, id, scale = false)
+    def delete(ids, scale = false)
       query = {}
       query[:scale] = true if scale
-      json = Marathon.connection.delete("/v2/apps/#{appId}/tasks/#{id}", query)
-      new(json)
+      ids = [ids] if ids.is_a?(String)
+      Marathon.connection.post("/v2/tasks/delete", query, :body => {:ids => ids})
     end
     alias :remove :delete
     alias :kill :delete
@@ -85,4 +83,4 @@ Version:    #{version}
     alias :kill_all :delete_all
   end
 
-end
+end

data/lib/marathon/version.rb

@@ -1,3 +1,3 @@
 module Marathon
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/lib/marathon.rb

@@ -21,6 +21,8 @@ module Marathon
   require 'marathon/container'
   require 'marathon/health_check'
   require 'marathon/deployment_info'
+  require 'marathon/deployment_action'
+  require 'marathon/deployment_step'
   require 'marathon/group'
   require 'marathon/app'
   require 'marathon/deployment'