marathon-api 1.1.0 → 1.2.0

data/spec/marathon/app_spec.rb

@@ -266,7 +266,6 @@ describe Marathon::App do
       apps = subject.list
       expect(apps.size).not_to eq(0)
       expect(apps.first).to be_instance_of(described_class)
-      expect(apps.first.cpus).to eq(0.1)
     end
 
   end
@@ -276,15 +275,14 @@ describe Marathon::App do
 
     it 'starts the app', :vcr do
       app = subject.start({
-        :id => '/test',
+        :id => '/test-app',
         :cmd => 'sleep 10',
         :instances => 1,
         :cpus => 0.1,
-        :mem => 32,
-        :version => 'foo-version'
+        :mem => 32
       })
       expect(app).to be_instance_of(described_class)
-      expect(app.id).to eq('/test')
+      expect(app.id).to eq('/test-app')
       expect(app.instances).to eq(1)
       expect(app.cpus).to eq(0.1)
       expect(app.mem).to eq(32)
@@ -320,7 +318,7 @@ describe Marathon::App do
     subject { described_class }
 
     it 'deletes the app', :vcr do
-      subject.delete('/ubuntu')
+      subject.delete('/test-app')
     end
 
     it 'fails deleting not existing app', :vcr do
@@ -348,7 +346,7 @@ describe Marathon::App do
     subject { described_class }
 
     it 'changes the app', :vcr do
-      expect(subject.change('/ubuntu2', { 'instances' => 2 }))
+      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)

data/spec/marathon/deployment_action_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+DEPLOYMENT_ACTION_EXAMPLE = { "app" => "app1", "type" => "StartApplication" }
+
+describe Marathon::DeploymentAction do
+
+  describe '#attributes' do
+    subject { described_class.new(DEPLOYMENT_ACTION_EXAMPLE) }
+
+    its(:app) { should == 'app1' }
+    its(:type) { should == 'StartApplication' }
+  end
+
+  describe '#to_s' do
+    subject { described_class.new(DEPLOYMENT_ACTION_EXAMPLE) }
+
+    let(:expected_string) do
+      'Marathon::DeploymentAction { :app => app1 :type => StartApplication }'
+    end
+
+    its(:to_s) { should == expected_string }
+    its(:to_pretty_s) { should == 'app1/StartApplication' }
+  end
+
+end

data/spec/marathon/deployment_info_spec.rb

@@ -14,6 +14,15 @@ describe Marathon::DeploymentInfo do
     its(:version) { should == 'version-456' }
   end
 
+  describe '#wait' do
+    subject { described_class.new(DEPLOYMENT_INFO_EXAMPLE) }
+
+    it 'waits for the deployment' do
+      expect(Marathon::Deployment).to receive(:list) { [] }
+      subject.wait
+    end
+  end
+
   describe '#to_s' do
     subject { described_class.new(DEPLOYMENT_INFO_EXAMPLE) }
 
@@ -40,4 +49,4 @@ describe Marathon::DeploymentInfo do
     its(:to_json) { should == DEPLOYMENT_INFO_EXAMPLE.to_json }
   end
 
-end
+end

data/spec/marathon/deployment_spec.rb

@@ -70,9 +70,9 @@ describe Marathon::Deployment do
 
     it 'lists deployments', :vcr do
       # start a deployment
-      Marathon::App.change('/test', {:instances => 0})
+      Marathon::App.change('/test-app', {:instances => 0, :cmd => 'sleep 60'}, true)
       sleep 1
-      Marathon::App.change('/test', {:instances => 2})
+      Marathon::App.change('/test-app', {:instances => 2}, true)
       sleep 1
 
       deployments = subject.list
@@ -86,9 +86,13 @@ describe Marathon::Deployment do
 
     it 'deletes deployments', :vcr do
       # start a deployment
-      info = Marathon::App.change('/test', {:instances => 1})
+      info = Marathon::App.change('/test-app', {:instances => 1}, true)
       expect(subject.delete(info.deploymentId)).to be_instance_of(Marathon::DeploymentInfo)
     end
+
+    it 'cleans app from marathon', :vcr do
+      Marathon::App.delete('/test-app')
+    end
   end
 
 end

data/spec/marathon/deployment_step_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+DEPLOYMENT_STEP_EXAMPLE = {
+  "actions" => [
+    { "app" => "app1", "type" => "StartApplication" },
+    { "app" => "app2", "type" => "StartApplication" }
+  ]
+}
+
+describe Marathon::DeploymentStep do
+
+  describe '#attributes' do
+    subject { described_class.new(DEPLOYMENT_STEP_EXAMPLE) }
+
+    it 'has actions' do
+      expect(subject.actions).to be_instance_of(Array)
+      expect(subject.actions.size).to eq(2)
+      expect(subject.actions.first).to be_instance_of(Marathon::DeploymentAction)
+    end
+  end
+
+  describe '#to_s' do
+    subject { described_class.new(DEPLOYMENT_STEP_EXAMPLE) }
+
+    let(:expected_string) do
+      'Marathon::DeploymentStep { :actions => app1/StartApplication,app2/StartApplication }'
+    end
+
+    its(:to_s) { should == expected_string }
+  end
+
+end

