dapp 0.27.9 → 0.27.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6346ee54e42e590ba2719fac52361f1767dcc427
-  data.tar.gz: 4a4fb500e70592240ffea8963b5e2689c89e5706
+  metadata.gz: 80868182e4e924ea03ad4f0408d0f8043e3f5f9d
+  data.tar.gz: 86e0f31d27039293099a176fa9d112afb2de0adf
 SHA512:
-  metadata.gz: ca7550d0e4dbab5b3a18fce172b5627560d06bcce8af6202b2ad2c95560d865043dda115fe55d32e071750a4f9a48e68907f60408919899bea8c53741216b8a0
-  data.tar.gz: bb2db191696ef82ca23d46775f39faa3f0e4c8c1f66465f96ebcc3ee36304a855e29db37149d61785d3b33b2801d4a9936592d0bb5c949f010710de86d6adb67
+  metadata.gz: 515d9c9f831ce4ca8cb13d418d3b280055bbcd81e200a1e0fba4238fcd69158c6ecf7059dc8dcd4aed01fd11f39eb2f2378975ac8afbb9ce2a14cacfdc200ccb
+  data.tar.gz: 62e8cc4a2ca064a58ed1a130079a36eaa40449dc16d3b759e25781a7f7217ba30cf595a352080b781681165fcf5ce6be83645a5e3ff22d46432d8252210504a3

data/lib/dapp/dimg/builder/ansible/assets.rb

@@ -23,7 +23,7 @@ remote_tmp = #{remote_tmp}
 become = yes
 become_method = sudo
 become_exe = #{become_exe}
-become_flags = -E
+become_flags = -E -H
 }
         end
 
@@ -172,13 +172,25 @@ class CallbackModule(CallbackBase):
         name = task.name
         if not name:
             if task.action in self.FREE_FORM_MODULES:
-                name = task.args['_raw_params']
+                name = task.args.get('_raw_params', '')
+            if task.action == 'file':
+                name = task.args.get('path')
+            if task.action == 'copy':
+                name = task.args.get('dest')
+            if task.action == 'group':
+                name = task.args.get('name')
+            if task.action == 'user':
+                name = task.args.get('name')
+            if task.action == 'get_url':
+                name = task.args.get('url')
             if task.action == 'getent':
                 db = task.args.get('database')
                 key = task.args.get('key')
                 name = '%s %s' % (db, key)
             if task.action == 'apt':
                 name = task.args.get('name')
+            if task.action == 'composer':
+                name = task.args.get('command', 'install')
         name = re.sub(r'\s+', r' ', name)
         if len(name) > 25 :
             name = '%s...' % name[0:22]
@@ -188,10 +200,15 @@ class CallbackModule(CallbackBase):
         ''' output the result of a command run '''
 
         self._display.display("%s | rc=%s >>" % (self._task_header(task, caption), result.get('rc', -1)), color)
+        msg = result.get('msg')
+        if msg:
+            self._display.display(msg, color)
         # prevent dublication in case of live_stdout
         if not result.get('live_stdout', False):
-            self._display.display("stdout was:", color=C.COLOR_HIGHLIGHT)
-            self._display.display(result.get('stdout', ''))
+            stdout = result.get('stdout', None)
+            if stdout:
+              self._display.display("stdout was:", color=C.COLOR_HIGHLIGHT)
+              self._display.display(stdout)
         stderr = result.get('stderr', '')
         if stderr:
             self._display.display("stderr was:", color=C.COLOR_HIGHLIGHT)

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

@@ -154,7 +154,12 @@ module Dapp
 
                   begin
                     watch_hooks.each do |job|
-                      Kubernetes::Manager::Job.new(self, job.name).watch_till_done!
+                      begin
+                        Kubernetes::Manager::Job.new(self, job.name).watch_till_done!
+                      rescue ::Exception => e
+                        sentry_exception(e, extra: {"job-spec" => job.spec})
+                        raise
+                      end
                     end # watch_hooks.each
                   rescue Kubernetes::Error::Default => e
                     # Default-ошибка -- это ошибка для пользователя которую перехватывает и
@@ -165,7 +170,6 @@ module Dapp
                     # Поэтому перехватываем и просто отображаем произошедшую
                     # ошибку для информации пользователю без завершения работы dapp.
                     $stderr.puts(::Dapp::Dapp.paint_string(::Dapp::Helper::NetStatus.message(e), :warning))
-                    sentry_exception(e, extra: {"job-spec" => job.spec})
                   end
 
                 end # Thread

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.27.9"
+  VERSION = "0.27.10"
   BUILD_CACHE_VERSION = 28
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.27.9
+  version: 0.27.10
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2018-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout