dapp 0.35.27 → 0.35.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86a52ebbfe8c9426e1e34117e5d840da5686a36b3d0bf85f1e1408d1dfce273f
-  data.tar.gz: a79c64976dea7b136c96ff97af6344a2df93e32d6eec4078ff56ed3bf55788b4
+  metadata.gz: de2e3b20213c4626128bfa32aa1a5ad8edb0e732bf17d1c3e46b6ffddddc1d71
+  data.tar.gz: f0adaa27b975d8466ee1cdd94d73892814df7b8f5b808d5a426f7e206c2e31ff
 SHA512:
-  metadata.gz: 7524c4aaa758857ba7207811c3b2ca223c1479b296649c5140fae86d36dbeebc1e71246ca9c6c88baa3a49367bda681ae7c5e33a2152bfd1a269506a4d44cc5d
-  data.tar.gz: fc6305b299d525ca67651641ea0b1949089025b9e3168d813c55fdb31ad7e504eedb787736daae585ddd5c0b19d1ee35f9e8e452d3b63d6aae41356a9615cb03
+  metadata.gz: 15b13ff6b0874e54e9bc274226389688540f3401eff785485f004c83ab1ceab82c622811dd22dd9c8277a2c590774ba110c17b04b7ef501fd1514cabc766b26e
+  data.tar.gz: 65b1a3df883b894e4e9ca46e0239512674bbffc8d7854714f1fb6e34000ea9148a23ea1b04a769d01702ac2afb0a3ca0568074e206e6059f69b97af27922c2cc

data/lib/dapp/dapp/ruby2go.rb

@@ -33,6 +33,10 @@ module Dapp
         _ruby2go("slug", args_hash)
       end
 
+      def ruby2go_deploy_watcher(args_hash)
+        _ruby2go("deploy-watcher", args_hash)
+      end
+
       def ruby2go_init
         @_call_after_before_terminate << proc {
           FileUtils.rmtree(@_ruby2go_tmp_dir) if @_ruby2go_tmp_dir

data/lib/dapp/dapp/sentry.rb

@@ -71,14 +71,15 @@ module Dapp
           "dapp-build-cache-version" => ::Dapp::BUILD_CACHE_VERSION,
           "dapp-command" => self.options[:dapp_command],
         }.tap {|tags|
-          if git_own_repo_exist? && git_own_repo.remote_origin_url
-            tags["git-host"] = self.get_host_from_git_url(git_own_repo.remote_origin_url)
+          # FIXME: precache this info after Dapp object initialization
+          #if git_own_repo_exist? && git_own_repo.remote_origin_url
+            #tags["git-host"] = self.get_host_from_git_url(git_own_repo.remote_origin_url)
 
-            git_name = self.git_url_to_name(git_own_repo.remote_origin_url)
+            #git_name = self.git_url_to_name(git_own_repo.remote_origin_url)
 
-            tags["git-group"] = git_name.partition("/")[0]
-            tags["git-name"] = git_name
-          end
+            #tags["git-group"] = git_name.partition("/")[0]
+            #tags["git-name"] = git_name
+          #end
 
           begin
             ver = self.class.host_docker_minor_version

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

@@ -157,7 +157,11 @@ module Dapp
                   begin
                     watch_hooks.each do |job|
                       begin
-                        Kubernetes::Manager::Job.new(self, job.name).watch_till_done!
+                        if ENV["KUBEDOG"]
+                          ruby2go_deploy_watcher("action" => "watch job", "resourceName" => job.name, "namespace" => release.namespace)
+                        else
+                          Kubernetes::Manager::Job.new(self, job.name).watch_till_done!
+                        end
                       rescue ::Exception => e
                         sentry_exception(e, extra: {"job-spec" => job.spec})
                         raise
@@ -219,7 +223,11 @@ module Dapp
                   ::Timeout::timeout(self.options[:timeout] || 300) do
                     deployment_managers.each {|deployment_manager|
                       if deployment_manager.should_watch?
-                        deployment_manager.watch_till_ready!
+                        if ENV["KUBEDOG"]
+                          ruby2go_deploy_watcher("action" => "watch deployment", "resourceName" => deployment_manager.name, "namespace" => release.namespace)
+                        else
+                          deployment_manager.watch_till_ready!
+                        end
                       end
                     }
                   end

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.35.27"
+  VERSION = "0.35.28"
   BUILD_CACHE_VERSION = 31
 end

metadata

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