marathon-api 0.9.0 → 1.0.0

data/spec/marathon/health_check_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe Marathon::HealthCheck do
+
+  describe '#init' do
+    subject { described_class.new({'protocol' => 'TCP'}) }
+
+    its(:protocol) { should == 'TCP' }
+    its(:portIndex) { should == 0 }
+    its(:timeoutSeconds) { should == 20 }
+  end
+
+  describe '#to_s with protocol==HTTP' do
+    subject { described_class.new({'protocol' => 'HTTP', 'portIndex' => 0, 'path' => '/ping'}) }
+
+    let(:expected_string) do
+      'Marathon::HealthCheck { :protocol => HTTP :portIndex => 0 :path => /ping }'
+    end
+
+    its(:to_s) { should == expected_string }
+  end
+
+  describe '#to_s with protocol==TCP' do
+    subject { described_class.new({'protocol' => 'TCP', 'portIndex' => 0, 'path' => '/ping'}) }
+
+    let(:expected_string) do
+      'Marathon::HealthCheck { :protocol => TCP :portIndex => 0 }'
+    end
+
+    its(:to_s) { should == expected_string }
+  end
+
+  describe '#to_s with protocol==COMMAND' do
+    subject { described_class.new({'protocol' => 'COMMAND', 'command' => 'true'}) }
+
+    let(:expected_string) do
+      'Marathon::HealthCheck { :protocol => COMMAND :command => true }'
+    end
+
+    its(:to_s) { should == expected_string }
+  end
+
+  describe '#to_json' do
+    subject { described_class.new({'protocol' => 'HTTP', 'portIndex' => 0, 'path' => '/ping'}) }
+
+    its(:to_json) { should == '{"gracePeriodSeconds":300,"intervalSeconds":60,"maxConsecutiveFailures":3,' \
+      + '"path":"/ping","portIndex":0,"protocol":"HTTP","timeoutSeconds":20}' }
+  end
+
+end

data/spec/marathon/marathon_spec.rb

@@ -24,6 +24,37 @@ describe Marathon do
     end
   end
 
+  describe '.options=' do
+    subject { described_class }
+
+    it 'sets new options' do
+      described_class.options = {:foo => 'bar'}
+      expect(described_class.options).to eq({:foo => 'bar'})
+
+      # reset connection after running this spec
+      described_class.options = nil
+    end
+
+    it 'resets connection' do
+      old_connection = described_class.connection
+      described_class.options = {:foo => 'bar'}
+
+      expect(described_class.connection).not_to be(old_connection)
+
+      # reset connection after running this spec
+      described_class.options = nil
+    end
+
+    it 'adds :basic_auth options for :username and :password' do
+      described_class.options = {:username => 'user', :password => 'password'}
+      expect(described_class.connection.options)
+        .to eq({:basic_auth => {:username => 'user', :password => 'password'}})
+
+      # reset connection after running this spec
+      described_class.options = nil
+    end
+  end
+
   describe '.info' do
     subject { described_class }
 

data/spec/marathon/queue_spec.rb

@@ -19,7 +19,7 @@ describe Marathon::Queue do
 
     it 'has delay' do
       expect(subject.delay).to be_instance_of(Hash)
-      expect(subject.delay['overdue']).to be(true)
+      expect(subject.delay[:overdue]).to be(true)
     end
   end
 
@@ -30,7 +30,7 @@ describe Marathon::Queue do
       }) }
 
     let(:expected_string) do
-      'Marathon::Queue { :appId => /app/foo :delay => {"overdue"=>true} }'
+      'Marathon::Queue { :appId => /app/foo :delay => {:overdue=>true} }'
     end
 
     its(:to_s) { should == expected_string }

data/spec/marathon/task_spec.rb

@@ -4,16 +4,29 @@ describe Marathon::Task do
 
   describe '#to_s' do
     subject { described_class.new({
-        'id'    => 'task-id-foo',
-        'appId' => '/app/foo',
-        'host'  => 'foo-host',
+        'id'      => 'task-id-foo',
+        'appId'   => '/app/foo',
+        'host'    => 'foo-host',
+        'ports'   => [31000, 31001],
+        'version' => 'foo-version'
       }) }
 
     let(:expected_string) do
       "Marathon::Task { :id => task-id-foo :appId => /app/foo :host => foo-host }"
     end
 
