simplified skippy

thanks agaffney!

lib/ansible/plugins/callback/skippy.py

@@ -19,10 +19,9 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-from ansible import constants as C
+from ansible.plugins.callback.default import CallbackModule as CallbackModule_default
-from ansible.plugins.callback import CallbackBase
 
-class CallbackModule(CallbackBase):
+class CallbackModule(CallbackModule_default):
 
     '''
     This is the default callback interface, which simply prints messages
@@ -33,154 +32,8 @@ class CallbackModule(CallbackBase):
     CALLBACK_TYPE = 'stdout'
     CALLBACK_NAME = 'skippy'
 
-    def v2_runner_on_failed(self, result, ignore_errors=False):
+    def v2_runner_on_skipped(self, result):
-        delegated_vars = result._result.get('_ansible_delegated_vars', None)
+        pass
-        if 'exception' in result._result:
-            if self._display.verbosity < 3:
-                # extract just the actual error message from the exception text
-                error = result._result['exception'].strip().split('\n')[-1]
-                msg = "An exception occurred during task execution. To see the full traceback, use -vvv. The error was: %s" % error
-            else:
-                msg = "An exception occurred during task execution. The full traceback is:\n" + result._result['exception']
-
-            self._display.display(msg, color='red')
-
-            # finally, remove the exception from the result so it's not shown every time
-            del result._result['exception']
-
-        if result._task.loop and 'results' in result._result:
-            self._process_items(result)
-        else:
-            if delegated_vars:
-                self._display.display("fatal: [%s -> %s]: FAILED! => %s" % (result._host.get_name(), delegated_vars['ansible_host'], self._dump_results(result._result)), color='red')
-            else:
-                self._display.display("fatal: [%s]: FAILED! => %s" % (result._host.get_name(), self._dump_results(result._result)), color='red')
-
-        if result._task.ignore_errors:
-            self._display.display("...ignoring", color='cyan')
-
-    def v2_runner_on_ok(self, result):
-
-        delegated_vars = result._result.get('_ansible_delegated_vars', None)
-        if result._task.action == 'include':
-            return
-        elif result._result.get('changed', False):
-            if delegated_vars:
-                msg = "changed: [%s -> %s]" % (result._host.get_name(), delegated_vars['ansible_host'])
-            else:
-                msg = "changed: [%s]" % result._host.get_name()
-            color = 'yellow'
-        else:
-            if delegated_vars:
-                msg = "ok: [%s -> %s]" % (result._host.get_name(), delegated_vars['ansible_host'])
-            else:
-                msg = "ok: [%s]" % result._host.get_name()
-            color = 'green'
-
-        if result._task.loop and 'results' in result._result:
-            self._process_items(result)
-        else:
-
-            if (self._display.verbosity > 0 or '_ansible_verbose_always' in result._result) and not '_ansible_verbose_override' in result._result:
-                msg += " => %s" % (self._dump_results(result._result),)
-            self._display.display(msg, color=color)
-
-        self._handle_warnings(result._result)
-
-    def v2_runner_on_unreachable(self, result):
-        delegated_vars = result._result.get('_ansible_delegated_vars', None)
-        if delegated_vars:
-            self._display.display("fatal: [%s -> %s]: UNREACHABLE! => %s" % (result._host.get_name(), delegated_vars['ansible_host'], self._dump_results(result._result)), color='red')
-        else:
-            self._display.display("fatal: [%s]: UNREACHABLE! => %s" % (result._host.get_name(), self._dump_results(result._result)), color='red')
-
-    def v2_playbook_on_no_hosts_matched(self):
-        self._display.display("skipping: no hosts matched", color='cyan')
-
-    def v2_playbook_on_no_hosts_remaining(self):
-        self._display.banner("NO MORE HOSTS LEFT")
-
-    def v2_playbook_on_task_start(self, task, is_conditional):
-        self._display.banner("TASK [%s]" % task.get_name().strip())
-        if self._display.verbosity > 2:
-            path = task.get_path()
-            if path:
-                self._display.display("task path: %s" % path, color='dark gray')
-
-    def v2_playbook_on_cleanup_task_start(self, task):
-        self._display.banner("CLEANUP TASK [%s]" % task.get_name().strip())
-
-    def v2_playbook_on_handler_task_start(self, task):
-        self._display.banner("RUNNING HANDLER [%s]" % task.get_name().strip())
-
-    def v2_playbook_on_play_start(self, play):
-        name = play.get_name().strip()
-        if not name:
-            msg = "PLAY"
-        else:
-            msg = "PLAY [%s]" % name
-
-        self._display.banner(msg)
-
-    def v2_on_file_diff(self, result):
-        if result._task.loop and 'results' in result._result:
-            for res in result._result['results']:
-                newres = self._copy_result(result)
-                res['item'] = self._get_item(res)
-                newres._result = res
-
-                self.v2_on_file_diff(newres)
-        elif 'diff' in result._result and result._result['diff']:
-            self._display.display(self._get_diff(result._result['diff']))
-
-    def v2_playbook_item_on_ok(self, result):
-
-        delegated_vars = result._result.get('_ansible_delegated_vars', None)
-        if result._task.action == 'include':
-            return
-        elif result._result.get('changed', False):
-            if delegated_vars:
-                msg = "changed: [%s -> %s]" % (result._host.get_name(), delegated_vars['ansible_host'])
-            else:
-                msg = "changed: [%s]" % result._host.get_name()
-            color = 'yellow'
-        else:
-            if delegated_vars:
-                msg = "ok: [%s -> %s]" % (result._host.get_name(), delegated_vars['ansible_host'])
-            else:
-                msg = "ok: [%s]" % result._host.get_name()
-            color = 'green'
-
-        msg += " => (item=%s)" % (result._result['item'],)
-
-        if (self._display.verbosity > 0 or '_ansible_verbose_always' in result._result) and not '_ansible_verbose_override' in result._result:
-            msg += " => %s" % self._dump_results(result._result)
-        self._display.display(msg, color=color)
-
-    def v2_playbook_item_on_failed(self, result):
-        delegated_vars = result._result.get('_ansible_delegated_vars', None)
-        if 'exception' in result._result:
-            if self._display.verbosity < 3:
-                # extract just the actual error message from the exception text
-                error = result._result['exception'].strip().split('\n')[-1]
-                msg = "An exception occurred during task execution. To see the full traceback, use -vvv. The error was: %s" % error
-            else:
-                msg = "An exception occurred during task execution. The full traceback is:\n" + result._result['exception']
-
-            self._display.display(msg, color='red')
-
-            # finally, remove the exception from the result so it's not shown every time
-            del result._result['exception']
-
-        if delegated_vars:
-            self._display.display("failed: [%s -> %s] => (item=%s) => %s" % (result._host.get_name(), delegated_vars['ansible_host'], result._result['item'], self._dump_results(result._result)), color='red')
-        else:
-            self._display.display("failed: [%s] => (item=%s) => %s" % (result._host.get_name(), result._result['item'], self._dump_results(result._result)), color='red')
-
-        self._handle_warnings(result._result)
-
-    def v2_playbook_on_include(self, included_file):
-        msg = 'included: %s for %s' % (included_file._filename, ", ".join([h.name for h in included_file._hosts]))
-        color = 'cyan'
-        self._display.display(msg, color='cyan')
 
+    def v2_playbook_item_on_skipped(self, result):
+        pass