marathon_deploy 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3984f0e1489687f090fb7438ce506f62611e8bd3
-  data.tar.gz: 364f06a351cf2cb41f69d5f1336aab52747ab18c
+  metadata.gz: 3736662fd87e158bf3d5fecdff15c4a77731e901
+  data.tar.gz: 861afb34bd02892b8da74f5e471c3d4b309a7075
 SHA512:
-  metadata.gz: 1aff8009aef6664f73c3ae2ea8044b5bcb3faf1f3a8bd48ffc409c9e99d00c1664c3e48a7e1c12f72a025482758662847b8ff4247d9318db6719cc193ef9a734
-  data.tar.gz: 3349b76cfd389703a474fcc74bf52a716b7d3b61b9f05caf1fc609446bd6b39d2d8e2457cda353112bd10e35874f686134cc4ccec68b8a107e7a38b7b0c68b80
+  metadata.gz: 724bc252726a9bd7ce3c33b1be70324c1dd1ab0a77c71ed786f5c22e5df7d1a3093893e19792fc05af046b52d91bce26266de0151fd155e990bc2dd2f9e44af8
+  data.tar.gz: fdaee19a8ffe931d5475e1fe5f671db00cec4b759715fca8f6f16ba5ace5e291e25c49f29b563eb0d76c9f838453c2aabf5d0c2862ee51ced2b1ea8814840c7a

data/lib/marathon_deploy/application.rb

@@ -61,6 +61,10 @@ module MarathonDeploy
     @json = MarathonDefaults.overlay_preproduction_settings(@json)
   end
   
+  def health_checks
+    return json[:healthChecks]
+  end
+  
   def add_identifier
     random = Utils.random
     # Time.now.to_i

data/lib/marathon_deploy/deployment.rb

@@ -152,13 +152,9 @@ module MarathonDeploy
   end  
   
   def health_checks_defined?
-    response = list_app
-    return false unless response.kind_of? Net::HTTPSuccess
-    response_body = Utils.response_body(response)
-    return false if response_body[:app].nil?
-    health_check_json = response_body[:app][:healthChecks]
-    return false if health_check_json.nil?
-    return health_check_json.size == 0 ? false : true
+    health_checks = @application.health_checks
+    return true unless health_checks.nil? or health_checks.empty?
+    return false
   end  
   
   ####### PRIVATE METHODS ##########

data/lib/marathon_deploy/version.rb

@@ -1,3 +1,3 @@
 module MarathonDeploy
-  VERSION = "0.1.15"
+  VERSION = "0.1.16"
 end

data/test/application_test.rb

@@ -34,4 +34,10 @@ class ApplicationTest < Minitest::Test
     refute_empty(unique_id,msg)
   end
   
+  def test_health_checks_defined
+    app = MarathonDeploy::Application.new(:deployfile => @yml)
+    refute_nil(app.health_checks, "health checks returned nil")    
+    refute_empty(app.health_checks, "health checks returned empty")
+  end
+  
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marathon_deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Jonathan Colby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
@@ -197,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Mesos/Marathon deployment tool.
@@ -207,4 +207,3 @@ test_files:
 - test/fixtures/deploy.json
 - test/fixtures/deploy.yml
 - test/test_helper.rb
-has_rdoc: