marathon-api 2.0.0 → 2.0.1

data/lib/marathon/leader.rb

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

data/lib/marathon/queue.rb

@@ -6,7 +6,8 @@ class Marathon::Queue < Marathon::Base
 
   # Create a new queue element object.
   # ++hash++: Hash returned by API, including 'app' and 'delay'
-  def initialize(hash, marathon_instance)
+  # ++marathon_instance++: MarathonInstance holding a connection to marathon
+  def initialize(hash, marathon_instance = Marathon.singleton)
     super(hash, %w[delay])
     @app = Marathon::App.new(info[:app], marathon_instance, true)
     @marathon_instance = marathon_instance

data/lib/marathon/task.rb

@@ -6,7 +6,8 @@ class Marathon::Task < Marathon::Base
 
   # Create a new task object.
   # ++hash++: Hash including all attributes
-  def initialize(hash, marathon_instance)
+  # ++marathon_instance++: MarathonInstance holding a connection to marathon
+  def initialize(hash, marathon_instance = Marathon.singleton)
     super(hash, ACCESSORS)
     @marathon_instance = marathon_instance
   end
@@ -17,6 +18,7 @@ class Marathon::Task < Marathon::Base
   def delete!(scale = false)
     new_task = self.class.delete(id, scale)
   end
+
   alias :kill! :delete!
 
   def to_s
@@ -56,8 +58,9 @@ Version:    #{version}
     # ++scale++: Scale the app down (i.e. decrement its instances setting by the number of tasks killed)
     #            after killing the specified tasks.
     def delete(ids, scale = false)
-      Marathon.singleton.tasks.delete(ids,scale)
+      Marathon.singleton.tasks.delete(ids, scale)
     end
+
     alias :remove :delete
     alias :kill :delete
 
@@ -67,8 +70,9 @@ Version:    #{version}
     # ++scale++: Scale the app down (i.e. decrement its instances setting by the number of tasks killed)
     #            after killing the specified tasks.
     def delete_all(appId, host = nil, scale = false)
-      Marathon.singleton.tasks.delete_all(appId,host,scale)
+      Marathon.singleton.tasks.delete_all(appId, host, scale)
     end
+
     alias :remove_all :delete_all
     alias :kill_all :delete_all
   end

data/lib/marathon/util.rb

@@ -18,10 +18,10 @@ class Marathon::Util
         unless allowed.include?(value)
           if nil_allowed
             raise Marathon::Error::ArgumentError,
-              "#{name} must be one of #{allowed.join(', ')} or nil, but is '#{value}'"
+                  "#{name} must be one of #{allowed.join(', ')} or nil, but is '#{value}'"
           else
             raise Marathon::Error::ArgumentError,
-              "#{name} must be one of #{allowed.join(', ')} or nil, but is '#{value}'"
+                  "#{name} must be one of #{allowed.join(', ')} or nil, but is '#{value}'"
           end
         end
       end
@@ -43,12 +43,12 @@ class Marathon::Util
     # ++ignore_keys++: don't keywordize hashes under theses keys
     def keywordize_hash!(hash, ignore_keys = [:env])
       if hash.is_a?(Hash)
-        hmap!(hash) do |k,v|
+        hmap!(hash) do |k, v|
           key = k.to_sym
           if ignore_keys.include?(key) and v.is_a?(Hash)
-            { key => v }
+            {key => v}
           else
-            { key => keywordize_hash!(v) }
+            {key => keywordize_hash!(v)}
           end
         end
       elsif hash.is_a?(Array)
@@ -63,7 +63,7 @@ class Marathon::Util
     def remove_keys(hash, keys)
       if hash.is_a?(Hash)
         new_hash = {}
-        hash.each { |k,v| new_hash[k] = remove_keys(v, keys) unless keys.include?(k) }
+        hash.each { |k, v| new_hash[k] = remove_keys(v, keys) unless keys.include?(k) }
         new_hash
       elsif hash.is_a?(Array)
         hash.map { |e| remove_keys(e, keys) }
@@ -82,7 +82,7 @@ class Marathon::Util
       if item.nil?
         nil
       elsif item.is_a?(Array)
-        item.map {|e| e.to_pretty_s}.join(',')
+        item.map { |e| e.to_pretty_s }.join(',')
       else
         item.to_pretty_s
       end

data/lib/marathon/version.rb

@@ -1,3 +1,3 @@
 module Marathon
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

data/spec/marathon/app_spec.rb

@@ -4,18 +4,18 @@ describe Marathon::App do
 
   describe '#to_s' do
     subject { described_class.new({
-      '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'],
-      'labels' => {'abc'=>'123'},
-      'version' => 'foo-version'
-    }, double(Marathon::MarathonInstance)) }
+                                      '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'],
+                                      'labels' => {'abc' => '123'},
+                                      'version' => 'foo-version'
+                                  }, double(Marathon::MarathonInstance)) }
 
     let(:expected_string) do
       "Marathon::App { :id => /app/foo }"
@@ -40,7 +40,7 @@ describe Marathon::App do
   end
 
   describe '#to_json' do
-    subject { described_class.new({ 'id' => '/app/foo' }, double(Marathon::MarathonInstance)) }
+    subject { described_class.new({'id' => '/app/foo'}, double(Marathon::MarathonInstance)) }
 
     let(:expected_string) do
       '{"env":{},"labels":{},"ports":[],"uris":[],"id":"/app/foo"}'
@@ -50,7 +50,7 @@ describe Marathon::App do
   end
 
   describe '#check_read_only' do
-    subject { described_class.new({ 'id' => '/ubuntu2' }, double(Marathon::MarathonInstance), true) }
+    subject { described_class.new({'id' => '/ubuntu2'}, double(Marathon::MarathonInstance), true) }
 
     it 'does not allow changing the app' do
       expect { subject.change!({}) }.to raise_error(Marathon::Error::ArgumentError)
@@ -59,8 +59,12 @@ describe Marathon::App do
 
   describe '#container' do
     subject { described_class.new({
-      'id' => '/ubuntu2', 'container' => {'type'=>'DOCKER', 'docker'=>{'image'=>'felixb/yocto-httpd'}}
-    }, double(Marathon::MarathonInstance))}
+                                      'id' => '/ubuntu2',
+                                      'container' => {
+                                          'type' => 'DOCKER',
+                                          'docker' => {'image' => 'felixb/yocto-httpd'}
+                                      }
+                                  }, double(Marathon::MarathonInstance)) }
 
     it 'has container' do
       expect(subject.container).to be_instance_of(Marathon::Container)
@@ -69,7 +73,7 @@ describe Marathon::App do
   end
 
   describe '#constraints' do