data/spec/marathon/event_subscriptions_spec.rb

@@ -19,7 +19,7 @@ describe Marathon::EventSubscriptions do
     it 'lists callbacks', :vcr do
       json = subject.list
       expect(json).to be_instance_of(Array)
-      expect(json).to eq(['http://localhost/events/foo'])
+      expect(json).to include('http://localhost/events/foo')
     end
   end
 
@@ -34,4 +34,4 @@ describe Marathon::EventSubscriptions do
     end
   end
 
-end
+end

data/spec/marathon/group_spec.rb

@@ -23,17 +23,24 @@ EXAMPLE_GROUP = {
           "upgradeStrategy" => {
               "minimumHealthCapacity" => 1.0
           },
-          "tasks" => [],
-          "version" => 'foo-version'
+          "tasks" => []
       }
   ],
   "dependencies" => [],
-  "groups" => [],
-  "version" => 'foo-version'
+  "groups" => []
 }
 
 describe Marathon::Group do
 
+  describe '#init' do
+    subject { described_class }
+
+    it 'fails with group + apps' do
+      expect{subject.new(:apps => [{:id => 'app'}], :groups => [{:id => 'group'}], :id => '/foo')}
+        .to raise_error(Marathon::Error::ArgumentError, /Group can have either/)
+    end
+  end
+
   describe '#to_s' do
     subject { described_class.new(EXAMPLE_GROUP) }
 
@@ -48,8 +55,8 @@ describe Marathon::Group do
        "    Command:    sleep 30\n" + \
        "    CPUs:       1.0\n" + \
        "    Memory:     128.0 MB\n" + \
-       "    Version:    foo-version\n" + \
-       "Version:    foo-version"
+       "    Version:\n" + \
+       "Version:"
 
     end
 
@@ -85,12 +92,12 @@ describe Marathon::Group do
     subject { described_class.new({ 'id' => '/app/foo' }) }
 
     it 'changes the group' do
-      expect(described_class).to receive(:change).with('/app/foo', {:instances => 9000 }, false)
+      expect(described_class).to receive(:change).with('/app/foo', {:instances => 9000 }, false, false)
       subject.change!('instances' => 9000)
     end
 
     it 'changes the group and strips :version' do
-      expect(described_class).to receive(:change).with('/app/foo', {:instances => 9000 }, false)
+      expect(described_class).to receive(:change).with('/app/foo', {:instances => 9000 }, false, false)
       subject.change!('instances' => 9000, :version => 'old-version')
     end
   end
@@ -151,6 +158,22 @@ describe Marathon::Group do
     end
   end
 
+  describe '.changes' do
+    subject { described_class }
+
+    it 'previews changes', :vcr do
+      steps = subject.change('/test-group', { 'instances' => 20 }, false, true)
+      expect(steps).to be_instance_of(Array)
+    end
+
+    it 'changes the group', :vcr do
+      expect(subject.change('/test-group', { 'instances' => 2 }, true))
+        .to be_instance_of(Marathon::DeploymentInfo)
+      expect(subject.change('/test-group', { 'instances' => 1 }, true))
+        .to be_instance_of(Marathon::DeploymentInfo)
+    end
+  end
+
   describe '.delete' do
     subject { described_class }
 
@@ -165,15 +188,4 @@ describe Marathon::Group do
     end
   end
 
-  describe '.changes' do
-    subject { described_class }
-
-    it 'changes the group', :vcr do
-      expect(subject.change('/ubuntu2', { 'instances' => 2 }))
-        .to be_instance_of(Marathon::DeploymentInfo)
-      expect(subject.change('/ubuntu2', { 'instances' => 1 }, true))
-        .to be_instance_of(Marathon::DeploymentInfo)
-    end
-  end
-
 end

data/spec/marathon/leader_spec.rb

@@ -5,9 +5,7 @@ describe Marathon::Leader do
   describe '.get', :vcr do
     subject { described_class }
 
-    let(:expected_string) { 'mesos:8080' }
-
-    its(:get) { should == expected_string }
+    its(:get) { is_expected.to be_instance_of(String) }
   end
 
   describe '.delete', :vcr do
@@ -18,4 +16,4 @@ describe Marathon::Leader do
     its(:delete) { should == expected_string }
   end
 
-end
+end

data/spec/marathon/queue_spec.rb

@@ -55,8 +55,7 @@ describe Marathon::Queue do
     it 'lists queue', :vcr do
       queue = described_class.list
       expect(queue).to be_instance_of(Array)
-      expect(queue.first).to be_instance_of(Marathon::Queue)
     end
   end
 
-end
+end

data/spec/marathon/task_spec.rb

@@ -49,13 +49,8 @@ describe Marathon::Task do
     }) }
 
     it 'deletes the task' do
-      expect(described_class).to receive(:delete).with('/app/foo', 'task_123', false) do
-        described_class.new({
-          'id' => 'task_123', 'appId' => '/app/foo', 'deleted' => true
-        })
-      end
+      expect(described_class).to receive(:delete).with('task_123', false)
       task.delete!
