marathon-api 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b60887f834b4861afd26cac261c219767fbd208
-  data.tar.gz: b25e03b3dc591c0f3503cb60a3c8c4b528fe032e
+  metadata.gz: fbb0e48998c8f3c64b8002009bdba92f13aea4e8
+  data.tar.gz: 19ba1b91937a2455bc175da83552c5ce0f2455f3
 SHA512:
-  metadata.gz: 66917b9f6d31568d01dcab7c31c083ef4a1d53d4423ddb1435c78cb86b76e2b5e069f630c2a9aa920c1ac1bc9e24746baa5894962e9fded20fd698dafae8ba72
-  data.tar.gz: 2d20bb4db6d22dd4c1ebf3cfee576b34616fd10547fa48bb69b43ed70b4965a9d6ed2a9b0e83890058752141051bd1af33028a29ccb5274d63c3944177084bfc
+  metadata.gz: f41e51ef482f0a041b13efac4b7d47549419dc29ad8f021bc6e6f426da993d3d29ceaddc73263beeb3c7d312156bbba3a55266d61ce57b93eb0b4fcd7495c6be
+  data.tar.gz: 2c3497dae1b201f45df830c74fc781824b31ff7514b2de7a870942c4d4f6f15d5b898e2b1fee8cb627bad3805f132df6cfa6577ff7ad00820b7a94f4c1c68315

data/.travis.yml

@@ -1,11 +1,8 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.5
   - 2.2.0
   - 2.3.0
-env:
-  global:
-    - CODECLIMATE_REPO_TOKEN=a0f25c19629dd353c43aef0cbbd886a7a4079c2238711fa4f932e1477b818195
+  - 2.4.0
 script: bundle exec rake

data/README.md

@@ -1,7 +1,7 @@
 marathon-api
 ============
 
-[![Gem Version](https://badge.fury.io/rb/marathon-api.svg)](http://badge.fury.io/rb/marathon-api) [![travis-ci](https://travis-ci.org/otto-de/marathon-api.png?branch=master)](https://travis-ci.org/otto-de/marathon-api) [![Code Climate](https://codeclimate.com/github/otto-de/marathon-api/badges/gpa.svg)](https://codeclimate.com/github/otto-de/marathon-api) [![Test Coverage](https://codeclimate.com/github/otto-de/marathon-api/badges/coverage.svg)](https://codeclimate.com/github/otto-de/marathon-api)
+[![Gem Version](https://badge.fury.io/rb/marathon-api.svg)](http://badge.fury.io/rb/marathon-api) [![travis-ci](https://travis-ci.org/otto-de/marathon-api.png?branch=master)](https://travis-ci.org/otto-de/marathon-api) [![Code Climate](https://codeclimate.com/github/otto-de/marathon-api/badges/gpa.svg)](https://codeclimate.com/github/otto-de/marathon-api)
 
 This gem provides an object oriented interface to the [Marathon Remote API][1]. At the time if this writing, marathon-api is meant to interface with Marathon version 0.10.1.
 

data/lib/marathon/app.rb

@@ -2,7 +2,7 @@
 # See https://mesosphere.github.io/marathon/docs/rest-api.html#apps for full list of API's methods.
 class Marathon::App < Marathon::Base
 
-  ACCESSORS = %w[ id args cmd cpus disk env executor instances mem ports requirePorts
+  ACCESSORS = %w[ id args cmd cpus disk env executor fetch instances mem ports requirePorts
                   storeUris tasksHealthy tasksUnhealthy tasksRunning tasksStaged upgradeStrategy
                   deployments uris user version labels ]
 
@@ -10,7 +10,6 @@ class Marathon::App < Marathon::Base
       :env => {},
       :labels => {},
       :ports => [],
-      :uris => [],
   }
 
   attr_reader :healthChecks, :constraints, :container, :read_only, :tasks
@@ -151,7 +150,7 @@ class Marathon::App < Marathon::Base
   end
 
   def pretty_uris
-    uris.map { |e| "URI:        #{e}" }.join("\n")
+    [ (fetch || []).map { |e| e[:uri] } , uris ].compact.reduce([], :|).map { |e| "URI:        #{e}" }.join("\n")
   end
 
   def pretty_constraints

data/lib/marathon/container_volume.rb

@@ -13,9 +13,6 @@ class Marathon::ContainerVolume < Marathon::Base
     super(Marathon::Util.merge_keywordized_hash(DEFAULTS, hash), ACCESSORS)
     Marathon::Util.validate_choice('mode', mode, %w[RW RO])
     raise Marathon::Error::ArgumentError, 'containerPath must not be nil' unless containerPath
-    raise Marathon::Error::ArgumentError, 'containerPath must be an absolute path' \
-      unless Pathname.new(containerPath).absolute?
-    raise Marathon::Error::ArgumentError, 'hostPath must not be nil' unless hostPath
   end
 
   def to_pretty_s

data/lib/marathon/health_check.rb

@@ -13,20 +13,21 @@ class Marathon::HealthCheck < Marathon::Base
   }
 
   ACCESSORS = %w[ command gracePeriodSeconds intervalSeconds maxConsecutiveFailures
-                  path portIndex protocol timeoutSeconds ]
+                  path portIndex protocol timeoutSeconds ignoreHttp1xx ]
 
   # Create a new health check object.
   # ++hash++: Hash returned by API.
   def initialize(hash)
     super(Marathon::Util.merge_keywordized_hash(DEFAULTS, hash), ACCESSORS)
-    Marathon::Util.validate_choice(:protocol, protocol, %w[HTTP TCP COMMAND])
+    Marathon::Util.validate_choice(:protocol, protocol, %w[HTTP TCP COMMAND HTTPS MESOS_HTTP MESOS_HTTPS MESOS_TCP])
   end
 
   def to_s
     if protocol == 'COMMAND'
       "Marathon::HealthCheck { :protocol => #{protocol} :command => #{command} }"
-    elsif protocol == 'HTTP'
-      "Marathon::HealthCheck { :protocol => #{protocol} :portIndex => #{portIndex} :path => #{path} }"
+    elsif %w[HTTP HTTPS MESOS_HTTP MESOS_HTTPS].include? protocol
+      "Marathon::HealthCheck { :protocol => #{protocol} :portIndex => #{portIndex} :path => #{path}" +
+          (%w[HTTP HTTPS].include? protocol and !ignoreHttp1xx.nil? ? " :ignoreHttp1xx => #{ignoreHttp1xx}" : '') + " }"
     else
       "Marathon::HealthCheck { :protocol => #{protocol} :portIndex => #{portIndex} }"
     end

data/lib/marathon/version.rb

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

data/marathon-api.gemspec

@@ -28,5 +28,4 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'cane'
   gem.add_development_dependency 'simplecov'
-  gem.add_development_dependency 'codeclimate-test-reporter'
 end

data/spec/marathon/app_spec.rb

@@ -12,7 +12,9 @@ describe Marathon::App do
                                       },
                                       'env' => {'FOO' => 'BAR', 'blubb' => 'blah'},
                                       'constraints' => [['hostname', 'UNIQUE']],
-                                      'uris' => ['http://example.com/big.tar'],
+                                      'fetch' => [
+                                        { 'uri' => 'http://example.com/big.tar' },
+                                      ],
                                       'labels' => {'abc' => '123'},
                                       'version' => 'foo-version'
                                   }, double(Marathon::MarathonInstance)) }