-    subject { described_class.new({ 'id' => '/ubuntu2', 'constraints' => [['hostname', 'UNIQUE']] },
+    subject { described_class.new({'id' => '/ubuntu2', 'constraints' => [['hostname', 'UNIQUE']]},
                                   double(Marathon::MarathonInstance)) }
 
     it 'has constraints' do
@@ -99,7 +103,7 @@ describe Marathon::App do
   end
 
   describe '#constraints' do
-    subject { described_class.new({ 'id' => '/ubuntu2', 'healthChecks' => [{ 'path' => '/ping' }] },
+    subject { described_class.new({'id' => '/ubuntu2', 'healthChecks' => [{'path' => '/ping'}]},
                                   double(Marathon::MarathonInstance)) }
 
     it 'has healthChecks' do
@@ -109,7 +113,7 @@ describe Marathon::App do
   end
 
   describe '#tasks' do
-    subject { described_class.new({ 'id' => '/ubuntu2' }, double(Marathon::MarathonInstance)) }
+    subject { described_class.new({'id' => '/ubuntu2'}, double(Marathon::MarathonInstance)) }
 
     it 'shows already loaded tasks w/o API call' do
       subject.info[:tasks] = []
@@ -142,26 +146,26 @@ describe Marathon::App do
     before(:each) do
       @apps = double(Marathon::Apps)
       @marathon_instance = double(Marathon::MarathonInstance, :apps => @apps)
-      @subject = described_class.new({ 'id' => '/app/foo' }, @marathon_instance)
+      @subject = described_class.new({'id' => '/app/foo'}, @marathon_instance)
     end
 
     it 'checks for read only' do
       expect(@subject).to receive(:check_read_only)
       expect(@apps).to receive(:change).with(
           '/app/foo',
-          {:env=>{}, :labels=>{}, :ports=>[], :uris=>[], :id=>"/app/foo"},
+          {:env => {}, :labels => {}, :ports => [], :uris => [], :id => "/app/foo"},
           false
-        )
+      )
       @subject.start!
     end
 
     it 'starts the app' do
       expect(@apps).to receive(:change)
-        .with(
-          '/app/foo',
-          {:env=>{}, :labels=>{}, :ports=>[], :uris=>[], :id=>"/app/foo"},
-          false
-        )
+                           .with(
+                               '/app/foo',
+                               {:env => {}, :labels => {}, :ports => [], :uris => [], :id => "/app/foo"},
+                               false
+                           )
       @subject.start!
     end
   end
@@ -170,7 +174,7 @@ describe Marathon::App do
     before(:each) do
       @apps = double(Marathon::Apps)
       @marathon_instance = double(Marathon::MarathonInstance, :apps => @apps)
-      @subject = described_class.new({ 'id' => '/app/foo' }, @marathon_instance)
+      @subject = described_class.new({'id' => '/app/foo'}, @marathon_instance)
     end
 
     it 'checks for read only' do
@@ -181,7 +185,7 @@ describe Marathon::App do
 
     it 'refreshs the app' do
       expect(@apps).to receive(:get).with('/app/foo') do
-        described_class.new({ 'id' => '/app/foo', 'refreshed' => true }, double(Marathon::MarathonInstance))
+        described_class.new({'id' => '/app/foo', 'refreshed' => true}, double(Marathon::MarathonInstance))
       end
       @subject.refresh
       expect(@subject.info[:refreshed]).to be(true)
@@ -189,7 +193,7 @@ describe Marathon::App do
 
     it 'returns the app' do
       expect(@apps).to receive(:get).with('/app/foo') do
-        described_class.new({ 'id' => '/app/foo' }, double(Marathon::MarathonInstance))
+        described_class.new({'id' => '/app/foo'}, double(Marathon::MarathonInstance))
       end
       expect(@subject.refresh).to be @subject
     end
@@ -211,13 +215,13 @@ describe Marathon::App do
 
     it 'restarts the app' do
       expect(@apps).to receive(:restart)
-        .with('/app/foo', false)
+                           .with('/app/foo', false)
       @subject.restart!
     end
 
     it 'restarts the app, force' do
       expect(@apps).to receive(:restart)
-        .with('/app/foo', true)
+                           .with('/app/foo', true)
       @subject.restart!(true)
     end
   end
@@ -236,7 +240,7 @@ describe Marathon::App do
     end
 
     it 'changes the app' do
-      expect(@apps).to receive(:change).with('/app/foo', {:instances => 9000 }, false)
+      expect(@apps).to receive(:change).with('/app/foo', {:instances => 9000}, false)
       @subject.change!('instances' => 9000, 'version' => 'old-version')
     end
   end
@@ -256,12 +260,12 @@ describe Marathon::App do
     end
 
     it 'changes the app' do
-      expect(@subject).to receive(:change!).with({:version => 'old_version' }, false)
+      expect(@subject).to receive(:change!).with({:version => 'old_version'}, false)
       @subject.roll_back!('old_version')
     end
 
     it 'changes the app with force' do
-      expect(@subject).to receive(:change!).with({:version => 'old_version' }, true)
+      expect(@subject).to receive(:change!).with({:version => 'old_version'}, true)
       @subject.roll_back!('old_version', true)
     end
   end
@@ -320,23 +324,23 @@ describe Marathon::App do
 
     it 'passes arguments to api call' do
       expect(Marathon.connection).to receive(:get)
-        .with('/v2/apps', {:cmd => 'foo', :embed => 'apps.tasks'})
-        .and_return({ 'apps' => [] })
+                                         .with('/v2/apps', {:cmd => 'foo', :embed => 'apps.tasks'})
+                                         .and_return({'apps' => []})
       subject.list('foo', 'apps.tasks')
     end
 
     it 'passing id argument to api call' do
       expect(Marathon.connection).to receive(:get)
-        .with('/v2/apps', {:id => '/app/foo'})
-        .and_return({ 'apps' => [] })
+                                         .with('/v2/apps', {:id => '/app/foo'})
+                                         .and_return({'apps' => []})
       subject.list(nil, nil, '/app/foo')
     end
 
     it 'passing label argument to api call' do
       expect(Marathon.connection).to receive(:get)
-        .with('/v2/apps', {:label => 'abc'})
-        .and_return({ 'apps' => [] })
-      subject.list(nil, nil ,nil, 'abc')
+                                         .with('/v2/apps', {:label => 'abc'})
+                                         .and_return({'apps' => []})
+      subject.list(nil, nil, nil, 'abc')
     end
 
     it 'raises error when run with strange embed' do
@@ -358,12 +362,12 @@ describe Marathon::App do
 
     it 'starts the app', :vcr do
       app = subject.start({
-        :id => '/test-app',
-        :cmd => 'sleep 10',
-        :instances => 1,
-        :cpus => 0.1,
-        :mem => 32
-      })
+                              :id => '/test-app',
+                              :cmd => 'sleep 10',
+                              :instances => 1,
+                              :cpus => 0.1,
+                              :mem => 32
+                          })
       expect(app).to be_instance_of(described_class)
       expect(app.id).to eq('/test-app')
       expect(app.instances).to eq(1)
@@ -402,7 +406,7 @@ describe Marathon::App do
 
     it 'deletes the app', :vcr do
       expect(subject.delete('/test-app'))
-        .to be_instance_of(Marathon::DeploymentInfo)
+          .to be_instance_of(Marathon::DeploymentInfo)
     end
 
     it 'fails deleting not existing app', :vcr do
@@ -430,15 +434,15 @@ describe Marathon::App do
     subject { described_class }
 
     it 'changes the app', :vcr do
-      expect(subject.change('/ubuntu2', { 'instances' => 2 }, true))
-        .to be_instance_of(Marathon::DeploymentInfo)
-      expect(subject.change('/ubuntu2', { 'instances' => 1 }, true))
-        .to be_instance_of(Marathon::DeploymentInfo)
+      expect(subject.change('/ubuntu2', {'instances' => 2}, true))
+          .to be_instance_of(Marathon::DeploymentInfo)
+      expect(subject.change('/ubuntu2', {'instances' => 1}, true))
+          .to be_instance_of(Marathon::DeploymentInfo)
     end
 
     it 'fails with stange attributes', :vcr do
       expect {
-        subject.change('/ubuntu2', { 'instances' => 'foo' })
+        subject.change('/ubuntu2', {'instances' => 'foo'})
       }.to raise_error(Marathon::Error::ClientError)
     end
   end

data/spec/marathon/base_spec.rb

@@ -16,10 +16,10 @@ describe Marathon::Base do
 
   describe '#to_json' do
     subject { described_class.new({
-        'app' => { 'id' => '/app/foo' },
-        :foo  => 'blubb',
-        :bar  => 1
-      }) }
+                                      'app' => {'id' => '/app/foo'},
+                                      :foo => 'blubb',
+                                      :bar => 1
+                                  }) }
 
     let(:expected_string) do
       '{"foo":"blubb","bar":1,"app":{"id":"/app/foo"}}'
