marathon-api 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37c0d0ae7d91ddeaa7861bffa40b81e72a434e19
-  data.tar.gz: c5d165cf0d590a78fea207dfc705fa409174a8a5
+  metadata.gz: 6c559533ccc9fa9c31ab8bef43c85be37523dd19
+  data.tar.gz: d5a9ee23a61b5c87e59c8a98065b471af066ef24
 SHA512:
-  metadata.gz: 941597d6ae53616a9931735f9a016606933df061115ff21eb1202325388d785e8e824dedc64e00d3fd64725f2560aac1bfdec0758d3b22ad57245b485f94dcdd
-  data.tar.gz: 56afa004de719231016576cba81c13f2553d50e7378e9b79a05f68f5b8664e0ac52b0fa25f2df69f7f29710598f64b5809dfdaff39e1263efd43e4cccb0c828e
+  metadata.gz: 03b2bd23333085438a81bd9131fa40c4545d445495fd420316849e2b232be2b42c2eb5952a8c5677dbb805838345fece427eb706ad099cf13bd639eb69b8919b
+  data.tar.gz: fdf041c4549b82d01e25e626b5243faa3e7fb58f5bab98b6a209ae568fc23087d099376f9955a5dd9aed25431a7c95b76ebc07ebe6523549e940032d4e69fb03

data/README.md

