marathon-api 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2655f3b4c932dcf453acb970aa41f6ae9ff774d
-  data.tar.gz: 6689f06c21c986ba2bcb23aae214bf98a4cc582e
+  metadata.gz: 8b60887f834b4861afd26cac261c219767fbd208
+  data.tar.gz: b25e03b3dc591c0f3503cb60a3c8c4b528fe032e
 SHA512:
-  metadata.gz: 7019da94e90e103908c78534428ca6dd93ad8319dacd04d49e332924dc1aa7fc146a93ab95d83f545e4e2a3392573ce1e3c082fae63feeeec427402a32175937
-  data.tar.gz: 29f7d9d5f14c50853c4234fdfaa840e20809ed5efb912b1f6a1374acb1c03edbaa93ed17ab2f487b1a806917e53d64b28dc0e76273b66214b0d7ebe542fd78ce
+  metadata.gz: 66917b9f6d31568d01dcab7c31c083ef4a1d53d4423ddb1435c78cb86b76e2b5e069f630c2a9aa920c1ac1bc9e24746baa5894962e9fded20fd698dafae8ba72
+  data.tar.gz: 2d20bb4db6d22dd4c1ebf3cfee576b34616fd10547fa48bb69b43ed70b4965a9d6ed2a9b0e83890058752141051bd1af33028a29ccb5274d63c3944177084bfc

data/.travis.yml

@@ -4,6 +4,7 @@ rvm:
   - 2.0.0
   - 2.1.5
   - 2.2.0
+  - 2.3.0
 env:
   global:
     - CODECLIMATE_REPO_TOKEN=a0f25c19629dd353c43aef0cbbd886a7a4079c2238711fa4f932e1477b818195

data/bin/marathon

@@ -110,7 +110,7 @@ end
 def subcmd_kill_tasks(cmd_opts)
   if cmd_opts[:task_id]
     puts "Killing task of '#{cmd_opts[:id]}' with id '#{cmd_opts[:task_id]}'"
-    tasks = [Marathon::Task.delete(cmd_opts[:id], cmd_opts[:task_id], cmd_opts[:scale])]
+    tasks = [Marathon::Task.delete(cmd_opts[:task_id], cmd_opts[:scale])]
   elsif cmd_opts[:host]
     puts "Killing tasks of '#{cmd_opts[:id]}' on host '#{cmd_opts[:host]}'"
     tasks = Marathon::Task.delete_all(cmd_opts[:id], cmd_opts[:host], cmd_opts[:scale])

data/lib/marathon.rb

@@ -37,7 +37,7 @@ module Marathon
     attr_reader :connection
 
     def initialize(url, options)
-      @connection = Connection.new(url,options)
+      @connection = Connection.new(url, options)
     end
 
     def ping
@@ -88,7 +88,7 @@ module Marathon
 
   attr_reader :singleton
 
-  @singleton = MarathonInstance::new(DEFAULT_URL,{})
+  @singleton = MarathonInstance::new(DEFAULT_URL, {})
 
   # Get the marathon url from environment
   def env_url
@@ -134,7 +134,7 @@ module Marathon
 
 
   def reset_singleton!
-    @singleton = MarathonInstance.new(url,options)
+    @singleton = MarathonInstance.new(url, options)
   end
 
   def reset_connection!
@@ -156,7 +156,5 @@ module Marathon
   end
 
   module_function :connection, :env_options, :env_url, :info, :logger, :logger=, :ping, :metrics,
-                  :options, :options=, :url, :url= ,:reset_connection!,:reset_singleton!,:singleton
-
-
+                  :options, :options=, :url, :url=, :reset_connection!, :reset_singleton!, :singleton
 end

data/lib/marathon/app.rb

@@ -7,10 +7,10 @@ class Marathon::App < Marathon::Base
                   deployments uris user version labels ]
 
   DEFAULTS = {
-    :env => {},
-    :labels => {},
-    :ports => [],
-    :uris => [],
+      :env => {},
+      :labels => {},
+      :ports => [],
+      :uris => [],
   }
 
   attr_reader :healthChecks, :constraints, :container, :read_only, :tasks
@@ -19,7 +19,8 @@ class Marathon::App < Marathon::Base
   # ++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, marathon_instance, read_only = false)
