marathon-api 0.9.0 → 1.0.0

data/fixtures/vcr/Marathon_Group/_delete/deletes_the_group.yml

@@ -0,0 +1,32 @@
+---
+http_interactions:
+- request:
+    method: delete
+    uri: http://localhost:8080/v2/groups//test-group?force=true
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Content-Type:
+      - application/json
+      Accept:
+      - application/json
+      User-Agent:
+      - ub0r/Marathon-API 0.9.0
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - application/json
+      Transfer-Encoding:
+      - chunked
+      Server:
+      - Jetty(8.y.z-SNAPSHOT)
+    body:
+      encoding: UTF-8
+      string: '{"version":"2015-03-09T10:33:40.335Z","deploymentId":"c5ad3775-a422-48f0-99ee-e7e7f098a832"}'
+    http_version: 
+  recorded_at: Mon, 09 Mar 2015 10:33:40 GMT
+recorded_with: VCR 2.9.3

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

@@ -0,0 +1,32 @@
+---
+http_interactions:
+- request:
+    method: delete
+    uri: http://localhost:8080/v2/groups/fooo%20group
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Content-Type:
+      - application/json
+      Accept:
+      - application/json
+      User-Agent:
+      - ub0r/Marathon-API 0.9.0
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Content-Type:
+      - application/json
+      Transfer-Encoding:
+      - chunked
+      Server:
+      - Jetty(8.y.z-SNAPSHOT)
+    body:
+      encoding: UTF-8
+      string: '{"message":"Group ''/fooo group'' does not exist"}'
+    http_version: 
+  recorded_at: Mon, 09 Mar 2015 10:33:40 GMT
+recorded_with: VCR 2.9.3

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

@@ -0,0 +1,32 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://localhost:8080/v2/groups/fooo%20group
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Content-Type:
+      - application/json
+      Accept:
+      - application/json
+      User-Agent:
+      - ub0r/Marathon-API 0.9.0
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Content-Type:
+      - application/json
+      Transfer-Encoding:
+      - chunked
+      Server:
+      - Jetty(8.y.z-SNAPSHOT)
+    body:
+      encoding: UTF-8
+      string: '{"message":"Group ''/fooo group'' does not exist"}'
+    http_version: 
+  recorded_at: Mon, 09 Mar 2015 10:33:40 GMT
+recorded_with: VCR 2.9.3

data/fixtures/vcr/Marathon_Group/_get/gets_the_group.yml

@@ -0,0 +1,32 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://localhost:8080/v2/groups//test-group
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Content-Type:
+      - application/json
+      Accept:
+      - application/json
+      User-Agent:
+      - ub0r/Marathon-API 0.9.0
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - application/json
+      Transfer-Encoding:
+      - chunked
+      Server:
+      - Jetty(8.y.z-SNAPSHOT)
+    body:
+      encoding: UTF-8
+      string: '{"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"}'
+    http_version: 
+  recorded_at: Mon, 09 Mar 2015 10:33:40 GMT
+recorded_with: VCR 2.9.3

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

@@ -0,0 +1,33 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://localhost:8080/v2/groups
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Content-Type:
+      - application/json
+      Accept:
+      - application/json
+      User-Agent:
+      - ub0r/Marathon-API 0.9.0
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - application/json
+      Transfer-Encoding:
+      - chunked
+      Server:
+      - 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"}'
+    http_version: 
+  recorded_at: Mon, 09 Mar 2015 10:33:40 GMT
+recorded_with: VCR 2.9.3

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

@@ -0,0 +1,32 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://localhost:8080/v2/groups/fooo%20group
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Content-Type:
+      - application/json
+      Accept:
+      - application/json
+      User-Agent:
+      - ub0r/Marathon-API 0.9.0
+  response:
+    status:
+      code: 404
+      message: Not Found
+    headers:
+      Content-Type:
+      - application/json
+      Transfer-Encoding:
+      - chunked
+      Server:
+      - Jetty(8.y.z-SNAPSHOT)
+    body:
+      encoding: UTF-8
+      string: '{"message":"Group ''/fooo group'' does not exist"}'
+    http_version: 
+  recorded_at: Mon, 09 Mar 2015 10:33:40 GMT
+recorded_with: VCR 2.9.3

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