@@ -30,9 +30,9 @@ describe Marathon::Base do
 
   describe '#attr_readers' do
     subject { described_class.new({
-        'foo' => 'blubb',
-        :bar  => 1
-      }, [:foo, 'bar']) }
+                                      'foo' => 'blubb',
+                                      :bar => 1
+                                  }, [:foo, 'bar']) }
 
     its(:info) { should == {:foo => 'blubb', :bar => 1} }
     its(:foo) { should == 'blubb' }
@@ -41,9 +41,9 @@ describe Marathon::Base do
 
   describe '#attr_readers, from string array' do
     subject { described_class.new({
-        'foo' => 'blubb',
-        :bar  => 1
-      }, %w[foo bar]) }
+                                      'foo' => 'blubb',
+                                      :bar => 1
+                                  }, %w[foo bar]) }
 
     its(:info) { should == {:foo => 'blubb', :bar => 1} }
     its(:foo) { should == 'blubb' }

data/spec/marathon/container_docker_port_mapping_spec.rb

@@ -4,7 +4,7 @@ CONTAINER_DOCKER_PORT_MAPPING_EXAMPLE = {
     :protocol => 'tcp',
     :hostPort => 0,
     :containerPort => 8080
-  }
+}
 
 describe Marathon::ContainerDockerPortMapping do
 
@@ -13,23 +13,23 @@ describe Marathon::ContainerDockerPortMapping do
 
     it 'should fail with invalid protocol' do
       expect { subject.new(:protocol => 'foo', :containerPort => 8080) }
-        .to raise_error(Marathon::Error::ArgumentError, /protocol must be one of /)
+          .to raise_error(Marathon::Error::ArgumentError, /protocol must be one of /)
     end
 
     it 'should fail with invalid containerPort' do
       expect { subject.new(:containerPort => 'foo') }
-        .to raise_error(Marathon::Error::ArgumentError, /containerPort must be/)
+          .to raise_error(Marathon::Error::ArgumentError, /containerPort must be/)
       expect { subject.new(:containerPort => 0) }
-        .not_to raise_error
+          .not_to raise_error
       expect { subject.new(:containerPort => -1) }
-        .to raise_error(Marathon::Error::ArgumentError, /containerPort must be/)
+          .to raise_error(Marathon::Error::ArgumentError, /containerPort must be/)
     end
 
     it 'should fail with invalid hostPort' do
       expect { subject.new(:hostPort => 'foo', :containerPort => 8080) }
-        .to raise_error(Marathon::Error::ArgumentError, /hostPort must be/)
+          .to raise_error(Marathon::Error::ArgumentError, /hostPort must be/)
       expect { subject.new(:hostPort => -1, :containerPort => 8080) }
-        .to raise_error(Marathon::Error::ArgumentError, /hostPort must be/)
+          .to raise_error(Marathon::Error::ArgumentError, /hostPort must be/)
     end
   end