Merge lp:~abentley/lp-release-manager-tools/extract-pull-bugs into lp:~sinzui/lp-release-manager-tools/trunk

[Aaron Bentley]

Extract pull_bugs and get_bug_records.

This branch extracts pull_bugs, transform_bugs and get_bug_records, so that bugs can be stored and retrieved in alternative ways (i.e. mongodb).

pull_bugs becomes a method that updates bugs, accept and outputing JSON.

transform_bugs is used before supplying data to pull_bugs.

get_bug_records is used to transform bugs into records, so that report_bugs does not require file access.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'lp_release_tools/pull_bugs.py'
--- lp_release_tools/pull_bugs.py	2014-05-15 20:03:33 +0000
+++ lp_release_tools/pull_bugs.py	2014-06-17 18:32:39 +0000
@@ -45,8 +45,11 @@
     with open(options.union_file, 'r') as in_file:
         previous_json = in_file.read()
     previous_data = json.loads(previous_json)
-    previous_bugs = dict([(b['bug_id'], b) for b in previous_data['bugs']])
-    return previous_bugs
+    return transform_bug_data(previous_data)
+
+
+def transform_bug_data(previous_data):
+    return dict([(b['bug_id'], b) for b in previous_data['bugs']])
 
 
 def get_bug_data(target, all_bugs, search_params, private=False):
@@ -139,13 +142,24 @@
         'milestone-report',
         service_root='https://api.launchpad.net',
         version='devel', credentials_file=options.credentials)
+    json_source = pull_bugs(
+        project, lp, all_bugs, status=options.statuses,
+        modified_since=options.since, importance=options.importance,
+        milestone=options.milestone, tags=options.tags,
+        private=options.private)
+    json_data = json.dumps(json_source, indent=0)
+    with open(options.outfile, 'w') as json_file:
+        json_file.write(json_data)
+
+
+def pull_bugs(project, lp, all_bugs, status, modified_since, importance,
+              milestone, tags, private):
     targets = get_targets(lp, project)
     search_params = dict(
-        status=options.statuses, modified_since=options.since,
-        importance=options.importance, milestone=options.milestone,
-        tags=options.tags, tags_combinator='All')
+        status=status, modified_since=modified_since, importance=importance,
+        milestone=milestone, tags=tags, tags_combinator='All')
     for target in targets:
-        count = get_bug_data(target, all_bugs, search_params, options.private)
+        count = get_bug_data(target, all_bugs, search_params, private)
         print(count)
     print(len(all_bugs))
     now = datetime.utcnow()
@@ -153,9 +167,7 @@
         u'date_retrieved': now.isoformat(' '),
         u'bugs': all_bugs.values(),
     }
-    json_data = json.dumps(json_source, indent=0)
-    with open(options.outfile, 'w') as json_file:
-        json_file.write(json_data)
+    return json_source
 
 
 if __name__ == '__main__':

=== modified file 'lp_release_tools/report_bugs.py'
--- lp_release_tools/report_bugs.py	2014-06-17 16:29:18 +0000
+++ lp_release_tools/report_bugs.py	2014-06-17 18:32:39 +0000
@@ -111,7 +111,10 @@
 def get_bugs(json_file):
     with open(json_file, 'r') as in_file:
         bug_json = in_file.read()
-    bug_data = json.loads(bug_json)
+    return get_bug_records(json.loads(bug_json))
+
+
+def get_bug_records(bug_data):
     bugs = []
     for bug in bug_data['bugs']:
         for field in bug: