Merge lp:~powersj/merge-o-matic/enable-team-stats into lp:merge-o-matic

[Joshua Powers]

The stats produced from merge-o-matic are great, however getting details at the team level are not possible. This enables statistics at the team level for any team that wants.

[Brian Murray (brian-murray)]

I've merged this and set it up the server, thanks!

review: Approve

=== modified file 'cron.daily'
--- cron.daily	2017-06-09 00:36:25 +0000
+++ cron.daily	2017-07-06 19:15:08 +0000
@@ -82,6 +82,7 @@
 
 # Produce pretty reports
 ./stats.py $QUIET
+./stats.py $QUIET -t ubuntu-server
 ./stats-graphs.py $QUIET
 ./merge-status.py $QUIET
 ./manual-status.py $QUIET
 
=== modified file 'momlib.py'
--- momlib.py	2017-04-21 12:24:01 +0000
+++ momlib.py	2017-07-06 19:15:08 +0000
@@ -226,6 +226,20 @@
     else:
         return ""
 
+def get_team_packages(team):
+    """Return list of packages owned by a team."""
+    if not team:
+        return []
+
+    mapping_file = "%s/code/package-team-mapping.json" % ROOT
+    if os.path.exists(mapping_file):
+        with open(mapping_file) as ptm_file:
+            for fteam, packages in json.load(ptm_file).items():
+                if team == fteam:
+                    return packages
+
+    return []
+
 # --------------------------------------------------------------------------- #
 # Location functions
 # --------------------------------------------------------------------------- #
 
=== modified file 'stats.py'
--- stats.py	2016-11-13 03:15:26 +0000
+++ stats.py	2017-07-06 19:15:08 +0000
@@ -28,6 +28,7 @@
     get_base,
     get_same_source,
     get_sources,
+    get_team_packages,
     OUR_DIST,
     OUR_DISTRO,
     read_blacklist,
@@ -59,6 +60,8 @@
     parser.add_option("-c", "--component", type="string", metavar="COMPONENT",
                       action="append",
                       help="Process only these destination components")
+    parser.add_option("-t", "--team", type="string", metavar="TEAM",
+                      help="Process only packages owned by this team")
 
 def main(options, args):
     src_distro = options.source_distro
@@ -67,6 +70,8 @@
     our_distro = options.dest_distro
     our_dist = options.dest_suite
 
+    team = options.team
+    team_package_list = get_team_packages(team)
     blacklist = read_blacklist()
 
     # For each package in the destination distribution, locate the latest in
@@ -91,6 +96,9 @@
                 continue
 
             package = our_source["Package"]
+            if team_package_list and package not in team_package_list:
+                continue
+
             our_version = Version(our_source["Version"])
             logging.debug("%s: %s is %s", package, our_distro, our_version)
 
@@ -131,11 +139,15 @@
                 logging.debug("%s: modified", package)
                 stats["modified"] += 1
 
-        write_stats(our_component, stats)
+        write_stats(our_component, stats, team)
 
-def write_stats(component, stats):
+def write_stats(component, stats, team):
     """Write out the collected stats."""
     stats_file = "%s/stats.txt" % ROOT
+
+    if team:
+        stats_file = "%s/stats-%s.txt" % (ROOT, team)
+
     with open(stats_file, "a") as stf:
         stamp = time.strftime("%Y-%m-%d %H:%M", time.gmtime())
         text = " ".join("%s=%d" % (k, v) for k,v in stats.items())