+    let(:expected_pretty_string) do
+      "Task ID:    task-id-foo\n" + \
+      "App ID:     /app/foo\n" + \
+      "Host:       foo-host\n" + \
+      "Ports:      31000,31001\n" + \
+      "Staged at:  \n" + \
+      "Started at: \n" + \
+      "Version:    foo-version"
+    end
+
     its(:to_s) { should == expected_string }
+    its(:to_pretty_s) { should == expected_pretty_string }
   end
 
   describe '#to_json' do
@@ -42,7 +55,7 @@ describe Marathon::Task do
         })
       end
       task.delete!
-      expect(task.info['deleted']).to be(true)
+      expect(task.info[:deleted]).to be(true)
     end
   end
 
@@ -51,18 +64,18 @@ describe Marathon::Task do
 
     it 'raises error when run with strange status' do
       expect {
-        described_class.list('foo')
+        subject.list('foo')
       }.to raise_error(Marathon::Error::ArgumentError)
     end
 
     it 'lists tasks', :vcr do
-      tasks = described_class.list
+      tasks = subject.list
       expect(tasks.size).to be_within(1).of(2)
       expect(tasks.first).to be_instance_of(described_class)
     end
 
     it 'lists running tasks', :vcr do
-      tasks = described_class.list('running')
+      tasks = subject.list('running')
       expect(tasks.size).to be_within(1).of(2)
       expect(tasks.first).to be_instance_of(described_class)
     end
@@ -72,7 +85,7 @@ describe Marathon::Task do
     subject { described_class }
 
     it 'gets tasks of an app', :vcr do
-      tasks = described_class.get('/ubuntu2')
+      tasks = subject.get('/ubuntu2')
       expect(tasks.size).to eq(1)
       expect(tasks.first).to be_instance_of(described_class)
       expect(tasks.first.appId).to eq('/ubuntu2')
@@ -83,8 +96,8 @@ describe Marathon::Task do
     subject { described_class }
 
     it 'kills a tasks of an app', :vcr do
-      tasks = described_class.get('/ubuntu2')
-      task = described_class.delete('/ubuntu2', tasks.first.id)
+      tasks = subject.get('/ubuntu2')
+      task = subject.delete('/ubuntu2', tasks.first.id)
       task.id == tasks.first.id
     end
   end
@@ -93,7 +106,7 @@ describe Marathon::Task do
     subject { described_class }
 
     it 'kills all tasks of an app', :vcr do
-      described_class.delete_all('/ubuntu2')
+      subject.delete_all('/ubuntu2')
     end
   end
 

data/spec/marathon/util_spec.rb

@@ -41,4 +41,24 @@ describe Marathon::Util do
     end
   end
 
-end
+  describe '.keywordize_hash' do
+    subject { described_class }
+
+    it 'keywordizes the hash' do
+      expect(subject.keywordize_hash({
+        'foo'  => 'bar',
+        'f00'  => {'w00h00'  => 'yeah'},
+        'bang' => [{'tricky' => 'one'}],
+        'env'  => {'foo' => 'bar'},
+        'null' => nil
+      })).to eq({
+        :foo  => 'bar',
+        :f00  => {:w00h00  => 'yeah'},
+        :bang => [{:tricky => 'one'}],
+        :env  => {'foo' => 'bar'},
+        :null => nil
+      })
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marathon-api
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Felix Bechstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.11'
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -166,8 +180,9 @@ dependencies:
         version: '0'
 description: A simple REST client for the Marathon Remote API
 email:
-- f@ub0r.de
-executables: []
+- felix.bechstein@otto.de
+executables:
+- marathon
 extensions: []
 extra_rdoc_files: []
 files:
@@ -180,6 +195,7 @@ files:
 - README.md
 - Rakefile
 - TESTING.md
+- bin/marathon
 - fixtures/marathon_docker_sample.json
 - fixtures/marathon_docker_sample_2.json
 - fixtures/vcr/Marathon/_info/returns_the_info_hash.yml
@@ -192,6 +208,7 @@ files:
 - fixtures/vcr/Marathon_App/_get/gets_the_app.yml
 - fixtures/vcr/Marathon_App/_list/lists_apps.yml
 - fixtures/vcr/Marathon_App/_restart/fails_restarting_not_existing_app.yml
+- 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
@@ -202,6 +219,14 @@ files:
 - 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/_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
+- fixtures/vcr/Marathon_Group/_get/gets_the_group.yml
+- fixtures/vcr/Marathon_Group/_list/lists_apps.yml
+- fixtures/vcr/Marathon_Group/_start/fails_getting_not_existing_group.yml
+- fixtures/vcr/Marathon_Group/_start/starts_the_group.yml
 - fixtures/vcr/Marathon_Leader/_delete/delete/.yml
 - fixtures/vcr/Marathon_Leader/_get/get/.yml
 - fixtures/vcr/Marathon_Queue/_list/lists_queue.yml
@@ -212,10 +237,19 @@ files:
 - fixtures/vcr/Marathon_Task/_list/lists_tasks.yml
 - lib/marathon.rb
 - lib/marathon/app.rb
+- lib/marathon/base.rb
 - lib/marathon/connection.rb
+- lib/marathon/constraint.rb
+- lib/marathon/container.rb
+- lib/marathon/container_docker.rb
+- lib/marathon/container_docker_port_mapping.rb
+- lib/marathon/container_volume.rb
 - lib/marathon/deployment.rb
+- lib/marathon/deployment_info.rb
 - lib/marathon/error.rb
 - lib/marathon/event_subscriptions.rb
+- lib/marathon/group.rb
+- lib/marathon/health_check.rb
 - lib/marathon/leader.rb
 - lib/marathon/queue.rb
 - lib/marathon/task.rb
@@ -223,17 +257,26 @@ files:
 - lib/marathon/version.rb
 - marathon-api.gemspec
 - spec/marathon/app_spec.rb
+- spec/marathon/base_spec.rb
 - spec/marathon/connection_spec.rb
+- spec/marathon/constraint_spec.rb
+- spec/marathon/container_docker_port_mapping_spec.rb
+- spec/marathon/container_docker_spec.rb
+- spec/marathon/container_spec.rb
+- spec/marathon/container_volume_spec.rb
+- spec/marathon/deployment_info_spec.rb
 - spec/marathon/deployment_spec.rb
 - spec/marathon/error_spec.rb
 - spec/marathon/event_subscriptions_spec.rb
+- spec/marathon/group_spec.rb
+- spec/marathon/health_check_spec.rb
 - spec/marathon/leader_spec.rb
 - spec/marathon/marathon_spec.rb
 - spec/marathon/queue_spec.rb
 - spec/marathon/task_spec.rb
 - spec/marathon/util_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/felixb/marathon-api
+homepage: https://github.com/otto-de/marathon-api
 licenses:
 - MIT
 metadata: {}
@@ -253,16 +296,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: A simple REST client for the Marathon Remote API
 test_files:
 - spec/marathon/app_spec.rb
+- spec/marathon/base_spec.rb
 - spec/marathon/connection_spec.rb
+- spec/marathon/constraint_spec.rb
+- spec/marathon/container_docker_port_mapping_spec.rb
+- spec/marathon/container_docker_spec.rb
+- spec/marathon/container_spec.rb
+- spec/marathon/container_volume_spec.rb
+- spec/marathon/deployment_info_spec.rb
 - spec/marathon/deployment_spec.rb
 - spec/marathon/error_spec.rb
 - spec/marathon/event_subscriptions_spec.rb
+- spec/marathon/group_spec.rb
+- spec/marathon/health_check_spec.rb
 - spec/marathon/leader_spec.rb
 - spec/marathon/marathon_spec.rb
 - spec/marathon/queue_spec.rb