dapp 0.13.13 → 0.13.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02f03bab43041fee2897358ca3262e4d3c712d69
-  data.tar.gz: 68a67d7bc551e1a4b27a40579dad44fd2c5509ec
+  metadata.gz: 5fa0a97a6909cfc4f97cac432fbbadd642182d0b
+  data.tar.gz: a95b621146463015efd477df2548108f8456fbb2
 SHA512:
-  metadata.gz: 324d9d5c00cb1f4fe580ac4a0ea403559513e61287e9828b358223a7c8594f4717946c3baa6a8b832fc15c023c406bddb65d49a4a7673e96d8e1771c576c87d2
-  data.tar.gz: 494400490d133e1fc264c8cfd2352026a52c39a5f5644c6f7d917fc65d05c1d87fcf1a0c15e2148d76b175b1e1fe14678060100f9b344d8805f67f5f7a8339ff
+  metadata.gz: 71afc61fbe8e6734d32334202833f7895eb78c84183e2ab71f528ab3ab578a535f2616d8f2461fb16209e3527057acb6a228d0852804e65c3f6bbd5ebcf1d0c2
+  data.tar.gz: 7ad67260407c8120dd6112611c2224079beb0ca4a91f8fe96028f63d8edcaf880df07f3d5964dda7de6b389af8352ed9c60b54eff55bf676d2b388c5cdb4205e

data/lib/dapp/kube/helm/release.rb

@@ -80,12 +80,40 @@ module Dapp
             end
           end
 
-          manifest_start_index = evaluation_output.lines.index("MANIFEST:\n") + 1
-          hook_start_index = evaluation_output.lines.index("HOOKS:\n") + 1
-          manifest_end_index = evaluation_output.lines.index("Release \"#{name}\" has been upgraded. Happy Helming!\n")
+          if evaluation_output.lines.map(&:strip).grep(/ERROR: Job failed: exit status 1/).any?
+            warn evaluation_output
+            raise Error::Base, code: :helm_failed
+          end
+
+          hook_start_index = nil
+          if ind = evaluation_output.lines.index("HOOKS:\n")
+            hook_start_index =  ind + 1
+          else
+            warn "[WARN][DEBUG INFO] Cannot find HOOKS section in helm dry-run output:"
+            evaluation_output.lines.each do |line|
+              warn "[WARN][DEBUG INFO] #{line.strip}"
+            end
+          end
+
+          manifest_start_index = nil
+          if ind = evaluation_output.lines.index("MANIFEST:\n")
+            manifest_start_index = ind + 1
+          else
+            warn "[WARN][DEBUG INFO] Cannot find MANIFEST section in helm dry-run output:"
+            evaluation_output.lines.each do |line|
+              warn "[WARN][DEBUG INFO] #{line.strip}"
+            end
+          end
+
+          unless manifest_end_index = evaluation_output.lines.index("Release \"#{name}\" has been upgraded. Happy Helming!\n")
+            warn "[WARN][DEBUG INFO] Cannot find end of MANIFEST section in helm dry-run output:"
+            evaluation_output.lines.each do |line|
+              warn "[WARN][DEBUG INFO] #{line.strip}"
+            end
+          end
 
-          generator.call(evaluation_output.lines[hook_start_index..manifest_start_index-2].join)
-          generator.call(evaluation_output.lines[manifest_start_index..manifest_end_index-2].join)
+          generator.call(evaluation_output.lines[hook_start_index..manifest_start_index-2].join) if hook_start_index and manifest_start_index
+          generator.call(evaluation_output.lines[manifest_start_index..manifest_end_index-2].join) if manifest_start_index and manifest_end_index
         end
       end
 

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.13.13'.freeze
+  VERSION = '0.13.15'.freeze
   BUILD_CACHE_VERSION = 15
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.13.13
+  version: 0.13.15
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-02 00:00:00.000000000 Z
+date: 2017-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout