Merge lp:~abentley/lp-release-manager-tools/month-stats into lp:~sinzui/lp-release-manager-tools/trunk

[Aaron Bentley]

Allow per-month stats.

This branch implements per-month statistics. So it generates WorkCycles on a per-month basis if --month is supplied.
It introduces --count to change the number of cycles emitted.
It also changes the label for "held" bugs to "Held".
It also implements true bug totals.
It also emits triage-time for every row.
It extracts the line formatting to its own method.
It also switches to setuptools because distutils doesn't support entry_points.
It also ignores some directories to support virtualenv.

[Curtis Hovey (sinzui)]

thank you

review: Approve (code)

=== modified file '.bzrignore'
--- .bzrignore	2014-01-28 13:39:36 +0000
+++ .bzrignore	2014-06-17 16:36:46 +0000
@@ -2,3 +2,7 @@
 dist
 juju-bugs.json
 *.egg-info
+./bin
+./include
+./lib
+./local

=== modified file 'lp_release_tools/report_bugs.py'
--- lp_release_tools/report_bugs.py	2014-05-24 02:08:24 +0000
+++ lp_release_tools/report_bugs.py	2014-06-17 16:36:46 +0000
@@ -62,34 +62,38 @@
         self.held = []
         self.opened = []
         self.closed = []
+        self.total = []
         self.tag_groups = tag_groups
         self.importance_groups = importance_groups
 
+    def line(self, group, held, opened, closed, total):
+        return "%23s:  %4d    %+4d   %4d    %3d         %3dd" % (
+            group, len(held), len(opened), -len(closed), len(total),
+            self.triage_time(opened))
+
     def __str__(self):
         rows = ['%s - %s' % (
             self.start.strftime('%Y-%m-%d'), self.finish.strftime('%Y-%m-%d'))]
-        rows.append("%23s:  %4d     +%2d     -%2d          %2dd" % (
-            'All bugs', len(self.held), len(self.opened), len(self.closed),
-            self.triage_time))
+        rows.append(self.line('All bugs', self.held, self.opened, self.closed,
+            self.total))
         for group, tags in self.tag_groups.items():
-            rows.append("%23s:  %4d     +%2d     -%2d" % (
-                group,
-                len(self._filter(tags, self.held)),
-                len(self._filter(tags, self.opened)),
-                len(self._filter(tags, self.closed))))
+            rows.append(self.line(
+                group, self._filter(tags, self.held),
+                self._filter(tags, self.opened),
+                self._filter(tags, self.closed),
+                self._filter(tags, self.total)))
         for group, importances in self.importance_groups.items():
-            rows.append("%23s:  %4d     +%2d     -%2d" % (
-                group,
-                len([b for b in self.held if b.importance in importances]),
-                len([b for b in self.opened if b.importance in importances]),
-                len([b for b in self.closed if b.importance in importances])))
+            rows.append(self.line(
+                group, [b for b in self.held if b.importance in importances],
+                [b for b in self.opened if b.importance in importances],
+                [b for b in self.closed if b.importance in importances],
+                [b for b in self.total if b.importance in importances]))
         return '\n'.join(rows)
 
-    @property
-    def triage_time(self):
+    def triage_time(self, bugs):
         delta = timedelta()
         triaged_count = 0
-        for bug in self.opened:
+        for bug in bugs:
             if bug.date_triaged:
                 delta += bug.date_triaged - bug.date_created
                 triaged_count += 1
@@ -137,6 +141,18 @@
     return cycles
 
 
+def make_month_cycles(today, tag_groups, importance_groups, cycle_count=26):
+    """Return a list of monthly bug reporting cycles."""
+    finish = today.replace(day=1)
+    cycles = []
+    for month in range(cycle_count):
+        start = (finish - timedelta(1)).replace(day=1)
+        cycles.append(WorkCycle(start, finish, tag_groups, importance_groups))
+        finish = start
+    cycles.reverse()
+    return cycles
+
+
 def collate_bugs(bugs, cycles):
     """Collate bugs into cycles of opened, closed, and held.
 
@@ -151,6 +167,8 @@
                 break
             if bug.date_created > cycle.finish:
                 continue
+            if not bug.date_closed or not bug.date_closed < cycle.finish:
+                cycle.total.append(bug)
             if (bug.date_created >= cycle.start
                     and bug.date_created < cycle.finish):
                 cycle.opened.append(bug)
@@ -183,7 +201,7 @@
 
 
 def report_cycles(cycles):
-    print("Work Cycle               Total  Opened  Closed  Triage-Time")
+    print("Work Cycle                Held  Opened  Closed  Total Triage-Time")
     for cycle in cycles:
         print(cycle)
 
@@ -201,7 +219,12 @@
     bugs = get_bugs(json_file)
     tag_groups = make_tag_groups(options)
     importance_groups = make_importance_groups(options)
-    cycles = make_cycles(today, tag_groups, importance_groups)
+    if options.monthly:
+        cycles = make_month_cycles(today, tag_groups, importance_groups,
+                                   cycle_count=options.count)
+    else:
+        cycles = make_cycles(today, tag_groups, importance_groups,
+                             cycle_count=options.count)
     collate_bugs(bugs, cycles)
     report_cycles(cycles)
 
@@ -217,9 +240,13 @@
     parser.add_option(
         "-i", "--importance", dest="importance", action="append",
         type="string", help="Match bugs with all of the listed importances.")
+    parser.add_option('--monthly', action='store_true',
+                      help='Display monthly cycles.')
+    parser.add_option('--count', type=int, help='Number of cycles to display')
     parser.set_defaults(
         tags=[],
-        importance=[])
+        importance=[],
+        count=26)
     return parser
 
 

=== modified file 'setup.py'
--- setup.py	2014-01-28 13:39:36 +0000
+++ setup.py	2014-06-17 16:36:46 +0000
@@ -1,8 +1,8 @@
 #!/usr/bin/python
 import subprocess
 
-from distutils.core import setup
-from distutils.command.sdist import sdist
+from setuptools import setup
+from setuptools.command.sdist import sdist
 
 
 class SignedSDistCommand(sdist):