Merge lp:~mabac/launchpad-work-items-tracker/external-config into lp:~linaro-automation/launchpad-work-items-tracker/linaro

[Mattias Backman]

Hi,

This branch move the setting of current lane to an external config file. We can maintain this file next to the milestone cfg files in linaro-config for instance.

Thanks,

Mattias

[Guilherme Salgado (salgado)]

Nice and simple!

 review approve

review: Approve

=== modified file 'all-projects'
--- all-projects	2011-12-07 09:03:27 +0000
+++ all-projects	2012-01-24 15:17:24 +0000
@@ -69,6 +69,8 @@
 def main():
     parser = optparse.OptionParser(usage="%prog <database dir> <www root dir> [www root url]")
     parser.add_option("--config-dir", dest="config_dir", default="config")
+    parser.add_option("--roadmap-config-file", dest="roadmap_config_file",
+                      default="roadmap-config")
     parser.add_option("--debug", dest="debug", action="store_true")
     parser.add_option("--token-file", dest="token_file")
     opts, args = parser.parse_args()
@@ -133,7 +135,8 @@
         else:
             sys.stderr.write("No API token given to collect_roadmap for %s" % project_name)
 
-        if not collect_roadmap(source_dir, db_file, config_file, extra_collect_roadmap_args):
+        if not collect_roadmap(source_dir, db_file, args.roadmap_config_file,
+                               extra_collect_roadmap_args):
             sys.stderr.write("collect_roadmap failed for %s" % project_name)
 
         publish_new_db(project_name, project_output_dir, db_file)

=== modified file 'collect_roadmap'
--- collect_roadmap	2011-12-22 11:53:37 +0000
+++ collect_roadmap	2012-01-24 15:17:24 +0000
@@ -32,8 +32,6 @@
 logger = logging.getLogger("linaroroadmap")
 
 
-CURRENT_LANE = '2011Q4' # Until we find how to keep this in an external config.
-
 def dbg(msg):
     '''Print out debugging message if debugging is enabled.'''
     logger.debug(msg)
@@ -58,7 +56,7 @@
     return data
 
 
-def kanban_import_lanes(collector, workflow_stages):
+def kanban_import_lanes(collector, workflow_stages, cfg):
     nodes = {}
     root_node_id = None
     lanes_to_ignore = ['Legend']
@@ -83,7 +81,7 @@
         assert node['parent_id'] == root_node_id
         model_lane = Lane(get_json_item(node, 'name'),
                           node['id'])
-        if model_lane.name == CURRENT_LANE:
+        if model_lane.name == cfg['current_lane']:
             model_lane.is_current = True
         else:
             model_lane.is_current = False
@@ -157,7 +155,7 @@
     assert board is not None, "Could not access board %s." % board_id
     card_types = board['board']['card_types']
     status_list = kanban_import_lanes(collector,
-                                      board['board']['workflow_stages'])
+                                      board['board']['workflow_stages'], cfg)
 
     tasks_url = get_kanban_url('boards/%s/tasks.json' % board_id, api_token)
     tasks = get_json_data(tasks_url)