Put the ticket URL in the zsig

[snippets/.git] / TracZephyrPlugin / ZephyrPlugin.py

diff --git a/TracZephyrPlugin/ZephyrPlugin.py b/TracZephyrPlugin/ZephyrPlugin.py
index 88b9ec219c7d57e3d696f716953483819e829288..a1978b611098f892c60599e1de45fb07d42a15f6 100644 (file)
--- a/TracZephyrPlugin/ZephyrPlugin.py
+++ b/TracZephyrPlugin/ZephyrPlugin.py
@@ -12,13 +12,24 @@ quoted_re = re.compile('^(?:> ?\n)*> .+\n(?:>(?: .*)?\n)*', re.MULTILINE)
 class ZephyrPlugin(Component):
     implements(ITicketChangeListener)
     
-    def zwrite(self, id, message):
+    def zwrite(self, id, message, extra_sig=None):
         zclass = self.config.get('ZephyrPlugin', 'class')
         if zclass == '':
             return
         command = shlex.split(self.config.get('ZephyrPlugin', 'command').encode('utf-8'))
         if not command:
             command = ['zwrite', '-q', '-l', '-d']
+        opcode = self.config.get('ZephyrPlugin', 'opcode')
+        if opcode:
+            command += ['-O', opcode]
+        signature = self.config.get('ZephyrPlugin', 'signature')
+        if extra_sig:
+            if signature:
+                signature = "%s: %s" % (signature, extra_sig, )
+            else:
+                signature = extra_sig
+        if signature:
+            command += ['-s', signature]
         p = subprocess.Popen(command +
                              ['-c', zclass,
                               '-i', 'trac-#%s' % id],
@@ -34,12 +45,19 @@ class ZephyrPlugin(Component):
             lines = lines[:5] + [u'[…]']
         return '\n'.join(lines)
     
+    def get_url(self, ticket):
+        return ticket.env.abs_href.ticket(ticket.id)
+
     def ticket_created(self, ticket):
-        message = "%s filed a new %s ticket:\n%s\n\n%s" % (ticket['reporter'],
+        ttype='ticket'
+        if ticket['type'] != 'defect':
+            ttype=ticket['type']
+        message = "%s filed a new %s %s:\n%s\n\n%s" % (ticket['reporter'],
                                                            ticket['priority'],
+                                                           ttype,
                                                            ticket['summary'],
                                                            self.format_text(ticket['description']))
-        self.zwrite(ticket.id, message)
+        self.zwrite(ticket.id, message, extra_sig=self.get_url(ticket))
     
     def ticket_changed(self, ticket, comment, author, old_values):
         message = "(%s)\n" % ticket['summary']
@@ -59,8 +77,8 @@ class ZephyrPlugin(Component):
                 message += "%s changed %s.\n" % (author, name)
         if comment:
             message += "%s commented:\n%s\n" % (author, self.format_text(comment))
-        self.zwrite(ticket.id, message)
+        self.zwrite(ticket.id, message, extra_sig=self.get_url(ticket))
     
     def ticket_deleted(self, ticket):
         message = "%s deleted ticket %d" % (author, ticket.id)
-        self.zwrite(ticket.id, message)
+        self.zwrite(ticket.id, message, extra_sig=self.get_url(ticket))