+  # ++marathon_instance++: MarathonInstance holding a connection to marathon
+  def initialize(hash, marathon_instance = Marathon.singleton, 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
@@ -121,17 +122,20 @@ class Marathon::App < Marathon::Base
   # 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_container}
-#{pretty_uris}
-#{pretty_env}
-#{pretty_constraints}
-Version:    #{version}
-    ].gsub(/\n\n+/, "\n").strip
+    App ID:     #{id}
+    Instances:  #{tasks.size}/#{instances}
+    Command:    #{cmd}
+    CPUs:       #{cpus}
+    Memory:     #{mem} MB
+    #{pretty_container}
+    #{pretty_uris}
+    #{pretty_env}
+    #{pretty_constraints}
+    Version:    #{version}
+    ]
+        .gsub(/\n\s+/, "\n")
+        .gsub(/\n\n+/, "\n")
+        .strip
   end
 
   private
@@ -143,7 +147,7 @@ Version:    #{version}
   end
 
   def pretty_env
-    env.map { |k,v| "ENV:        #{k}=#{v}" }.join("\n")
+    env.map { |k, v| "ENV:        #{k}=#{v}" }.join("\n")
   end
 
   def pretty_uris
@@ -181,7 +185,7 @@ Version:    #{version}
     #               "apps.tasks". Apps' tasks are not embedded in the response by default.
     #               "apps.failures". Apps' last failures are not embedded in the response by default.
     def list(cmd = nil, embed = nil, id=nil, label=nil)
-      Marathon.singleton.apps.list(cmd,embed, id, label)
+      Marathon.singleton.apps.list(cmd, embed, id, label)
     end
 
     # Delete the application with id.
@@ -189,6 +193,7 @@ Version:    #{version}
     def delete(id)
       Marathon.singleton.apps.delete(id)
     end
+
     alias :remove :delete
 
     # Create and start an application.
@@ -197,6 +202,7 @@ Version:    #{version}
     def start(hash)
       Marathon.singleton.apps.start(hash)
     end
+
     alias :create :start
 
     # Restart the application with id.
@@ -204,7 +210,7 @@ Version:    #{version}
     # ++force++: If the app 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 restart(id, force = false)
-      Marathon.singleton.apps.restart(id,force)
+      Marathon.singleton.apps.restart(id, force)
     end
 
     # Change parameters of a running application. The new application parameters apply only to subsequently
@@ -214,7 +220,7 @@ Version:    #{version}
     # ++force++: If the app 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)
-      Marathon.singleton.apps.change(id,hash,force)
+      Marathon.singleton.apps.change(id, hash, force)
     end
 
     # List the versions of the application with id.
@@ -227,7 +233,7 @@ Version:    #{version}
     # ++id++: Application id
     # ++version++: Version name
     def version(id, version)
-      Marathon.singleton.apps.version(id,version)
+      Marathon.singleton.apps.version(id, version)
     end
   end
 end

data/lib/marathon/connection.rb

@@ -5,9 +5,9 @@ class Marathon::Connection
   include HTTParty
 
   headers(
-    'Content-Type' => 'application/json',
-    'Accept' => 'application/json',
-    'User-Agent' => "ub0r/Marathon-API #{Marathon::VERSION}"
+      'Content-Type' => 'application/json',
+      'Accept' => 'application/json',
+      'User-Agent' => "ub0r/Marathon-API #{Marathon::VERSION}"
   )
 
   default_timeout 5
@@ -23,8 +23,8 @@ class Marathon::Connection
     @options = options
     if @options[:username] and @options[:password]
       @options[:basic_auth] = {
-        :username => @options[:username],
-        :password => @options[:password]
+          :username => @options[:username],
+          :password => @options[:password]
       }
       @options.delete(:username)
       @options.delete(:password)
@@ -47,14 +47,14 @@ class Marathon::Connection
     "Marathon::Connection { :url => #{url} :options => #{options} }"
   end
 
-private
+  private
 
   # Create URL suffix for a hash of query parameters.
   # URL escaping is done internally.
   # ++query++: Hash of query parameters.
   def query_params(query)
-    query = query.select { |k,v| !v.nil? }
-    URI.escape(query.map { |k,v| "#{k}=#{v}" }.join('&'))
+    query = query.select { |k, v| !v.nil? }
+    URI.escape(query.map { |k, v| "#{k}=#{v}" }.join('&'))
   end
 
   # Create request object.
