Merge lp:~robru/queuebot/future-proofing into lp:queuebot

[Robert Bruce Park]

In order to support RTM, the citrain spreadsheet is going to grow an extra column or two. This branch makes queuebot find data by column header name rather than by hard-coding column numbers, which means it should have no problem adapting to the new column numbers in the future, whatever might need to change.

[lp:~robru/queuebot/future-proofing]

95. By Robert Bruce Park on 2014-07-16

Key off just the first word of the header.

96. By Robert Bruce Park on 2014-07-16

Use attributes instead of a dict for better readability.

=== modified file 'plugins/landing.py'
--- plugins/landing.py	2014-07-10 13:40:08 +0000
+++ plugins/landing.py	2014-07-16 18:32:22 +0000
@@ -5,12 +5,17 @@
 import threading
 import traceback
 import urllib2
+import re
 
 URL = "https://docs.google.com/spreadsheet/ccc" \
       "?key=0AuDk72Lpx8U5dFVHQ3FuMDJGLUZCamJfSjYzbWh3Wnc" \
       "&usp=sharing&output=csv"
 
 
+class COL:
+    pass
+
+
 class LandingScanner(threading.Thread):
     notices = list()
 
@@ -31,44 +36,55 @@
 
             try:
                 reader = csv.reader(opener.open(URL))
+                # First two lines are ignorable
+                reader.next() and reader.next()
             except Exception as e:
                 print("Unable to read spreadsheet: %s" % e)
                 return
 
+            # Map column header names to column numbers
+            for i, heading in enumerate(reader.next()):
+                setattr(COL, re.split('\W', heading.lower())[0], i)
+
             landing_ready = set()
-            line_num = 0
-            for line in reader:
-                line_num += 1
-
+            for line_num, line in enumerate(reader, start=4):
                 # Do some basic validation
                 if len(line) < 17:
                     continue
 
-                old_status = self.testing_state[self.queue].get(line[0])
-                if old_status != line[12]:
-                    self.testing_state[self.queue][line[0]] = line[12]
-                    if "Testing pass" in line[12]:
-                        self.notices.append(("%s: trainguards, silo %s: %s"
-                                            % (self.queue, line[11], line[12]),
-                                            ("landing",)))
-
-                if line[8] != "Yes" or line[10]:
+                description = line[COL.description]
+                new_status = line[COL.computed]
+                silo_name = line[COL.assigned]
+                landers = line[COL.lander]
+                ready = line[COL.ready]
+                request = line[COL.request]
+
+                old_status = self.testing_state[self.queue].get(description)
+                if old_status != new_status:
+                    self.testing_state[self.queue][description] = new_status
+                    if "Testing pass" in new_status:
+                        self.notices.append((
+                            "%s: trainguards, silo %s: %s"
+                            % (self.queue, silo_name, new_status),
+                            ("landing",)))
+
+                if ready != "Yes" or request:
                     continue
 
-                landing_ready.add(line[0])
+                landing_ready.add(description)
 
                 if self.queue not in self.landing_state:
                     continue
 
                 if self.queue in self.landing_state and \
-                        line[0] in self.landing_state[self.queue]:
+                        description in self.landing_state[self.queue]:
                     continue
 
                 self.notices.append(("%s: trainguards, new landing "
                                      "ready for assignment "
                                      "(line %s, lander is %s)"
                                      % (self.queue, line_num,
-                                        ", ".join(line[1].split())),
+                                        ", ".join(landers.split())),
                                      ("landing",)))
 
             self.landing_state[self.queue] = landing_ready