marathon-api 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9835344dde411ccfcafb295094621b8b590e3eff
-  data.tar.gz: 563a4c105700eb6c9cb7b5d860ef7d0348e3452a
+  metadata.gz: 2bcd9ae14a3459ba8f19f3be38d2f1aa5bdb5746
+  data.tar.gz: d3c3091fcdc97ecab48f942588bcba2b8cdeed43
 SHA512:
-  metadata.gz: ad19835b6dc49083c1887d97acc9efef31d08053ab76b04cb8435768c2bc8e60632df9bc7b1f978a9f84f2a5fc0b709e3865c8e2692203beb1863619badcd31d
-  data.tar.gz: 481001f8dbca716bdab68114e6d43e99238dbd2b88d2db54ce135e2b1ecb32a565cb51eafdf60393ea03d283670ca8727d270a376845daa30503c5c5e347e7d2
+  metadata.gz: c16b9ee84d8b507a4c62c8a29b63e2922be7b519986a513b63331241b3f77a27d7d200e2c29d557a4123bb9ad44f1e9c25e64fd2fb4acc16c1610fbcd6ea8a37
+  data.tar.gz: 487c87de5f3a68325c8f421e4006f86f892166ce694d0c4d603cc024390e252ff2339eea2ceda78bed5893f0cb85fbbaa27c4f216c6cc8b48846abd0a331fefc

data/lib/marathon/app.rb

@@ -3,7 +3,8 @@
 class Marathon::App < Marathon::Base
 
   ACCESSORS = %w[ id args cmd cpus disk env executor instances mem ports requirePorts
-                  storeUris tasksHealthy tasksUnhealthy tasksRunning tasksStaged upgradeStrategy uris user version ]
+                  storeUris tasksHealthy tasksUnhealthy tasksRunning tasksStaged upgradeStrategy
+                  uris user version labels ]
 
   DEFAULTS = {
     :env => {},
@@ -122,15 +123,22 @@ Instances:  #{tasks.size}/#{instances}
 Command:    #{cmd}
 CPUs:       #{cpus}
 Memory:     #{mem} MB
-#{pretty_uris()}
-#{pretty_env()}
-#{pretty_constraints()}
+#{pretty_container}
+#{pretty_uris}
+#{pretty_env}
+#{pretty_constraints}
 Version:    #{version}
     ].gsub(/\n\n+/, "\n").strip
   end
 
   private
 
+  def pretty_container
+    if container and container.docker
+      "Docker:     #{container.docker.to_pretty_s}"
+    end
+  end
+
   def pretty_env
     env.map { |k,v| "ENV:        #{k}=#{v}" }.join("\n")
   end
@@ -214,7 +222,7 @@ Version:    #{version}
     def change(id, hash, force = false)
       query = {}
       query[:force] = true if force
-      json = Marathon.connection.put("/v2/apps/#{id}", query, :body => hash)
+      json = Marathon.connection.put("/v2/apps/#{id}", query, :body => hash.merge(:id => id))
       Marathon::DeploymentInfo.new(json)
     end
 

data/lib/marathon/container_docker.rb

@@ -2,7 +2,7 @@
 # See https://mesosphere.github.io/marathon/docs/native-docker.html for full details.
 class Marathon::ContainerDocker < Marathon::Base
 
-  ACCESSORS = %w[ image network ]
+  ACCESSORS = %w[ image network privileged parameters ]
   DEFAULTS = {
     :network => 'BRIDGE',
     :portMappings => []
@@ -15,6 +15,7 @@ class Marathon::ContainerDocker < Marathon::Base
   def initialize(hash)
     super(Marathon::Util.merge_keywordized_hash(DEFAULTS, hash), ACCESSORS)
     Marathon::Util.validate_choice('network', network, %w[BRIDGE HOST])
+    Marathon::Util.validate_choice('privileged', privileged, ['true', 'false', true, false])
     raise Marathon::Error::ArgumentError, 'image must not be nil' unless image
     @portMappings = (info[:portMappings] || []).map { |e| Marathon::ContainerDockerPortMapping.new(e) }
   end

data/lib/marathon/version.rb

@@ -1,3 +1,3 @@
 module Marathon
-  VERSION = '1.2.4'
+  VERSION = '1.2.5'
 end

data/spec/marathon/app_spec.rb

@@ -7,6 +7,9 @@ describe Marathon::App do
       'id' => '/app/foo',
       'instances' => 1,
       'tasks' => [],
+      'container' => {
+        :type => 'DOCKER', 'docker' => { 'image' => 'foo/bar:latest' },
+      },
       'env' => {'FOO' => 'BAR', 'blubb' => 'blah'},
       'constraints' => [['hostname', 'UNIQUE']],
       'uris' => ['http://example.com/big.tar'],
@@ -23,6 +26,7 @@ describe Marathon::App do
       "Command:    \n" + \
       "CPUs:       \n" + \
       "Memory:      MB\n" + \
+      "Docker:     foo/bar:latest\n" + \
       "URI:        http://example.com/big.tar\n" + \
       "ENV:        FOO=BAR\n" + \
       "ENV:        blubb=blah\n" + \
@@ -72,6 +76,16 @@ describe Marathon::App do
     end
   end
 
+  describe '#labels' do
+    subject { described_class.new({ 'id' => '/ubuntu2', 'labels' => { 'env'=>'abc','xyz'=>'123'}}) }
+
+    it 'has labels' do
+      expect(subject.labels).to be_instance_of(Hash)
+      puts subject.labels
+      expect(subject.labels).to have_key(:env)
+    end
+  end
+
   describe '#constraints' do
     subject { described_class.new({ 'id' => '/ubuntu2', 'healthChecks' => [{ 'path' => '/ping' }] }) }
 

data/spec/marathon/container_docker_spec.rb

@@ -1,8 +1,9 @@
 require 'spec_helper'
 
 CONTAINER_DOCKER_EXAMPLE = {
-    :network => 'HOST',
-    :image => 'felixb/yocto-httpd'
+    :network    => 'HOST',
+    :image      => 'felixb/yocto-httpd',
+    :privileged =>  false
   }
 
 describe Marathon::ContainerDocker do
@@ -26,6 +27,17 @@ describe Marathon::ContainerDocker do
 
     its(:network) { should == 'HOST' }
     its(:image) { should == 'felixb/yocto-httpd' }
+    its(:portMappings){ should == [] }
+    its(:privileged){ should == false}
+  end
+  describe '#privileged' do
+    subject { described_class.new({
+        :network    => 'HOST',
+        :image      => 'felixb/yocto-httpd',
+        :privileged =>  true
+      })
+    }
+    its(:privileged){ should == true}
   end
 
   describe '#to_s' do
@@ -39,4 +51,4 @@ describe Marathon::ContainerDocker do
     its(:to_pretty_s) { should == 'felixb/yocto-httpd' }
   end
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marathon-api
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Felix Bechstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json