@@ -43,7 +45,7 @@ describe Marathon::App do
     subject { described_class.new({'id' => '/app/foo'}, double(Marathon::MarathonInstance)) }
 
     let(:expected_string) do
-      '{"env":{},"labels":{},"ports":[],"uris":[],"id":"/app/foo"}'
+      '{"env":{},"labels":{},"ports":[],"id":"/app/foo"}'
     end
 
     its(:to_json) { should == expected_string }
@@ -153,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 => [], :uris => [], :id => "/app/foo"},
+          {:env => {}, :labels => {}, :ports => [], :id => "/app/foo"},
           false
       )
       @subject.start!
@@ -163,7 +165,7 @@ describe Marathon::App do
       expect(@apps).to receive(:change)
                            .with(
                                '/app/foo',
-                               {:env => {}, :labels => {}, :ports => [], :uris => [], :id => "/app/foo"},
+                               {:env => {}, :labels => {}, :ports => [], :id => "/app/foo"},
                                false
                            )
       @subject.start!

data/spec/marathon/container_volume_spec.rb

@@ -19,8 +19,6 @@ describe Marathon::ContainerVolume do
     it 'should fail with invalid path' do
       expect { subject.new(:hostPath => '/') }
           .to raise_error(Marathon::Error::ArgumentError, /containerPath .* not be nil/)
-      expect { subject.new(:containerPath => '/') }
-          .to raise_error(Marathon::Error::ArgumentError, /hostPath .* not be nil/)
     end
   end
 

data/spec/spec_helper.rb

@@ -6,16 +6,12 @@ require 'simplecov'
 require 'vcr'
 require 'webmock'
 require 'marathon'
-require 'codeclimate-test-reporter'
 
 %w[MARATHON_URL MARATHON_USER MARATHON_PASSWORD].each do |key|
   ENV.delete(key)
 end
 
-CodeClimate::TestReporter.start
-
 VCR.configure do |c|
-  c.ignore_hosts 'codeclimate.com'
   c.allow_http_connections_when_no_cassette = false
   c.cassette_library_dir = "fixtures/vcr"
   c.hook_into :webmock

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marathon-api
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Felix Bechstein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-22 00:00:00.000000000 Z
+date: 2017-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -164,20 +164,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: A simple REST client for the Marathon Remote API
 email:
 - felix.bechstein@otto.de
@@ -305,7 +291,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A simple REST client for the Marathon Remote API
@@ -332,4 +318,3 @@ test_files:
 - spec/marathon/task_spec.rb
 - spec/marathon/util_spec.rb
 - spec/spec_helper.rb
-has_rdoc: