dapp 0.35.30 → 0.35.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b01d76fa1286551bf1676239203639577600abc59977ad3bfe38570e6a294403
-  data.tar.gz: bdece7be0ef516bdb2550bfb5058fabdc4fc307eb899d5f855767788e59e410e
+  metadata.gz: 934fbdcbf5ddac2ff4351f917da3cc82984ee65ab7502cea841d5c6bae957938
+  data.tar.gz: cf6ea61d1679a4a414b65cdb61881cbbc2b2600435faa26f1c852c95e8d5ce80
 SHA512:
-  metadata.gz: b267041539f8b087c3a4f79936fd7bfb4e59e6efb724065558d7894cbc752ba39ea7eef5eb8547efba85aabe24119d52541c51d003c0f64f760834624030b380
-  data.tar.gz: ffcb07b0c3f626990d35bf45a320078388373743953cdd1e3f9d232d95802342262eff306e6887af31c1260d44803900d4014049f6feafdc74fa1612d7a57576
+  metadata.gz: ceaafb7ad45a9f1091c0aa43e2d8d6ca969d2deaf463fa4a245ac6fade9f01ccaf458bcefa4aa857417a88214b9af64f2f9dac624cc2ed201e439a924a3b33b1
+  data.tar.gz: 6e15aabcbb05f08486b02c04eff2d60dd9a21718fad503b78d034827ee4a88ef752db41fc09107ba7ba0ae8c799144e047b0d74ca4d5fac88684ddb70bfc04ea

data/lib/dapp/dapp/ruby2go.rb

@@ -68,8 +68,10 @@ module Dapp
           end
         end
 
+        env_hash = ENV.map {|k, v| [k, v]}.to_h
+
         begin
-          exec("#{bin_path} -args-from-file #{args_file} -result-to-file #{res_file}") unless (pid = fork)
+          exec(env_hash, "#{bin_path} -args-from-file #{args_file} -result-to-file #{res_file}") unless (pid = fork)
           pid, status = Process.waitpid2(pid)
         rescue Interrupt => _e
           Process.kill('INT', pid)

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

@@ -157,8 +157,14 @@ module Dapp
                   begin
                     watch_hooks.each do |job|
                       begin
-                        if ENV["KUBEDOG"]
-                          ruby2go_deploy_watcher("action" => "watch job", "resourceName" => job.name, "namespace" => release.namespace)
+                        if ENV["KUBEDOG"] != "0"
+                          timeout = self.options[:timeout] || 300
+                          ruby2go_deploy_watcher(
+                            "action" => "watch job",
+                            "resourceName" => job.name,
+                            "namespace" => release.namespace,
+                            "timeout" => timeout,
+                          )
                         else
                           Kubernetes::Manager::Job.new(self, job.name).watch_till_done!
                         end
@@ -220,11 +226,17 @@ module Dapp
 
               unless dry_run?
                 begin
-                  ::Timeout::timeout(self.options[:timeout] || 300) do
+                  timeout = self.options[:timeout] || 300
+                  ::Timeout::timeout(timeout) do
                     deployment_managers.each {|deployment_manager|
                       if deployment_manager.should_watch?
-                        if ENV["KUBEDOG"]
-                          ruby2go_deploy_watcher("action" => "watch deployment", "resourceName" => deployment_manager.name, "namespace" => release.namespace)
+                        if ENV["KUBEDOG"] == "1"
+                          ruby2go_deploy_watcher(
+                            "action" => "watch deployment",
+                            "resourceName" => deployment_manager.name,
+                            "namespace" => release.namespace,
+                            "timeout" => timeout,
+                          )
                         else
                           deployment_manager.watch_till_ready!
                         end

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.35.30"
+  VERSION = "0.35.31"
   BUILD_CACHE_VERSION = 31
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.35.30
+  version: 0.35.31
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-31 00:00:00.000000000 Z
+date: 2018-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout