octopus-serverspec-extensions 0.11.7 → 0.11.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a9ea6356ee92c5a806763b512817ab57529bbff
-  data.tar.gz: 33a1873e4369d07be549410a413abf9ed6b93417
+  metadata.gz: 52f0d116c786c5dfb99c8717b2f395eddc4afcd4
+  data.tar.gz: aec8c3545003ac320d4fc2efb6a9fdfae0d9474a
 SHA512:
-  metadata.gz: 03e7929ac54719b9179c695d2b06636a6b3261fc4d5ddac09bfc071461406ecb802ddfbc3c973d59e31e22bfc43aef0859ecb72983341ca8312d26d77e72b096
-  data.tar.gz: e91321e8b47eacad6feeb55baea44e59d61fe26d635392f6478d653ce730c3068018472429610f7cd880f78b749875a11eeb766a147c1c61f91e0116c79127c6
+  metadata.gz: 6809e58d6736172020aa7a9b4e0f00dc4ab67742ead3aa65c5badb3ad0dcb1729db71a28d165468487336eeffe2e1e658b828646f8855ebcfdbe25d14741e848
+  data.tar.gz: c6632b7be7db10e3c2369625fbeaefdad929ce7e0acb3c71bb1509f8fc208426d453f32b053b5d9acf10734cf1fa9bdb89559259178b33826af4d233d7cf870c

data/lib/octopus_serverspec_extensions/type/octopus_deploy_tentacle.rb

@@ -44,8 +44,15 @@ module Serverspec::Type
     def online?
       return nil if @machine.nil?
       @machine = poll_until_machine_has_completed_healthcheck(@serverUrl, @apiKey, @machine["Thumbprint"])
-      puts "Expected status 'Online|CalamariNeedsUpgrade|NeedsUpgrade' for Tentacle #{@name}, but got '#{@machine["Status"]}'" if (@machine["Status"] != "Online" && @machine["Status"] != "CalamariNeedsUpgrade")
-      @machine["Status"] == "Online" || @machine["Status"] == "CalamariNeedsUpgrade" || @machine["Status"] == "NeedsUpgrade"
+      status = @machine['Status']
+      if ("#{status}" == "")
+        status = @machine['HealthStatus'] if "#{status}" == ""
+        puts "Expected status 'Healthy|HasWarnings' for Tentacle #{@name}, but got '#{status}'" if (status != "Healthy" && status != "HasWarnings")
+        status == "Healthy" || status == "HasWarnings"
+      else
+        puts "Expected status 'Online|CalamariNeedsUpgrade|NeedsUpgrade' for Tentacle #{@name}, but got '#{status}'" if (status != "Online" && status != "CalamariNeedsUpgrade" && status != "NeedsUpgrade")
+        status == "Online" || status == "CalamariNeedsUpgrade" || status == "NeedsUpgrade"
+      end
     end
 
     def in_environment?(environment_name)

data/lib/octopus_serverspec_extensions/version.rb

@@ -1,3 +1,3 @@
 module OctopusServerSpecExtensions
-  VERSION = "0.11.7"
+  VERSION = "0.11.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopus-serverspec-extensions
 version: !ruby/object:Gem::Version
-  version: 0.11.7
+  version: 0.11.8
 platform: ruby
 authors:
 - Matt Richardson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-05 00:00:00.000000000 Z
+date: 2017-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: serverspec