Merge lp:~dannf/laika/configurable-bug-patterns into lp:laika

[dann frazier]

Add --bug-pattern option

[Alex Chiang (achiang)]

Looks good, thanks Dann!

review: Approve

=== modified file 'laika'
--- laika	2010-11-24 00:10:09 +0000
+++ laika	2011-08-08 17:37:25 +0000
@@ -17,6 +17,7 @@
 import os
 import re
 import sys
+from string import Template
 
 from launchpadlib.launchpad import Launchpad
 
@@ -54,13 +55,14 @@
 
     bugs = {}
 
-    def __init__(self, user, window, ppas):
+    def __init__(self, user, window, bugpattern, ppas):
         cachedir = os.path.expanduser("~/.launchpadlib/cache")
         self.launchpad = Launchpad.login_with('laika', 'production', cachedir)
 
         self.user = self.launchpad.people[user]
         self.window = window
         self.since = UTCNOW - datetime.timedelta(window)
+        self.bugpattern = bugpattern
         self.ppas = ppas
         self.status = ["New",
                        "Incomplete",
@@ -105,7 +107,8 @@
             ago += "%d minute%s" % (minutes, "s" if minutes > 1 else "")
 
         print task.title
-        print "https://launchpad.net/bugs/" + str(task.bug.id)
+        t = Template(self.bugpattern)
+        print t.substitute(bugid=str(task.bug.id))
         print "last updated", ago, "ago"
 
     def print_assignments(self):
@@ -219,6 +222,8 @@
         return os.getenv("USER")
     def default_window():
         return 8
+    def default_bugpattern():
+        return 'https://launchpad.net/bugs/$bugid'
     def default_ppas():
         return ''
 
@@ -231,7 +236,7 @@
     return config
 
 def main():
-    opts = ['user', 'window', 'ppas']
+    opts = ['user', 'window', 'bugpattern', 'ppas']
     config = get_config(opts)
 
     parser = OptionParser()
@@ -243,13 +248,19 @@
         default=config['window'],
         help='Number of days of past activity to look for.  '
              'Defaults to 8 days')
+    parser.add_option('-b', '--bug-pattern', dest='bugpattern', type='string',
+        default=config['bugpattern'],
+        help='Use this string when displaying a bug reference.  '
+             'Occurrences of $bugid will be replaced by the actual bug number.  '
+             'Defaults to \'https://launchpad.net/bugs/$bugid\'')
     parser.add_option('--ppas', dest='ppas',
         default=config['ppas'],
         help='Search for activity in specified PPAs')
 
     options, arguments = parser.parse_args()
 
-    report = Report(options.user, options.window, options.ppas)
+    report = Report(options.user, options.window, options.bugpattern,
+                    options.ppas)
     report.render()
 
 if __name__ == "__main__":
 
=== modified file 'laika.1'
--- laika.1	2010-10-21 12:47:53 +0000
+++ laika.1	2011-08-08 17:37:25 +0000
@@ -16,6 +16,9 @@
 \fB\-w\fR \fIWINDOW\fR, \fB\-\-window\fR=\fIWINDOW\fR
 number of days of past activity to look for; defaults to 8 days
 .TP
+\fB\-b\fR \fIBUGPATTERN\fR, \fB\-\-bugpattern\fR=\fIBUGPATTERN\fR
+pattern to use when displaying the bug id; occurrences of the substring $bugid will be replaced by the actual bug id number; defaults to 'https://launchpad.net/bugs/$bugid'
+.TP
 \fB\-\-ppas\fR=\fIPPA[,PPA[,...]]\fR
 search for activity in the specified PPAs; use a comma to separate multiple PPAs
 .TP