Merge lp:~chad.smith/lp2kanban/allow-mps-linked-to-branch-cards into lp:lp2kanban

[Chad Smith]

Support branch cards that contain either a launchapad MP url or branch url. Emit warnings for cards that link to non-branch/MP urls.

Update regex to match both MP and branch url to kanban.

Add get_lp_branch_name to extract a valid branch url from either MP or branch links provided in card.external_system_url.

Also emit warnings if external_system_url isn't set to a launchpad branch or mp url so we can track down automation issues from jenkins output.

To test:

https://ci.lscape.net/view/Infrastructure/job/kanban-sync/configure
# change the repository URL from lp:lp2kanban to lp:~chad.smith/lp2kanban/allow-mps-linked-to-branch-cards

Then click build.
It'll run against our board
You can watch the "Activity Stream" accessible from the Pie chart icon on the right side of our board (https://canonical.leankit.com/Boards/View/102392996#workflow-view)

Any changes made by kanban-sync will be labelled as performed by "Landscape Robot"

Alternately you can run biuldout locally to setup a local python environment in ./bin/py
make configs
./create_creds.py (then authorize your user for everything in the browser that starts)
./bin/py -c configs/sync.ini -b "Lanscape 2016"

[Benji York (benji)]

This branch looks good.

review: Approve

[lp:~chad.smith/lp2kanban/allow-mps-linked-to-branch-cards]

131. By Chad Smith on 2016-01-15

use raw string for REGEX per review comment

=== modified file 'src/lp2kanban/bugs2cards.py'
--- src/lp2kanban/bugs2cards.py	2016-01-11 16:33:13 +0000
+++ src/lp2kanban/bugs2cards.py	2016-01-15 16:15:22 +0000
@@ -9,7 +9,7 @@
     update_blueprints_from_work_items,
     )
 from lp2kanban.kanban import (
-    BRANCH_REGEX,
+    BRANCH_MP_REGEX,
     LeankitKanban,
     LeankitTaskBoard,
     Record,
@@ -254,9 +254,15 @@
             card_tags = set(card.tags.split(","))
             if feature_tags.intersection(card_tags):
                 linked_cards.add(card)
-        if (branch_links and card.external_system_url and
-              BRANCH_REGEX.match(card.external_system_url)):
-            if card.external_system_url in branch_links:
+        if branch_links and card.external_system_url:
+            match = BRANCH_MP_REGEX.match(card.external_system_url)
+            if not match:
+                continue
+            # Drop any merge content from branch
+            user, project, branchname, _ = match.groups()
+            url = "https://code.launchpad.net/~{}/{}/{}".format(
+                user, project, branchname)
+            if url in branch_links:
                 linked_cards.add(card)
     return linked_cards
             
@@ -341,7 +347,7 @@
         has_id = (card.external_card_id is not None and
                   card.external_card_id.strip() != '')
         has_branch = (card.external_system_url is not None and
-                      BRANCH_REGEX.match(card.external_system_url))
+                      BRANCH_MP_REGEX.match(card.external_system_url))
         if NO_SYNC_MARKER in card.title or NO_SYNC_MARKER in card.description:
             return False
         return (has_id or has_branch)
@@ -569,6 +575,14 @@
     return lp
 
 
+def get_lp_branch_name(url):
+    """Return the branch name from either an MP or branch url provided"""
+    match = BRANCH_MP_REGEX.match(url)
+    if match:
+        return "~" + "/".join(match.groups()[:3])
+    return None
+
+
 def sync_board(board, bconf):
     lp = get_lp(bconf)
     all_projects = []
@@ -600,8 +614,7 @@
         if card.external_card_id:
             # Cards with external_id are processed by getCardsWithExternalIds
             continue
