Merge lp:~matiasb/locolander/repo-services-fixes into lp:locolander

[Matias Bordese]

- Fixed LP regex validation.
- Updated GitHub source/target returned values.

- Fixed LP regex validation.
- Updated GitHub source/target returned values.

[Natalia Bidart (nataliabidart)]

Looks good.

review: Approve

=== modified file 'locolander/locolanderweb/tests/test_models.py'
--- locolander/locolanderweb/tests/test_models.py	2013-07-06 23:19:29 +0000
+++ locolander/locolanderweb/tests/test_models.py	2013-07-13 19:29:25 +0000
@@ -34,7 +34,7 @@
     'locolander',
     'launchpad.net',
     'launchpad.net/foo',
-    ###'lp:launchpad.net/foo',
+    'lp:launchpad.net/foo',
     'https://github.com/username',
     '[e-mail]:foo/dippi-dapi',
 )
 
=== modified file 'locolander/repos/github.py'
--- locolander/repos/github.py	2013-06-23 15:12:30 +0000
+++ locolander/repos/github.py	2013-07-13 19:29:25 +0000
@@ -23,6 +23,9 @@
         # GitHub API access
         self.gh = GitHub()
 
+    def _get_clone_url(self, username, repo_name):
+        return "https://github.com/%s/%s.git" % (username, repo_name)
+
     def _is_approved_comment(self, repo, comment):
         # this is an 'approved' comment by a commiter
         lines = comment.body.split('\n')
@@ -55,10 +58,10 @@
                 approved.append({
                     # XXX: needs UTC processing?
                     'date_created': pull.created_at,
-                    ### 'source_repo': self.gh.repository(*pull.base.repo),
-                    'source': pull.base.ref,
-                    ### 'target_repo': self.gh.repository(*pull.head.repo),
-                    'target': pull.head.ref,
+                    'source': "%s %s" % (self._get_clone_url(*pull.base.repo),
+                                         pull.base.ref),
+                    'target': "%s %s" % (self._get_clone_url(*pull.head.repo),
+                                         pull.head.ref),
                     'reviewers': last_comment.user.login,  # csv
                     'commit_message': commit_message,
                 })
 
=== modified file 'locolander/repos/launchpad.py'
--- locolander/repos/launchpad.py	2013-07-06 23:19:29 +0000
+++ locolander/repos/launchpad.py	2013-07-13 19:29:25 +0000
@@ -11,7 +11,7 @@
 
 
 CACHE_DIR = os.path.join(os.path.expanduser('~'), '.launchpadlib', 'cache')
-LAUNCHPAD_LP_RE = re.compile(r'^lp:(?:~[^/]+/)?([^/]+)(?:/[^/]+)?$')
+LAUNCHPAD_LP_RE = re.compile(r'^lp:(?:~[^/]+/)?([^/\.]+)(?:/[^/]+)?$')
 LAUNCHPAD_HTTPS_RE = re.compile(
     r'^http(s)?://launchpad.net/(?:~[^/]+/)?([^/]+)$')
 
 
=== modified file 'locolander/repos/tests/test_github.py'
--- locolander/repos/tests/test_github.py	2013-07-06 22:26:19 +0000
+++ locolander/repos/tests/test_github.py	2013-07-13 19:29:25 +0000
@@ -25,12 +25,12 @@
 class FakePullRequest(object):
     """Fake GitHub pull request."""
 
-    def __init__(self, status=None, is_approved=False):
+    def __init__(self, base, head, status=None, is_approved=False):
         self.is_approved = is_approved
         self.status = status
         self.created_at = datetime.now()
-        self.base = FakeRepo()
-        self.head = FakeRepo()
+        self.base = FakeRepo(name=base)
+        self.head = FakeRepo(name=head)
 
     def iter_issue_comments(self):
         is_collaborator = self.is_approved
@@ -42,8 +42,10 @@
 class FakeRepo(object):
     """Fake GitHub project repo."""
 
-    def __init__(self, is_approved=False):
+    def __init__(self, name, is_approved=False):
+        self.name = name
         self.is_approved = is_approved
+        self.repo = ('user', self.name)
         self.ref = 'master'
         self.status = 'no-approved'
         if is_approved:
@@ -51,10 +53,11 @@
 
     def iter_pulls(self, state):
         if self.is_approved:
-            pulls = [FakePullRequest(),
-                     FakePullRequest(status='approved', is_approved=True)]
+            pulls = [FakePullRequest('source', self.name),
+                     FakePullRequest('source', self.name,
+                                     status='approved', is_approved=True)]
         else:
-            pulls = [FakePullRequest()]
+            pulls = [FakePullRequest('source', self.name)]
         return pulls
 
     def is_collaborator(self, username):
@@ -67,8 +70,8 @@
     def __init__(self):
         self.data = {}
         repos = {
-            'test-repo': FakeRepo(is_approved=True),
-            'another-repo': FakeRepo(),
+            'test-repo': FakeRepo(name='test-repo', is_approved=True),
+            'another-repo': FakeRepo(name='another-repo'),
         }
         self.data['test-user'] = repos
 
@@ -116,3 +119,15 @@
         for key in expected_keys:
             self.assertIn(key, mp)
         self.assertEqual(mp['commit_message'], 'commit msg')
+
+    def test_approved_mp_source_target(self):
+        mps = self.gh.approved_requests_for_project_url(
+            '[e-mail]:test-user/test-repo.git')
+        self.assertEqual(len(mps), 1)
+        mp = mps[0]
+
+        self.assertIsInstance(mp, dict)
+        self.assertEqual(
+            mp['source'], 'https://github.com/user/source.git master')
+        self.assertEqual(
+            mp['target'], 'https://github.com/user/test-repo.git master')