dapp 0.35.34 → 0.35.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75df26997563b6ea7d45457b94ad70d4dfe8b0574b06ae3a8b16b282bb8f8612
-  data.tar.gz: 950507212825affd8cab0a81da77203929acdc6469fb925099fb05d7f6accbbf
+  metadata.gz: 962963230c35adae042eb0857ac0680679dc693df4f07de532fed95711b0a7c9
+  data.tar.gz: 5ce37d21f2b25fcf16fddbc6fc2ee6a03bf7f51f8634161497d5484d64b61c06
 SHA512:
-  metadata.gz: d2f58525f3883f00f85e8de17bc3597a22653cf6c564b27516107a34fe8f6e705517a1cec01181fd2699c405c57c7e2436956bfd20ec93df9ddf22a14bbe55ab
-  data.tar.gz: 6d9670547b1bad6792fd6895dd8c528240f70442ccaa9a8ed95d1fae06bbadb2bd197d009a2d883da0ebde605a43eac462217ffb272286760d45675895460409
+  metadata.gz: 985aff68a55fb1f36035d495917643e72a85facf352551e84ac463187d8532c2c1ac889e8e26974b72d51c938b512d55ea919f72e6f7e6ee970e021b7fbd9a2a
+  data.tar.gz: 6f9d1df209449b7d35a126798ce87baa47aedde309eb43014f8badd72e1c0272b2d443e73be50b00d529243c4e0cc09591b9ee1a2c772be9b17fa39ba00fa9bd

data/bin/dapp

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

data/lib/dapp/dapp.rb

@@ -180,7 +180,7 @@ module Dapp
 
     class << self
       def home_dir
-        File.join(Dir.home, ".dapp")
+        ENV["DAPP_HOME"] || File.join(Dir.home, ".dapp")
       end
 
       def options

data/lib/dapp/dapp/ruby2go.rb

@@ -1,6 +1,9 @@
 module Dapp
   class Dapp
     module Ruby2Go
+      class Error < ::Dapp::Error::Base
+      end
+
       def ruby2go_image(args_hash)
         _ruby2go("image", args_hash)
       end
@@ -33,8 +36,8 @@ module Dapp
         _ruby2go("slug", args_hash)
       end
 
-      def ruby2go_deploy_watcher(args_hash)
-        _ruby2go("deploy-watcher", args_hash)
+      def ruby2go_deploy_watcher(args_hash, **kwargs)
+        _ruby2go("deploy-watcher", args_hash, **kwargs)
       end
 
       def ruby2go_init
@@ -47,13 +50,15 @@ module Dapp
         "DAPP_BIN_#{progname.gsub("-", "_").upcase}"
       end
 
-      def _ruby2go(progname, args_hash)
+      def _ruby2go(progname, args_hash, tmp_dir: nil)
+        tmp_dir = _ruby2go_tmp_dir if tmp_dir.nil?
+
         call_id = SecureRandom.uuid
 
-        args_file = File.join(_ruby2go_tmp_dir, "args.#{call_id}.json")
+        args_file = File.join(tmp_dir, "args.#{call_id}.json")
         File.open(args_file, "w") {|f| f.write JSON.dump(args_hash)}
 
-        res_file = File.join(_ruby2go_tmp_dir, "res.#{call_id}.json")
+        res_file = File.join(tmp_dir, "res.#{call_id}.json")
 
         if bin_path = ENV[_ruby2go_bin_path_env_var_name(progname)]
           unless File.exists? bin_path
@@ -84,7 +89,7 @@ module Dapp
           File.open(res_file, "r") {|f| res = JSON.load(f.read)}
           res
         else
-          raise ::Dapp::Error::Base, code: :ruby2go_command_unexpected_exitstatus, data: { progname: progname, status_code: status_code }
+          raise ::Dapp::Dapp::Ruby2Go::Error, code: :ruby2go_command_unexpected_exitstatus, data: { progname: progname, status_code: status_code }
         end
       end
 

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

@@ -155,6 +155,7 @@ module Dapp
               watch_hooks_condition_mutex = ::Mutex.new
               watch_hooks_condition = ::ConditionVariable.new
               deploy_has_began = false
+
               unless dry_run? and watch_hooks.any?
                 watch_hooks_thr = Thread.new do
                   watch_hooks_condition_mutex.synchronize do
@@ -168,13 +169,30 @@ module Dapp
                       begin
                         if ENV["KUBEDOG"] != "0"
                           timeout = self.options[:timeout] || 300
-                          res = ruby2go_deploy_watcher(
-                            "action" => "watch job",
-                            "resourceName" => job.name,
-                            "namespace" => release.namespace,
-                            "timeout" => timeout,
-                            "logsFromTime" => kube_deploy_start_time
-                          )
+                          tmp_dir = Dir.mktmpdir('dapp-ruby2go-', tmp_base_dir)
+                          res = nil
+
+                          begin
+                            res = ruby2go_deploy_watcher(
+                              {
+                                "action" => "watch job",
+                                "resourceName" => job.name,
+                                "namespace" => release.namespace,
+                                "timeout" => timeout,
+                                "logsFromTime" => kube_deploy_start_time
+                              },
+                              tmp_dir: tmp_dir,
+                            )
+                          rescue ::Dapp::Dapp::Ruby2Go::Error => err
+                            # ignore interrupt
+                            if err.net_status[:data][:status_code] == 17
+                              res = {}
+                            else
+                              raise
+                            end
+                          ensure
+                            FileUtils.rmtree(tmp_dir)
+                          end
 
                           if res["error"]
                             $stderr.puts(::Dapp::Dapp.paint_string(::Dapp::Helper::NetStatus.message(res["error"]), :warning))
@@ -196,7 +214,6 @@ module Dapp
                     # ошибку для информации пользователю без завершения работы dapp.
                     $stderr.puts(::Dapp::Dapp.paint_string(::Dapp::Helper::NetStatus.message(e), :warning))
                   end
-
                 end # Thread
               end # unless
 
@@ -218,6 +235,8 @@ 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}"
@@ -229,8 +248,6 @@ module Dapp
                   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)
-
-                  watch_hooks_thr.join if !dry_run? && watch_hooks_thr && watch_hooks_thr.alive?
                   log_info((cmd_res.stdout + cmd_res.stderr).strip)
                 end
               end

data/lib/dapp/version.rb

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

metadata

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