marathon-api 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbb0e48998c8f3c64b8002009bdba92f13aea4e8
-  data.tar.gz: 19ba1b91937a2455bc175da83552c5ce0f2455f3
+  metadata.gz: 1706cc80987ace99626068137b1f7bea726c7bb9
+  data.tar.gz: 87571a9f41049b0c042ed7adc8f519fa3cc7958d
 SHA512:
-  metadata.gz: f41e51ef482f0a041b13efac4b7d47549419dc29ad8f021bc6e6f426da993d3d29ceaddc73263beeb3c7d312156bbba3a55266d61ce57b93eb0b4fcd7495c6be
-  data.tar.gz: 2c3497dae1b201f45df830c74fc781824b31ff7514b2de7a870942c4d4f6f15d5b898e2b1fee8cb627bad3805f132df6cfa6577ff7ad00820b7a94f4c1c68315
+  metadata.gz: 35be5caa1de1d2b6d5140f548d417cc88610f1b5fe38d652b4011d223168736163c9da34483a460fb729c0a4dcfd7619670e50c998d430bfbdf7f8cd3eed3477
+  data.tar.gz: 63bfa8546577bea9680fc945ccdd4629e418f46530193e0a4617b1a0a17e76385413b00c0b98f95cf66838ae96b3d9d44a56433f08701d34843f5ec2b4724272

data/.ruby-gemset

@@ -0,0 +1 @@
+marathon-api

data/fixtures/vcr/Marathon/_ping/handles_incorrect_content_type.yml

@@ -0,0 +1,44 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://localhost:8080/ping
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Content-Type:
+      - application/json
+      Accept:
+      - application/json
+      User-Agent:
+      - ub0r/Marathon-API 1.3.2
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Wed, 02 Mar 2016 11:32:08 GMT
+      - Wed, 02 Mar 2016 11:32:08 GMT
+      Server:
+      - Jetty(9.3.z-SNAPSHOT)
+      Cache-Control:
+      - must-revalidate,no-cache,no-store
+      Access-Control-Allow-Credentials:
+      - 'true'
+      Expires:
+      - '0'
+      Pragma:
+      - no-cache
+      Content-Type:
+      - application/json; qs=2
+      Content-Length:
+      - '5'
+    body:
+      encoding: UTF-8
+      string: |
+        pong
+    http_version:
+  recorded_at: Wed, 02 Mar 2016 11:32:28 GMT
+recorded_with: VCR 2.9.3

data/lib/marathon.rb

@@ -41,7 +41,12 @@ module Marathon
     end
 
     def ping
-      connection.get('/ping')
+      begin
+        connection.get('/ping')
+      rescue Marathon::Error::UnexpectedResponseError => err
+        return err.response.body if err.response.code == 200
+        raise err
+      end
     end
 
     # Get information about the marathon server

data/lib/marathon/app.rb

@@ -8,8 +8,7 @@ class Marathon::App < Marathon::Base
 
   DEFAULTS = {
       :env => {},
-      :labels => {},
-      :ports => [],
+      :labels => {}
   }
 
   attr_reader :healthChecks, :constraints, :container, :read_only, :tasks

data/lib/marathon/connection.rb

@@ -88,7 +88,11 @@ class Marathon::Connection
   # ++response++: response from HTTParty call.
   def parse_response(response)
     if response.success?
-      response.parsed_response
+      begin
+        response.parsed_response
+      rescue => err
+        raise Marathon::Error.from_response(response)
+      end
     else
       raise Marathon::Error.from_response(response)
     end

data/lib/marathon/error.rb

@@ -19,6 +19,7 @@ module Marathon::Error
 
   # Raised when there is an unexpected response code / body.
   class UnexpectedResponseError < MarathonError;
+    attr_accessor :response
   end
 
   # Raised when a request times out.
@@ -36,7 +37,9 @@ module Marathon::Error
   # Raise error specific to http response.
   # ++response++: HTTParty response object.
   def from_response(response)