-        branch_name = card.external_system_url.replace(
-            "https://code.launchpad.net/", "")
+        branch_name = get_lp_branch_name(card.external_system_url)
         branch = lp.branches.getByUniqueName(unique_name=branch_name)
         if not branch:
             print "Invalid branch url ({}) for card '{}'".format(
@@ -609,7 +622,8 @@
             continue
         if should_sync_card(card, bconf):
             branch_info = get_branch_info([branch])
-            owner_name = BRANCH_REGEX.match(card.external_system_url).group(1)
+            owner_name = BRANCH_MP_REGEX.match(
+                card.external_system_url).group(1)
             card_status = get_card_status(None, '', branch_info)
             card_path = card.lane.path
             if isinstance(card.lane.board, LeankitTaskBoard):

=== modified file 'src/lp2kanban/kanban.py'
--- src/lp2kanban/kanban.py	2016-01-11 16:33:13 +0000
+++ src/lp2kanban/kanban.py	2016-01-15 16:15:22 +0000
@@ -11,8 +11,8 @@
 
 
 ANNOTATION_REGEX = re.compile('^\s*{.*}\s*$', re.MULTILINE|re.DOTALL)
-BRANCH_REGEX = re.compile(
-    '^https://code.launchpad.net/~([.\w]*)/([-\w]*)/([-\w]*)$')
+BRANCH_MP_REGEX = re.compile(
+    r'^https?://code.launchpad.net/~([-.\w]*)/([-\w]*)/([-\w]*)/?(.*merge/\d+)?$')
 
 
 class Record(dict):
@@ -559,9 +559,13 @@
             if card.description_annotations:
                 self._cards_with_description_annotations.add(card)
             if card.external_system_url:
+                url = card.external_system_url.encode('ascii', 'ignore')
                 self._cards_with_external_links.add(card)
-                if BRANCH_REGEX.match(card.external_system_url):
+                if BRANCH_MP_REGEX.match(card.external_system_url):
                     self._cards_with_branches.add(card)
+                else:
+                    print ("WARNING: Card won't sync. Non-branch link ({}) "
+                           "for {}.".format(url, card.title))
         print "   - %s feature cards" % len(
             self._feature_cards)
         print "   - %s cards with external ids" % len(
@@ -772,7 +776,7 @@
         print " * %s (%d)" % (board.title, board.id)
 
     # Get a board by the title.
-    board_name = 'Landscape Test Board'
+    board_name = 'Landscape 2016'
     print "Getting board '%s'..." % board_name
     board = kanban.getBoard(title=board_name)
     board.printLanes()

=== modified file 'src/lp2kanban/tests/test_bugs2cards.py'
--- src/lp2kanban/tests/test_bugs2cards.py	2016-01-11 16:33:13 +0000
+++ src/lp2kanban/tests/test_bugs2cards.py	2016-01-15 16:15:22 +0000
@@ -349,6 +349,7 @@
         self.assertEqual(CardStatus.CODING, status)
 
 BRANCH_URL = "https://code.launchpad.net/~me/project/branch-name"
+MP_URL = "https://code.launchpad.net/~me/project/branch-name/+merge/1234"
 
 class CardStatusTest(unittest.TestCase):
 
@@ -639,16 +640,22 @@
         """
         linked_card = FauxCard(
              tags="no-tag-match", external_system_url=BRANCH_URL)
+        linked_card_with_trailing_slash = FauxCard(
+             tags="no-tag-match", external_system_url=BRANCH_URL+"/")
+        mp_linked_card = FauxCard(
+             tags="no-tag-match", external_system_url=MP_URL)
         tagged_card = FauxCard(
              tags="feature1",
              external_system_url=BRANCH_URL + "no-branch-match")
         self.board.cards.extend([
-            linked_card, tagged_card,
+            linked_card, tagged_card, mp_linked_card,
+            linked_card_with_trailing_slash,
             FauxCard(tags="no-tag-match",
                      external_system_url=BRANCH_URL + "no-branch-match")])
         cards = get_cards_for_feature(self.feature_card, self.feature_bug)
         self.assertItemsEqual([
-            self.feature_card, linked_card, tagged_card],
+            self.feature_card, linked_card, linked_card_with_trailing_slash,
+            mp_linked_card, tagged_card],
             cards)
 
     def test_get_cards_for_feature_gets_cards_with_either_tags_or_links(self):