@@ -0,0 +1,35 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: http://localhost:8080/v2/groups
+    body:
+      encoding: UTF-8
+      string: '{"id":"/test-group","apps":[{"backoffFactor":1.15,"backoffSeconds":1,"maxLaunchDelaySeconds":3600,"cmd":"sleep
+        30","constraints":[],"cpus":1.0,"dependencies":[],"disk":0.0,"env":{},"executor":"","id":"app","instances":1,"mem":128.0,"ports":[10000],"requirePorts":false,"storeUrls":[],"upgradeStrategy":{"minimumHealthCapacity":1.0},"tasks":[]}],"dependencies":[],"groups":[]}'
+    headers:
+      Content-Type:
+      - application/json
+      Accept:
+      - application/json
+      User-Agent:
+      - ub0r/Marathon-API 0.9.0
+  response:
+    status:
+      code: 201
+      message: Created
+    headers:
+      Location:
+      - http://localhost:8080/v2/groups/test-group
+      Content-Type:
+      - application/json
+      Transfer-Encoding:
+      - chunked
+      Server:
+      - Jetty(8.y.z-SNAPSHOT)
+    body:
+      encoding: UTF-8
+      string: '{"version":"2015-03-09T10:33:39.889Z","deploymentId":"ad618509-e8ee-4949-8267-ef35a619426f"}'
+    http_version: 
+  recorded_at: Mon, 09 Mar 2015 10:33:40 GMT
+recorded_with: VCR 2.9.3

data/lib/marathon.rb

@@ -9,16 +9,25 @@ module Marathon
 
   attr_accessor :logger
 
+  require 'marathon/version'
   require 'marathon/util'
   require 'marathon/error'
   require 'marathon/connection'
+  require 'marathon/base'
+  require 'marathon/constraint'
+  require 'marathon/container_docker_port_mapping'
+  require 'marathon/container_docker'
+  require 'marathon/container_volume'
+  require 'marathon/container'
+  require 'marathon/health_check'
+  require 'marathon/deployment_info'
+  require 'marathon/group'
   require 'marathon/app'
   require 'marathon/deployment'
   require 'marathon/event_subscriptions'
   require 'marathon/leader'
   require 'marathon/queue'
   require 'marathon/task'
-  require 'marathon/version'
 
   DEFAULT_URL = 'http://localhost:8080'
 
@@ -27,21 +36,40 @@ module Marathon
     ENV['MARATHON_URL']
   end
 
-  # Get the marathon url
+  # Get marathon options from environment
+  def env_options
+    opts = {}
+    opts[:username] = ENV['MARATHON_USER'] if ENV['MARATHON_USER']
+    opts[:password] = ENV['MARATHON_PASSWORD'] if ENV['MARATHON_PASSWORD']
+    opts
+  end
+
+  # Get the marathon API URL
   def url
     @url ||= env_url || DEFAULT_URL
     @url
   end
 
+  # Get options for connecting to marathon API
+  def options
+    @options ||= env_options
+  end
+
   # Set a new url
   def url=(new_url)
     @url = new_url
     reset_connection!
   end
 
+  # Set new options
+  def options=(new_options)
+    @options = env_options.merge(new_options || {})
+    reset_connection!
+  end
+
   # Set a new connection
   def connection
-    @connection ||= Connection.new(url)
+    @connection ||= Connection.new(url, options)
   end
 
   # Reset the connection
@@ -59,7 +87,7 @@ module Marathon
     connection.get('/ping')
   end
 
-  module_function :connection, :env_url, :info, :logger, :logger=,
-                  :ping, :url, :url= ,:reset_connection!
+  module_function :connection, :env_options, :env_url, :info, :logger, :logger=, :ping,
+                  :options, :options=, :url, :url= ,:reset_connection!
 
 end

data/lib/marathon/app.rb

@@ -1,24 +1,29 @@
 # This class represents a Marathon App.
 # See https://mesosphere.github.io/marathon/docs/rest-api.html#apps for full list of API's methods.
-class Marathon::App
+class Marathon::App < Marathon::Base
 