@@ -3,7 +3,7 @@ marathon-api
 
 [![Gem Version](https://badge.fury.io/rb/marathon-api.svg)](http://badge.fury.io/rb/marathon-api) [![travis-ci](https://travis-ci.org/otto-de/marathon-api.png?branch=master)](https://travis-ci.org/otto-de/marathon-api) [![Code Climate](https://codeclimate.com/github/otto-de/marathon-api/badges/gpa.svg)](https://codeclimate.com/github/otto-de/marathon-api) [![Test Coverage](https://codeclimate.com/github/otto-de/marathon-api/badges/coverage.svg)](https://codeclimate.com/github/otto-de/marathon-api)
 
-This gem provides an object oriented interface to the [Marathon Remote API][1]. At the time if this writing, marathon-api is meant to interface with Marathon version 0.8.0.
+This gem provides an object oriented interface to the [Marathon Remote API][1]. At the time if this writing, marathon-api is meant to interface with Marathon version 0.8.1.
 
 Installation
 ------------

data/Rakefile

@@ -19,16 +19,21 @@ end
 
 dir = File.expand_path(File.dirname(__FILE__))
 namespace :vcr do
-  desc 'Run spec tests and record VCR cassettes'
-  task :record do
+  desc 'Remove VCR files'
+  task :clean do
     FileUtils.remove_dir("#{dir}/fixtures/vcr", true)
+  end
+
+  desc 'Preapre Marathon by deploying some tasks'
+  task :prepare do
     json = JSON.parse(File.read("#{dir}/fixtures/marathon_docker_sample.json"))
     Marathon::App.new(json).start!
+
     json = JSON.parse(File.read("#{dir}/fixtures/marathon_docker_sample_2.json"))
     Marathon::App.new(json).start!
-
-    # finally run spec tests
-    Rake::Task["spec"].invoke
   end
 
-end
+  desc 'Run spec tests and record VCR cassettes'
+  task :record => [:clean, :prepare, :spec]
+
+end

data/bin/marathon

@@ -42,56 +42,59 @@ def subcmd_list(cmd_opts)
 end
 
 def subcmd_start(cmd_opts)
-  begin
-    if cmd_opts[:json]
-      path = cmd_opts[:json]
-      if path == '-'
-        app_opts = Marathon::Util.keywordize_hash!(JSON.parse($stdin.read))
-      elsif File.exists?(path)
-        app_opts = Marathon::Util.keywordize_hash!(JSON.parse(File.read(cmd_opts[:json])))
-      else
-        raise Marathon::Error::ArgumentError, "File '#{path}' does not exist"
-      end
+  if cmd_opts[:json]
+    path = cmd_opts[:json]
+    if path == '-'
+      app_opts = Marathon::Util.keywordize_hash!(JSON.parse($stdin.read))
+    elsif File.exists?(path)
+      app_opts = Marathon::Util.keywordize_hash!(JSON.parse(File.read(cmd_opts[:json])))
     else
-      app_opts = DEFAULT_APP_OPTS
-    end
-    app_opts.merge!(cmd_opts.select { |k,_| ATTRIBUTES.include?(k) and cmd_opts["#{k.id2name}_given".to_sym] })
-    if cmd_opts[:env]
-      app_opts[:env] = Hash[cmd_opts[:env].map { |e| e.split('=', 2) }]
-    end
-    if cmd_opts[:constraints]
-      app_opts[:constraints] = cmd_opts[:constraint].map { |c| c.split(':') }
+      raise Marathon::Error::ArgumentError, "File '#{path}' does not exist"
     end
-    app = Marathon::App.new(app_opts)
-    puts "Starting app '#{app}'"
-    app.start!
-    print_apps([app])
-  rescue Marathon::Error::MarathonError => e
-    puts "#{e.class}: #{e.message}"
-    exit 1
+  else
+    app_opts = DEFAULT_APP_OPTS
+  end
+  app_opts.merge!(cmd_opts.select { |k,_| ATTRIBUTES.include?(k) and cmd_opts["#{k.id2name}_given".to_sym] })
+  if cmd_opts[:env]
+    app_opts[:env] = Hash[cmd_opts[:env].map { |e| e.split('=', 2) }]
   end
+  if cmd_opts[:constraints]
+    app_opts[:constraints] = cmd_opts[:constraint].map { |c| c.split(':') }
+  end
+  app = Marathon::App.new(app_opts)
+  puts "Starting app '#{app}'"
+  deployment = app.start!(cmd_opts[:force])
+  deployment.wait(cmd_opts[:timeout] || 60) if cmd_opts[:sync]
+  print_apps([app])
+rescue Marathon::Error::MarathonError => e
+  puts "#{e.class}: #{e.message}"
+  exit 1
+rescue TimeoutError => e
+  puts "Deployment took too long"
+  exit 1
 end
 
 def subcmd_scale(cmd_opts)
-  begin
-    app = Marathon::App.get(cmd_opts[:id])
-    puts "Scaling app '#{app.id}' from #{app.instances} to #{cmd_opts[:instances]}"
-    puts app.scale!(cmd_opts[:instances], cmd_opts[:force])
-  rescue Marathon::Error::NotFoundError => e
-    puts "#{e.class}: #{e.message}"
-    exit 1
-  end
+  app = Marathon::App.get(cmd_opts[:id])
+  puts "Scaling app '#{app.id}' from #{app.instances} to #{cmd_opts[:instances]}"
+  deployment = app.scale!(cmd_opts[:instances], cmd_opts[:force])
+  deployment.wait(cmd_opts[:timeout] || 60) if cmd_opts[:sync]
+  puts deployment
+rescue Marathon::Error::NotFoundError => e
+  puts "#{e.class}: #{e.message}"
+  exit 1
+rescue TimeoutError => e
+  puts "Deployment took too long"
+  exit 1
 end
 
 def subcmd_kill(cmd_opts)
-  begin
-    puts "Removing app '#{cmd_opts[:id]}'"
-    Marathon::App.delete(cmd_opts[:id])
-    puts 'done'
-  rescue Marathon::Error::NotFoundError => e
-    puts "#{e.class}: #{e.message}"
-    exit 1
-  end
+  puts "Removing app '#{cmd_opts[:id]}'"
+  Marathon::App.delete(cmd_opts[:id])
+  puts 'done'
+rescue Marathon::Error::NotFoundError => e
+  puts "#{e.class}: #{e.message}"
+  exit 1
 end
 
 def subcmd_list_tasks(cmd_opts)
@@ -182,12 +185,17 @@ def parse_subcmd_opts(cmd)
         opt :uri, 'URIs to download and unpack into the working directory.', :short => '-u', :type => :strings
         opt :env, 'Environment variables to add to the process, as NAME=VALUE.', :short => '-e', :type => :strings
         opt :constraint, 'Placement constraint for tasks, e.g. hostname:UNIQUE or rackid:CLUSTER', :type => :strings
+        opt :force, 'The current deployment can be overridden by setting the `force`.', :short => '-f'
+        opt :sync, 'Wait for the deployment to finish', :short => '-s'
+        opt :timeout, 'Timout for sync call in seconds (default 60).', :type => Integer, :short => '-t'
       end
     when 'scale'
       Trollop.options do
         opt :id, 'A unique identifier for the app.', :short => '-i', :type => String, :required => true
         opt :instances, 'The number of instances to run.', :short => '-n', :type => Integer, :required => true
         opt :force, 'The current deployment can be overridden by setting the `force`.', :short => '-f'
+        opt :sync, 'Wait for the deployment to finish', :short => '-s'
+        opt :timeout, 'Timout for sync call in seconds (default 60).', :type => Integer, :short => '-t'
       end
     when 'kill'
       Trollop.options do

data/fixtures/vcr/Marathon/_info/returns_the_info_hash.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: '{"name":"marathon","http_config":{"assets_path":null,"http_port":8080,"https_port":8443},"frameworkId":"20150228-110436-16842879-5050-2169-0001","leader":null,"event_subscriber":null,"marathon_config":{"local_port_max":20000,"local_port_min":10000,"hostname":"mesos","master":"zk://localhost:2181/mesos","reconciliation_interval":300000,"mesos_role":null,"task_launch_timeout":300000,"reconciliation_initial_delay":15000,"ha":true,"failover_timeout":604800,"checkpoint":true,"executor":"//cmd","marathon_store_timeout":2000,"mesos_user":"root"},"version":"0.8.0","zookeeper_config":{"zk_path":"/marathon","zk":null,"zk_timeout":10,"zk_hosts":"localhost:2181","zk_future_timeout":{"duration":10}},"elected":false}'
+      string: '{"name":"marathon","http_config":{"assets_path":null,"http_port":8080,"https_port":8443},"frameworkId":"20150210-083349-1160423616-5050-9698-0000","leader":null,"event_subscriber":{"type":"http_callback","http_endpoints":["http://127.0.0.1:8083/marathon/event"]},"marathon_config":{"local_port_max":20000,"local_port_min":10000,"hostname":"mesos-dev-f999998.lhotse.ov.otto.de","master":"zk://192.168.42.69:2181/develop/mesos","reconciliation_interval":75000,"mesos_role":null,"task_launch_timeout":300000,"reconciliation_initial_delay":15000,"ha":true,"failover_timeout":75,"checkpoint":true,"webui_url":null,"executor":"//cmd","marathon_store_timeout":2000,"mesos_user":"root"},"version":"0.8.1","zookeeper_config":{"zk_path":"/develop/marathon","zk":"zk://192.168.42.69:2181/develop/marathon","zk_timeout":10,"zk_hosts":"192.168.42.69:2181","zk_future_timeout":{"duration":10}},"elected":false}'
     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/_ping/ping/.yml

@@ -11,11 +11,17 @@ http_interactions:
       - application/json
       Accept:
       - application/json
+      User-Agent:
+      - ub0r/Marathon-API 1.1.0
   response:
     status:
       code: 200
       message: OK
     headers:
+      Pragma:
+      - no-cache
+      Expires:
+      - '0'
       Cache-Control:
       - must-revalidate,no-cache,no-store
       Access-Control-Allow-Credentials:
@@ -31,5 +37,5 @@ http_interactions:
       string: |
         pong
     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_App/_changes/changes_the_app.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: put
-    uri: http://localhost:8080/v2/apps//ubuntu2
+    uri: http://localhost:8080/v2/apps//ubuntu2?force=true
     body:
       encoding: UTF-8
       string: '{"instances":2}'
@@ -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,9 +32,9 @@ http_interactions:
       - Jetty(8.y.z-SNAPSHOT)
     body:
       encoding: UTF-8
-      string: '{"version":"2015-03-03T18:08:29.872Z","deploymentId":"577a4136-d861-4f41-b400-1f73314c9ffd"}'
+      string: '{"version":"2015-03-17T13:07:11.009Z","deploymentId":"442a4787-a964-4a16-889e-4fed7944ad7f"}'
     http_version: 
-  recorded_at: Tue, 03 Mar 2015 18:08:29 GMT
+  recorded_at: Tue, 17 Mar 2015 13:07:11 GMT
 - request:
     method: put
     uri: http://localhost:8080/v2/apps//ubuntu2?force=true
@@ -38,11 +46,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:
@@ -51,7 +67,7 @@ http_interactions:
       - Jetty(8.y.z-SNAPSHOT)
     body:
       encoding: UTF-8
-      string: '{"version":"2015-03-03T18:08:30.012Z","deploymentId":"b1457aac-c4af-426f-bc2b-c2d67afed429"}'
+      string: '{"version":"2015-03-17T13:07:11.094Z","deploymentId":"25c06868-441f-4af4-95aa-96e1862e8553"}'
     http_version: 
-  recorded_at: Tue, 03 Mar 2015 18:08:30 GMT
+  recorded_at: Tue, 17 Mar 2015 13:07:11 GMT
 recorded_with: VCR 2.9.3

data/fixtures/vcr/Marathon_App/_changes/fails_with_stange_attributes.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: 400
       message: Bad Request
     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":"Invalid JSON: JsResultException(errors:List((/instances,List(ValidationError(error.expected.jsnumber,WrappedArray())))))"}'
     http_version: 
-  recorded_at: Wed, 04 Mar 2015 16:38:10 GMT
+  recorded_at: Tue, 17 Mar 2015 13:05:49 GMT
 recorded_with: VCR 2.9.3

data/fixtures/vcr/Marathon_App/_delete/deletes_the_app.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: delete
-    uri: http://localhost:8080/v2/apps//ubuntu
+    uri: http://localhost:8080/v2/apps//test-app
     body:
       encoding: US-ASCII
       string: ''
@@ -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: '{"version":"2015-03-03T18:08:29.568Z","deploymentId":"475735d1-4c08-439d-8687-d13626e512a1"}'
+      string: '{"version":"2015-03-17T13:05:39.285Z","deploymentId":"e5985d99-2106-40e2-962d-18cb18126269"}'
     http_version: 
-  recorded_at: Tue, 03 Mar 2015 18:08:29 GMT
+  recorded_at: Tue, 17 Mar 2015 13:05:39 GMT
 recorded_with: VCR 2.9.3

data/fixtures/vcr/Marathon_App/_delete/fails_deleting_not_existing_app.yml

@@ -11,11 +11,19 @@ http_interactions:
       - application/json
       Accept:
       - application/json
+      User-Agent:
+      - 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:
@@ -26,5 +34,5 @@ http_interactions:
       encoding: UTF-8
       string: '{"message":"App ''/fooo app'' does not exist"}'
     http_version: 
-  recorded_at: Mon, 02 Mar 2015 10:49:28 GMT
+  recorded_at: Tue, 17 Mar 2015 13:05:39 GMT
 recorded_with: VCR 2.9.3

data/fixtures/vcr/Marathon_App/_get/fails_getting_not_existing_app.yml

@@ -11,11 +11,19 @@ http_interactions:
       - application/json
       Accept:
       - application/json
+      User-Agent:
+      - 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:
@@ -26,5 +34,5 @@ http_interactions:
       encoding: UTF-8
       string: '{"message":"App ''/fooo app'' does not exist"}'
     http_version: 
-  recorded_at: Mon, 02 Mar 2015 10:49:27 GMT
+  recorded_at: Tue, 17 Mar 2015 13:05:39 GMT
 recorded_with: VCR 2.9.3

data/fixtures/vcr/Marathon_App/_get/gets_the_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: '{"app":{"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":[10000],"requirePorts":false,"backoffSeconds":1,"backoffFactor":1.15,"maxLaunchDelaySeconds":3600,"container":{"type":"DOCKER","volumes":[],"docker":{"image":"libmesos/ubuntu","privileged":false,"parameters":[]}},"healthChecks":[],"dependencies":[],"upgradeStrategy":{"minimumHealthCapacity":1.0,"maximumOverCapacity":1.0},"labels":{},"version":"2015-03-03T18:08:28.345Z","tasksStaged":0,"tasksRunning":0,"deployments":[{"id":"2ec67f95-152d-4528-942e-435b2a1fec6a"}],"tasks":[],"lastTaskFailure":null}}'
+      string: '{"app":{"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","privileged":false,"parameters":[]}},"healthChecks":[],"dependencies":[],"upgradeStrategy":{"minimumHealthCapacity":1.0,"maximumOverCapacity":1.0},"labels":{},"version":"2015-03-17T11:56:26.532Z","tasksStaged":0,"tasksRunning":1,"tasksHealthy":0,"tasksUnhealthy":0,"deployments":[],"tasks":[{"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":"/ubuntu"}],"lastTaskFailure":null}}'
     http_version: 
-  recorded_at: Tue, 03 Mar 2015 18:08:29 GMT
+  recorded_at: Tue, 17 Mar 2015 13:05:39 GMT
 recorded_with: VCR 2.9.3

data/fixtures/vcr/Marathon_App/_list/lists_apps.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,9 +32,8 @@ http_interactions:
       - Jetty(8.y.z-SNAPSHOT)
     body:
       encoding: UTF-8
-      string: '{"apps":[{"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-02T11:30:30.096Z","tasksStaged":0,"tasksRunning":1,"deployments":[]},{"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":[10000],"requirePorts":false,"backoffSeconds":1,"backoffFactor":1.15,"maxLaunchDelaySeconds":3600,"container":{"type":"DOCKER","volumes":[],"docker":{"image":"libmesos/ubuntu","privileged":false,"parameters":[]}},"healthChecks":[],"dependencies":[],"upgradeStrategy":{"minimumHealthCapacity":1.0,"maximumOverCapacity":1.0},"labels":{},"version":"2015-03-03T18:08:28.345Z","tasksStaged":0,"tasksRunning":0,"deployments":[{"id":"2ec67f95-152d-4528-942e-435b2a1fec6a"}]},{"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","privileged":false,"parameters":[]}},"healthChecks":[],"dependencies":[],"upgradeStrategy":{"minimumHealthCapacity":1.0,"maximumOverCapacity":1.0},"labels":{},"version":"2015-03-03T18:08:28.455Z","tasksStaged":0,"tasksRunning":1,"deployments":[]}]}'
+      string: '{"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","privileged":false,"parameters":[]}},"healthChecks":[],"dependencies":[],"upgradeStrategy":{"minimumHealthCapacity":1.0,"maximumOverCapacity":1.0},"labels":{},"version":"2015-03-17T11:56:26.532Z","tasksStaged":0,"tasksRunning":1,"tasksHealthy":0,"tasksUnhealthy":0,"deployments":[]},{"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":[["hostname","GROUP_BY"]],"uris":[],"storeUrls":[],"ports":[],"requirePorts":false,"backoffSeconds":1,"backoffFactor":1.15,"maxLaunchDelaySeconds":3600,"container":{"type":"DOCKER","volumes":[],"docker":{"image":"libmesos/ubuntu","privileged":false,"parameters":[]}},"healthChecks":[],"dependencies":[],"upgradeStrategy":{"minimumHealthCapacity":1.0,"maximumOverCapacity":1.0},"labels":{},"version":"2015-03-17T13:04:37.200Z","tasksStaged":0,"tasksRunning":1,"tasksHealthy":0,"tasksUnhealthy":0,"deployments":[]}]}'
     http_version: 
-  recorded_at: Tue, 03 Mar 2015 18:08:29 GMT
+  recorded_at: Tue, 17 Mar 2015 13:05:38 GMT
 recorded_with: VCR 2.9.3

data/fixtures/vcr/Marathon_App/_restart/fails_restarting_not_existing_app.yml

@@ -11,11 +11,19 @@ http_interactions:
       - application/json
       Accept:
       - application/json
+      User-Agent:
+      - 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:
@@ -26,5 +34,5 @@ http_interactions:
       encoding: UTF-8
       string: '{"message":"App ''/fooo app'' does not exist"}'
     http_version: 
-  recorded_at: Mon, 02 Mar 2015 10:49:28 GMT
+  recorded_at: Tue, 17 Mar 2015 13:05:39 GMT
 recorded_with: VCR 2.9.3

data/fixtures/vcr/Marathon_App/_restart/restarts_an_app.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,7 +32,7 @@ http_interactions:
       - Jetty(8.y.z-SNAPSHOT)
     body:
       encoding: UTF-8
-      string: '{"version":"2015-03-07T14:15:30.159Z","deploymentId":"d38f8d55-b8b0-4893-ab16-ae474e282263"}'
+      string: '{"version":"2015-03-17T13:05:39.490Z","deploymentId":"f31c4fdf-ba97-4e45-a69b-48cc79f19706"}'
     http_version: 
-  recorded_at: Sat, 07 Mar 2015 14:15:30 GMT
+  recorded_at: Tue, 17 Mar 2015 13:05:39 GMT
 recorded_with: VCR 2.9.3

data/fixtures/vcr/Marathon_App/_start/fails_getting_not_existing_app.yml

@@ -11,11 +11,19 @@ http_interactions:
       - application/json
       Accept:
       - application/json
+      User-Agent:
+      - 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:
@@ -26,5 +34,5 @@ http_interactions:
       encoding: UTF-8
       string: '{"message":"App ''/fooo app'' does not exist"}'
     http_version: 
-  recorded_at: Mon, 02 Mar 2015 11:30:30 GMT
+  recorded_at: Tue, 17 Mar 2015 13:05:39 GMT
 recorded_with: VCR 2.9.3

data/fixtures/vcr/Marathon_App/_start/starts_the_app.yml

@@ -5,19 +5,27 @@ http_interactions:
     uri: http://localhost:8080/v2/apps
     body:
       encoding: UTF-8
-      string: '{"id":"/test","cmd":"sleep 10","instances":1,"cpus":0.1,"mem":32}'
+      string: '{"id":"/test-app","cmd":"sleep 10","instances":1,"cpus":0.1,"mem":32}'
     headers:
       Content-Type:
       - application/json
       Accept:
       - application/json
+      User-Agent:
+      - 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/apps/test
+      - http://localhost:8080/v2/apps/test-app
       Content-Type:
       - application/json
       Transfer-Encoding:
@@ -26,7 +34,7 @@ http_interactions:
       - Jetty(8.y.z-SNAPSHOT)
     body:
       encoding: UTF-8
-      string: '{"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":[0],"requirePorts":false,"backoffSeconds":1,"backoffFactor":1.15,"maxLaunchDelaySeconds":3600,"container":null,"healthChecks":[],"dependencies":[],"upgradeStrategy":{"minimumHealthCapacity":1.0,"maximumOverCapacity":1.0},"labels":{},"version":"2015-03-03T18:08:29.318Z"}'
+      string: '{"id":"/test-app","cmd":"sleep 10","args":null,"user":null,"env":{},"instances":1,"cpus":0.1,"mem":32.0,"disk":0.0,"executor":"","constraints":[],"uris":[],"storeUrls":[],"ports":[0],"requirePorts":false,"backoffFactor":1.15,"container":null,"healthChecks":[],"dependencies":[],"upgradeStrategy":{"minimumHealthCapacity":1.0,"maximumOverCapacity":1.0},"labels":{},"version":"2015-03-17T13:05:38.806Z","deployments":[{"id":"92294bd9-b2a5-48be-8d02-c594d4bf3a21"}],"tasks":[],"tasksStaged":0,"tasksRunning":0,"tasksHealthy":0,"tasksUnhealthy":0,"backoffSeconds":1,"maxLaunchDelaySeconds":3600}'
     http_version: 
-  recorded_at: Tue, 03 Mar 2015 18:08:29 GMT
+  recorded_at: Tue, 17 Mar 2015 13:05:38 GMT
 recorded_with: VCR 2.9.3