dapp 0.35.35 → 0.35.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 962963230c35adae042eb0857ac0680679dc693df4f07de532fed95711b0a7c9
-  data.tar.gz: 5ce37d21f2b25fcf16fddbc6fc2ee6a03bf7f51f8634161497d5484d64b61c06
+  metadata.gz: 1908e331d920053a34db197e777a6b8e4148e28d9afa78be2241d4a1d2d2e5b9
+  data.tar.gz: ccb636e26788abbc3d731c7a3774bc74c979a54e83df04a3f54e813a91efe6c3
 SHA512:
-  metadata.gz: 985aff68a55fb1f36035d495917643e72a85facf352551e84ac463187d8532c2c1ac889e8e26974b72d51c938b512d55ea919f72e6f7e6ee970e021b7fbd9a2a
-  data.tar.gz: 6f9d1df209449b7d35a126798ce87baa47aedde309eb43014f8badd72e1c0272b2d443e73be50b00d529243c4e0cc09591b9ee1a2c772be9b17fa39ba00fa9bd
+  metadata.gz: b07672513e3488a77b43885bc44727ed39916714963c4dfe896a3c65326f38ce32bd6e76ed582c7cc53fefb640b65ec4ec9a534632878152d433a274f19125e0
+  data.tar.gz: e605de2a628b5c423802bab538e6e748adfbf30c70b05671ffc880d3cf8126a96951c032e0885834b5b17f4025d288f403855dbda59f963b0017ff0c6e9b037e

data/bin/dapp

@@ -54,7 +54,7 @@ def set_gitlab_cancel_handler
       parents_pids.each do |pid|
         if not process_alive? pid
           home_dir = (ENV["DAPP_HOME"] || File.join(ENV["HOME"], ".dapp"))
-          File.open(File.join(home_dir, "cancelled"), "a") do |file|
+          File.open(File.join(home_dir, ".killed_pids"), "a") do |file|
             file.write "#{Process.pid}\n"
           end
 

data/lib/dapp/kube/dapp/command/deploy.rb

@@ -195,7 +195,7 @@ module Dapp
                           end
 
                           if res["error"]
-                            $stderr.puts(::Dapp::Dapp.paint_string(::Dapp::Helper::NetStatus.message(res["error"]), :warning))
+                            $stderr.puts(::Dapp::Dapp.paint_string(res["error"], :warning))
                           end
                         else
                           Kubernetes::Manager::Job.new(self, job.name).watch_till_done!
@@ -235,8 +235,6 @@ module Dapp
                   release.install_helm_release
                 end
 
-                watch_hooks_thr.join if !dry_run? && watch_hooks_thr && watch_hooks_thr.alive?
-
                 if cmd_res.error?
                   if cmd_res.stderr.end_with? "has no deployed releases\n"
                     log_warning "[WARN] Helm release #{release.name} is in improper state: #{cmd_res.stderr}"
@@ -245,10 +243,14 @@ module Dapp
                     kube_create_helm_auto_purge_trigger_file(release.name)
                   end
 
+                  watch_hooks_thr.kill if !dry_run? && watch_hooks_thr && watch_hooks_thr.alive?
+
                   raise ::Dapp::Error::Command, code: :kube_helm_failed, data: {output: (cmd_res.stdout + cmd_res.stderr).strip}
                 else
                   kube_delete_helm_auto_purge_trigger_file(release.name)
                   log_info((cmd_res.stdout + cmd_res.stderr).strip)
+
+                  watch_hooks_thr.join if !dry_run? && watch_hooks_thr && watch_hooks_thr.alive?
                 end
               end
 

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.35.35"
+  VERSION = "0.35.36"
   BUILD_CACHE_VERSION = 33
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.35.35
+  version: 0.35.36
 platform: ruby
 authors:
 - Dmitry Stolyarov