-    error_class(response).new(error_message(response))
+    error_class(response).new(error_message(response)).tap do |err|
+      err.response = response if err.is_a?(UnexpectedResponseError)
+    end
   end
 
   private
@@ -69,6 +72,8 @@ module Marathon::Error
     else
       body
     end
+  rescue JSON::ParserError
+    body
   end
 
   module_function :error_class, :error_message, :from_response

data/lib/marathon/group.rb

@@ -19,8 +19,6 @@ class Marathon::Group < Marathon::Base
     @marathon_instance = marathon_instance
     raise ArgumentError, 'Group must have an id' unless id
     refresh_attributes
-    raise ArgumentError, 'Group can have either groups or apps, not both' \
-      if apps.size > 0 and groups.size > 0 and id != '/'
   end
 
   # Reload attributes from marathon API.

data/lib/marathon/version.rb

@@ -1,3 +1,3 @@
 module Marathon
-  VERSION = '2.1.0'
+  VERSION = '2.2.0'
 end

data/spec/marathon/app_spec.rb

@@ -45,7 +45,7 @@ describe Marathon::App do
     subject { described_class.new({'id' => '/app/foo'}, double(Marathon::MarathonInstance)) }
 
     let(:expected_string) do
-      '{"env":{},"labels":{},"ports":[],"id":"/app/foo"}'
+      '{"env":{},"labels":{},"id":"/app/foo"}'
     end
 
     its(:to_json) { should == expected_string }
@@ -155,7 +155,7 @@ describe Marathon::App do
       expect(@subject).to receive(:check_read_only)
       expect(@apps).to receive(:change).with(
           '/app/foo',
-          {:env => {}, :labels => {}, :ports => [], :id => "/app/foo"},
+          {:env => {}, :labels => {}, :id => "/app/foo"},
           false
       )
       @subject.start!
@@ -165,7 +165,7 @@ describe Marathon::App do
       expect(@apps).to receive(:change)
                            .with(
                                '/app/foo',
-                               {:env => {}, :labels => {}, :ports => [], :id => "/app/foo"},
+                               {:env => {}, :labels => {}, :id => "/app/foo"},
                                false
                            )
       @subject.start!

data/spec/marathon/group_spec.rb

@@ -32,14 +32,6 @@ EXAMPLE_GROUP = {
 
 describe Marathon::Group do
 
-  describe '#init' do
-    it 'fails with group + apps' do
-      expect { described_class.new({:apps => [{:id => 'app'}], :groups => [{:id => 'group'}], :id => '/foo'},
-                                   double(Marathon::MarathonInstance)) }
-          .to raise_error(Marathon::Error::ArgumentError, /Group can have either/)
-    end
-  end
-
   describe '#to_s' do
     subject { described_class.new(EXAMPLE_GROUP) }
 

data/spec/marathon/marathon_spec.rb

@@ -91,5 +91,9 @@ describe Marathon do
     it 'returns pong' do
       ping.should == "pong\n"
     end
+
+    it 'handles incorrect content type' do
+      ping.should =~ /pong/
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marathon-api
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Felix Bechstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-13 00:00:00.000000000 Z
+date: 2018-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -174,6 +174,7 @@ extra_rdoc_files: []
 files:
 - ".cane"
 - ".gitignore"
+- ".ruby-gemset"
 - ".simplecov"
 - ".travis.yml"
 - Gemfile
@@ -186,6 +187,7 @@ files:
 - fixtures/marathon_docker_sample_2.json
 - fixtures/vcr/Marathon/_info/returns_the_info_hash.yml
 - fixtures/vcr/Marathon/_metrics/returns_the_metrics_hash.yml
+- fixtures/vcr/Marathon/_ping/handles_incorrect_content_type.yml
 - fixtures/vcr/Marathon/_ping/returns_pong.yml
 - fixtures/vcr/Marathon_App/_changes/changes_the_app.yml
 - fixtures/vcr/Marathon_App/_changes/fails_with_stange_attributes.yml
@@ -291,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A simple REST client for the Marathon Remote API