-      expect(task.info[:deleted]).to be(true)
     end
   end
 
@@ -86,7 +81,7 @@ describe Marathon::Task do
 
     it 'gets tasks of an app', :vcr do
       tasks = subject.get('/ubuntu2')
-      expect(tasks.size).to eq(1)
+      expect(tasks.size).not_to eq(0)
       expect(tasks.first).to be_instance_of(described_class)
       expect(tasks.first.appId).to eq('/ubuntu2')
     end
@@ -97,8 +92,7 @@ describe Marathon::Task do
 
     it 'kills a tasks of an app', :vcr do
       tasks = subject.get('/ubuntu2')
-      task = subject.delete('/ubuntu2', tasks.first.id)
-      task.id == tasks.first.id
+      subject.delete(tasks.first.id)
     end
   end
 
@@ -110,4 +104,4 @@ describe Marathon::Task do
     end
   end
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marathon-api
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Felix Bechstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -211,15 +211,16 @@ files:
 - fixtures/vcr/Marathon_App/_restart/restarts_an_app.yml
 - fixtures/vcr/Marathon_App/_start/fails_getting_not_existing_app.yml
 - fixtures/vcr/Marathon_App/_start/starts_the_app.yml
-- fixtures/vcr/Marathon_App/_tasks/has_tasks.yml
 - fixtures/vcr/Marathon_App/_version/gets_a_version.yml
 - fixtures/vcr/Marathon_App/_versions/gets_versions.yml
+- fixtures/vcr/Marathon_Deployment/_delete/cleans_app_from_marathon.yml
 - fixtures/vcr/Marathon_Deployment/_delete/deletes_deployments.yml
 - fixtures/vcr/Marathon_Deployment/_list/lists_deployments.yml
 - fixtures/vcr/Marathon_EventSubscriptions/_list/lists_callbacks.yml
 - fixtures/vcr/Marathon_EventSubscriptions/_register/registers_callback.yml
 - fixtures/vcr/Marathon_EventSubscriptions/_unregister/unregisters_callback.yml
 - fixtures/vcr/Marathon_Group/_changes/changes_the_group.yml
+- fixtures/vcr/Marathon_Group/_changes/previews_changes.yml
 - fixtures/vcr/Marathon_Group/_delete/deletes_the_group.yml
 - fixtures/vcr/Marathon_Group/_delete/fails_deleting_not_existing_app.yml
 - fixtures/vcr/Marathon_Group/_get/fails_getting_not_existing_app.yml
@@ -245,7 +246,9 @@ files:
 - lib/marathon/container_docker_port_mapping.rb
 - lib/marathon/container_volume.rb
 - lib/marathon/deployment.rb
+- lib/marathon/deployment_action.rb
 - lib/marathon/deployment_info.rb
+- lib/marathon/deployment_step.rb
 - lib/marathon/error.rb
 - lib/marathon/event_subscriptions.rb
 - lib/marathon/group.rb
@@ -264,8 +267,10 @@ files:
 - spec/marathon/container_docker_spec.rb
 - spec/marathon/container_spec.rb
 - spec/marathon/container_volume_spec.rb
+- spec/marathon/deployment_action_spec.rb
 - spec/marathon/deployment_info_spec.rb
 - spec/marathon/deployment_spec.rb
+- spec/marathon/deployment_step_spec.rb
 - spec/marathon/error_spec.rb
 - spec/marathon/event_subscriptions_spec.rb
 - spec/marathon/group_spec.rb
@@ -309,8 +314,10 @@ test_files:
 - spec/marathon/container_docker_spec.rb
 - spec/marathon/container_spec.rb
 - spec/marathon/container_volume_spec.rb
+- spec/marathon/deployment_action_spec.rb
 - spec/marathon/deployment_info_spec.rb
 - spec/marathon/deployment_spec.rb
+- spec/marathon/deployment_step_spec.rb
 - spec/marathon/error_spec.rb
 - spec/marathon/event_subscriptions_spec.rb
 - spec/marathon/group_spec.rb

data/fixtures/vcr/Marathon_App/_tasks/has_tasks.yml

@@ -1,30 +0,0 @@
----
-http_interactions:
-- request:
-    method: get
-    uri: http://localhost:8080/v2/apps//ubuntu2
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Content-Type:
-      - application/json
-      Accept:
-      - application/json
-  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: '{"app":{"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":[],"tasks":[{"id":"ubuntu2.37fbe1bc-c1d0-11e4-82d4-46b02d3b7f9e","host":"mesos","ports":[31290],"startedAt":"2015-03-03T18:07:57.097Z","stagedAt":"2015-03-03T18:07:56.457Z","version":"2015-03-03T18:07:47.581Z","appId":"/ubuntu2"}],"lastTaskFailure":null}}'
-    http_version: 
-  recorded_at: Tue, 03 Mar 2015 18:08:29 GMT
-recorded_with: VCR 2.9.3