-  attr_reader :info, :read_only
+  ACCESSORS = %w[ id args cmd cpus disk env executor instances mem ports requirePorts
+                  storeUris tasksRunning tasksStaged uris user version ]
+
+  DEFAULTS = {
+    :constraints => [],
+    :env => {},
+    :ports => [],
+    :uris => []
+  }
+
+  attr_reader :read_only
 
   # Create a new application object.
   # ++hash++: Hash including all attributes.
   #           See https://mesosphere.github.io/marathon/docs/rest-api.html#post-/v2/apps for full details.
   # ++read_only++: prevent actions on this application
-  def initialize(hash = {}, read_only = false)
-    @info = hash
+  def initialize(hash, read_only = false)
+    super(Marathon::Util.merge_keywordized_hash(DEFAULTS, hash), ACCESSORS)
+    raise ArgumentError, 'App must have an id' unless id
     @read_only = read_only
   end
 
-  # Shortcuts for reaching attributes
-  %w[ id args cmd cpus disk env executor instances mem ports requirePorts
-      storeUris tasksRunning tasksStaged uris user version ].each do |method|
-    define_method(method) { |*args, &block| info[method] }
-  end
-
   # Prevent actions on read only instances.
   # Raises an ArgumentError when triying to change read_only instances.
   def check_read_only
@@ -27,17 +32,38 @@ class Marathon::App
     end
   end
 
+  # Get container info.
+  # This is read only!
+  def container
+    if @info[:container]
+      Marathon::Container.new(@info[:container])
+    else
+      nil
+    end
+  end
+
+  # Get constrains.
+  # This is read only!
+  def constraints
+    @info[:constraints].map { |e| Marathon::Constraint.new(e) }
+  end
+
+  # Get health checks.
+  # This is read only!
+  def healthChecks
+    @info[:healthChecks].map { |e| Marathon::HealthCheck.new(e) }
+  end
+
   # List all running tasks for the application.
-  # Returns an Array of Task objects.
+  # This is read only!
   def tasks
     check_read_only
-    unless @info['tasks']
+    unless @info[:tasks]
       refresh
     end
 
-    raise Marathon::Error::UnexpectedResponseError, "Expected to find tasks element in app's info" unless @info['tasks']
-
-    @info['tasks'].map { |e| Marathon::Task.new(e) }
+    raise UnexpectedResponseError, "Expected to find tasks element in app's info" unless @info[:tasks]
+    @info[:tasks].map { |e| Marathon::Task.new(e) }
   end
 
   # List the versions of the application.
@@ -111,12 +137,36 @@ class Marathon::App
   end
 
   def to_s
-    "Marathon::App { :id => #{self.id} }"
+    "Marathon::App { :id => #{id} }"
+  end
+
+  # Returns a string for listing the application.
+  def to_pretty_s
+    %Q[
+App ID:     #{id}
+Instances:  #{tasks.size}/#{instances}
+Command:    #{cmd}
+CPUs:       #{cpus}
+Memory:     #{mem} MB
+#{pretty_uris()}
+#{pretty_env()}
+#{pretty_constraints()}
+Version:    #{version}
+    ].gsub(/\n\n+/, "\n").strip
+  end
+
+  private
+
+  def pretty_env
+    env.map { |k,v| "ENV:        #{k}=#{v}" }.join("\n")
+  end
+
+  def pretty_uris
+    uris.map { |e| "URI:        #{e}" }.join("\n")
   end
 
-  # Return application as JSON formatted string.
-  def to_json
-    info.to_json
+  def pretty_constraints
+    constraints.map { |e| "Constraint: #{e.to_pretty_s}" }.join("\n")
   end
 
   class << self
@@ -166,7 +216,7 @@ class Marathon::App
       query = {}
       query[:force] = true if force
       json = Marathon.connection.post("/v2/apps/#{id}/restart", query)
-      # TODO parse deploymentId + version
+      Marathon::DeploymentInfo.new(json)
     end
 
     # Change parameters of a running application. The new application parameters apply only to subsequently
@@ -179,7 +229,7 @@ class Marathon::App
       query = {}
       query[:force] = true if force
       json = Marathon.connection.put("/v2/apps/#{id}", query, :body => hash)
-      # TODO parse deploymentId + version
+      Marathon::DeploymentInfo.new(json)
     end
 
     # List the versions of the application with id.
@@ -197,4 +247,4 @@ class Marathon::App
       new(json, true)
     end
   end
-end
+end