@@ -68,9 +68,9 @@ private
     headers = opts.delete(:headers) || {}
     opts[:body] = opts[:body].to_json unless opts[:body].nil?
     {
-      :method        => http_method,
-      :url           => "#{@url}#{path}",
-      :query         => query
+        :method => http_method,
+        :url => "#{@url}#{path}",
+        :query => query
     }.merge(@options).merge(opts).reject { |_, v| v.nil? }
   end
 

data/lib/marathon/constraint.rb

@@ -7,7 +7,7 @@ class Marathon::Constraint < Marathon::Base
   def initialize(array)
     raise Marathon::Error::ArgumentError, 'array must be an Array' unless array.is_a?(Array)
     raise Marathon::Error::ArgumentError,
-      'array must be [attribute, operator, parameter] where only parameter is optional' \
+          'array must be [attribute, operator, parameter] where only parameter is optional' \
       unless array.size != 2 or array.size != 3
     super
   end

data/lib/marathon/container.rb

@@ -6,8 +6,8 @@ class Marathon::Container < Marathon::Base
   SUPPERTED_TYPES = %w[ DOCKER MESOS]
   ACCESSORS = %w[ type ]
   DEFAULTS = {
-    :type => 'DOCKER',
-    :volumes => []
+      :type => 'DOCKER',
+      :volumes => []
   }
 
   attr_reader :docker, :volumes

data/lib/marathon/container_docker.rb

@@ -4,8 +4,8 @@ class Marathon::ContainerDocker < Marathon::Base
 
   ACCESSORS = %w[ image network privileged parameters ]
   DEFAULTS = {
-    :network => 'BRIDGE',
-    :portMappings => []
+      :network => 'BRIDGE',
+      :portMappings => []
   }
 
   attr_reader :portMappings

data/lib/marathon/container_docker_port_mapping.rb

@@ -4,8 +4,8 @@ class Marathon::ContainerDockerPortMapping < Marathon::Base
 
   ACCESSORS = %w[ containerPort hostPort servicePort protocol ]
   DEFAULTS = {
-    :protocol => 'tcp',
-    :hostPort => 0
+      :protocol => 'tcp',
+      :hostPort => 0
   }
 
   # Create a new container docker port mappint object.

data/lib/marathon/container_volume.rb

@@ -4,7 +4,7 @@ class Marathon::ContainerVolume < Marathon::Base
 
   ACCESSORS = %w[ containerPath hostPath mode ]
   DEFAULTS = {
-    :mode => 'RW'
+      :mode => 'RW'
   }
 
   # Create a new container volume object.

data/lib/marathon/deployment.rb

@@ -22,6 +22,7 @@ class Marathon::Deployment < Marathon::Base
   def delete(force = false)
     @marathon_instance.deployments.delete(id, force)
   end
+
   alias :cancel :delete
 
   def to_s
@@ -42,8 +43,9 @@ class Marathon::Deployment < Marathon::Base
     #            is created to restore the previous configuration. If set to true, then the deployment
     #            is still canceled but no rollback deployment is created.
     def delete(id, force = false)
-      Marathon.singleton.deployments.delete(id,force)
+      Marathon.singleton.deployments.delete(id, force)
     end
+
     alias :cancel :delete
     alias :remove :delete
   end
@@ -55,6 +57,7 @@ class Marathon::Deployments
     @marathon_instance = marathon_instance
     @connection = @marathon_instance.connection
   end
+
   # List running deployments.
   def list
     json = @connection.get('/v2/deployments')

data/lib/marathon/deployment_action.rb

@@ -10,6 +10,7 @@ class Marathon::DeploymentAction < Marathon::Base
   def type
     info[:type] || info[:action]
   end
+
   alias :action :type
 
   def to_pretty_s

data/lib/marathon/deployment_info.rb

@@ -6,7 +6,8 @@ class Marathon::DeploymentInfo < Marathon::Base
 
   # Create a new deployment info object.
   # ++hash++: Hash returned by API, including 'deploymentId' and 'version'
-  def initialize(hash, marathon_instance)
+  # ++marathon_instance++: MarathonInstance holding a connection to marathon
+  def initialize(hash, marathon_instance = Marathon.singleton)
     super(hash, %w[deploymentId version])
     raise Marathon::Error::ArgumentError, 'version must not be nil' unless version
     @marathon_instance = marathon_instance
@@ -17,7 +18,7 @@ class Marathon::DeploymentInfo < Marathon::Base
   def wait(timeout = 60)
     Timeout::timeout(timeout) do
       deployments = nil
-      while deployments.nil? or deployments.select{|e| e.id == deploymentId}.size > 0 do
+      while deployments.nil? or deployments.any? { |e| e.id == deploymentId } do
         sleep(RECHECK_INTERVAL)
         deployments = @marathon_instance.deployments.list
       end

data/lib/marathon/deployment_step.rb

@@ -15,7 +15,7 @@ class Marathon::DeploymentStep < Marathon::Base
   end
 
   def to_s
-    "Marathon::DeploymentStep { :actions => #{actions.map{|e| e.to_pretty_s}.join(',')} }"
+    "Marathon::DeploymentStep { :actions => #{actions.map { |e| e.to_pretty_s }.join(',')} }"
   end
 
 end

data/lib/marathon/error.rb

@@ -2,28 +2,36 @@
 module Marathon::Error
   # The default error. It's never actually raised, but can be used to catch all
   # gem-specific errors that are thrown as they all subclass from this.
-  class MarathonError < StandardError; end
+  class MarathonError < StandardError;
+  end
 
   # Raised when invalid arguments are passed to a method.
-  class ArgumentError < MarathonError; end
+  class ArgumentError < MarathonError;
+  end
 
   # Raised when a request returns a 400 or 422.
-  class ClientError < MarathonError; end
+  class ClientError < MarathonError;
+  end
 
   # Raised when a request returns a 404.
-  class NotFoundError < MarathonError; end
+  class NotFoundError < MarathonError;
+  end
 
   # Raised when there is an unexpected response code / body.
-  class UnexpectedResponseError < MarathonError; end
+  class UnexpectedResponseError < MarathonError;
+  end
 
   # Raised when a request times out.
-  class TimeoutError < MarathonError; end
+  class TimeoutError < MarathonError;
+  end
 
   # Raised when login fails.
-  class AuthenticationError < MarathonError; end
+  class AuthenticationError < MarathonError;
+  end
 
   # Raised when an IO action fails.
-  class IOError < MarathonError; end
+  class IOError < MarathonError;
+  end
 
   # Raise error specific to http response.
   # ++response++: HTTParty response object.
@@ -37,14 +45,14 @@ module Marathon::Error
   # ++response++: HTTParty response object.
   def error_class(response)
     case response.code
-    when 400
-      ClientError
-    when 422
-      ClientError
-    when 404
-      NotFoundError
-    else
-      UnexpectedResponseError
+      when 400
+        ClientError
+      when 422
+        ClientError
+      when 404
+        NotFoundError
+      else
+        UnexpectedResponseError
     end
   end
 

data/lib/marathon/event_subscriptions.rb

@@ -2,7 +2,7 @@
 # See https://mesosphere.github.io/marathon/docs/rest-api.html#event-subscriptions for full list of API's methods.
 class Marathon::EventSubscriptions
 
-  def initialize(marathon_instance)
+  def initialize(marathon_instance = Marathon.singleton)
     @connection = marathon_instance.connection
   end
 

data/lib/marathon/group.rb

@@ -13,7 +13,8 @@ class Marathon::Group < Marathon::Base
   # Create a new group object.
   # ++hash++: Hash including all attributes.
   #           See https://mesosphere.github.io/marathon/docs/rest-api.html#post-/v2/groups for full details.
-  def initialize(hash, marathon_instance)
+  # ++marathon_instance++: MarathonInstance holding a connection to marathon
+  def initialize(hash, marathon_instance = Marathon.singleton)
     super(Marathon::Util.merge_keywordized_hash(DEFAULTS, hash), ACCESSORS)
     @marathon_instance = marathon_instance
     raise ArgumentError, 'Group must have an id' unless id

data/lib/marathon/health_check.rb

@@ -3,13 +3,13 @@
 class Marathon::HealthCheck < Marathon::Base
 
   DEFAULTS = {
-    :gracePeriodSeconds => 300,
-    :intervalSeconds => 60,
-    :maxConsecutiveFailures => 3,
-    :path => '/',
-    :portIndex => 0,
-    :protocol => 'HTTP',
-    :timeoutSeconds => 20
+      :gracePeriodSeconds => 300,
+      :intervalSeconds => 60,
+      :maxConsecutiveFailures => 3,
+      :path => '/',
+      :portIndex => 0,
+      :protocol => 'HTTP',
+      :timeoutSeconds => 20
   }
 
   ACCESSORS = %w[ command gracePeriodSeconds intervalSeconds maxConsecutiveFailures