Merge lp:~ricardokirkner/locolander/add-author into lp:locolander

[Ricardo Kirkner]

added author to MergeRequest model

[lp:~ricardokirkner/locolander/add-author]

20. By Ricardo Kirkner on 2013-07-13

expose locolanderweb models in admin

[Natalia Bidart (nataliabidart)]

Changes for the new author field looks good, but there seem to be a mixup in the diff since the next branch has 0 diff lines, and this one includes all the celery tasks things.

review: Needs Fixing

[lp:~ricardokirkner/locolander/add-author]

21. By Ricardo Kirkner on 2013-07-14

merged trunk

22. By Ricardo Kirkner on 2013-07-14

regenerated migration

[Natalia Bidart (nataliabidart)]

Code looks good! One detail: in a branch of mine you made me remove the datetime(created.year, created.month, created.day) to avoid loosing the precision from mp.date_created, any reason for you to revert that?

Leaving my approve vote, if you think the mp.date_created is a merge error, please revert before landing.

review: Approve

[Ricardo Kirkner (ricardokirkner)]

> Code looks good! One detail: in a branch of mine you made me remove the
> datetime(created.year, created.month, created.day) to avoid loosing the
> precision from mp.date_created, any reason for you to revert that?
>
> Leaving my approve vote, if you think the mp.date_created is a merge error,
> please revert before landing.

It is an artifact from my pre-merged branch. Fixed, thanks!

[lp:~ricardokirkner/locolander/add-author]

23. By Ricardo Kirkner on 2013-07-20

merged trunk

24. By Ricardo Kirkner on 2013-07-20

reverted unwanted changes

=== added file 'locolander/locolanderweb/admin.py'
--- locolander/locolanderweb/admin.py	1970-01-01 00:00:00 +0000
+++ locolander/locolanderweb/admin.py	2013-07-20 18:17:23 +0000
@@ -0,0 +1,8 @@
+from django.contrib import admin
+
+from locolanderweb.models import MergeRequest, Project, RunLog
+
+
+admin.site.register(Project)
+admin.site.register(MergeRequest)
+admin.site.register(RunLog)

=== added file 'locolander/locolanderweb/migrations/0004_auto__add_field_mergerequest_author.py'
--- locolander/locolanderweb/migrations/0004_auto__add_field_mergerequest_author.py	1970-01-01 00:00:00 +0000
+++ locolander/locolanderweb/migrations/0004_auto__add_field_mergerequest_author.py	2013-07-20 18:17:23 +0000
@@ -0,0 +1,87 @@
+# -*- coding: utf-8 -*-
+from south.db import db
+from south.v2 import SchemaMigration
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'MergeRequest.author'
+        db.add_column(u'locolanderweb_mergerequest', 'author',
+                      self.gf('django.db.models.fields.TextField')(default=''),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'MergeRequest.author'
+        db.delete_column(u'locolanderweb_mergerequest', 'author')
+
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        u'locolanderweb.mergerequest': {
+            'Meta': {'object_name': 'MergeRequest'},
+            'author': ('django.db.models.fields.TextField', [], {'default': "''"}),
+            'commit_message': ('django.db.models.fields.TextField', [], {}),
+            'date_completed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['locolanderweb.Project']"}),
+            'reviewers': ('django.db.models.fields.TextField', [], {}),
+            'source': ('django.db.models.fields.TextField', [], {}),
+            'status': ('django.db.models.fields.CharField', [], {'default': "'pending'", 'max_length': '128'}),
+            'target': ('django.db.models.fields.TextField', [], {})
+        },
+        u'locolanderweb.project': {
+            'Meta': {'object_name': 'Project'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.TextField', [], {}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        },
+        u'locolanderweb.runlog': {
+            'Meta': {'object_name': 'RunLog'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'merge_request': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['locolanderweb.MergeRequest']"}),
+            'raw': ('django.db.models.fields.TextField', [], {}),
+            'return_code': ('django.db.models.fields.IntegerField', [], {}),
+            'timestamp': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.utcnow'})
+        }
+    }
+
+    complete_apps = ['locolanderweb']

=== modified file 'locolander/locolanderweb/models.py'
--- locolander/locolanderweb/models.py	2013-07-06 23:19:29 +0000
+++ locolander/locolanderweb/models.py	2013-07-20 18:17:23 +0000
@@ -55,6 +55,7 @@
     source = models.TextField()
     target = models.TextField()
     commit_message = models.TextField()
+    author = models.TextField(default='')
     reviewers = models.TextField()
     date_created = models.DateTimeField()
     date_completed = models.DateTimeField(null=True, blank=True)

=== modified file 'locolander/locolanderweb/tests/test_base.py'
--- locolander/locolanderweb/tests/test_base.py	2013-07-06 23:19:29 +0000
+++ locolander/locolanderweb/tests/test_base.py	2013-07-20 18:17:23 +0000
@@ -46,7 +46,8 @@
     def make_merge_request(
             self, project=None, status=STATUS_PENDING,
             source=None, target=None, commit_message=None,
-            reviewers=None, date_created=None, date_completed=None):
+            author=None, reviewers=None, date_created=None,
+            date_completed=None):
         if project is None:
             project = self.make_project()
         if source is None:
@@ -55,13 +56,15 @@
             target = 'http://foo.target'
         if commit_message is None:
             commit_message = 'Foo bar commit message.'
+        if author is None:
+            author = 'Some Person <some@domain>'
         if reviewers is None:
             reviewers = ['mengano', 'fulano']
         if date_created is None:
             date_created = datetime.utcnow()
         return MergeRequest.objects.create(
             project=project, status=status, source=source, target=target,
-            commit_message=commit_message, reviewers=reviewers,
+            commit_message=commit_message, author=author, reviewers=reviewers,
             date_created=date_created, date_completed=date_completed)
 
     def make_run_log(self, merge_request=None, return_code=0, raw=None):

=== modified file 'locolander/locolanderweb/tests/test_models.py'
--- locolander/locolanderweb/tests/test_models.py	2013-07-13 16:00:06 +0000
+++ locolander/locolanderweb/tests/test_models.py	2013-07-20 18:17:23 +0000
@@ -120,7 +120,8 @@
         self.obj = MergeRequest.objects.create(
             project=self.project,
             source='source', target='target', commit_message='commit',
-            reviewers='fulano, mengano', date_created=self.created)
+            author='Some Person <some@domain>', reviewers='fulano, mengano',
+            date_created=self.created)
 
     def test_status_default(self):
         self.assertEqual(self.obj.status, STATUS_PENDING)
@@ -139,6 +140,9 @@
     def test_commit_message(self):
         self.assertEqual(self.obj.commit_message, 'commit')
 
+    def test_author(self):
+        self.assertEqual(self.obj.author, 'Some Person <some@domain>')
+
     def test_reviewers(self):
         self.assertEqual(self.obj.reviewers, 'fulano, mengano')
 

=== modified file 'locolander/repos/launchpad.py'
--- locolander/repos/launchpad.py	2013-07-13 16:00:06 +0000
+++ locolander/repos/launchpad.py	2013-07-20 18:17:23 +0000
@@ -5,6 +5,8 @@
 import os
 import re
 
+import bzrlib.plugin
+from bzrlib.branch import Branch
 from launchpadlib.launchpad import Launchpad
 
 from repos import errors
@@ -29,6 +31,14 @@
         self.launchpad = Launchpad.login_anonymously(
             'locolander', 'production', CACHE_DIR)
         self.lp_projects = self.launchpad.projects
+        # load bzr plugins so that lp: namespace is recognized
+        bzrlib.plugin.load_plugins()
+
+    def get_author(self, branch_url):
+        branch = Branch.open(branch_url)
+        tip = branch.repository.get_revision(
+            branch.get_rev_id(branch.revno()))
+        return tip.committer
 
     def approved_requests_for_project_url(self, project_url):
         """Return approved merge proposals."""
@@ -56,5 +66,6 @@
                     'target': mp.target_branch.bzr_identity,
                     'reviewers': mp.reviewer.name,  # csv
                     'commit_message': mp.commit_message,
+                    'author': self.get_author(mp.source_branch.bzr_identity),
                 })
         return approved

=== modified file 'locolander/repos/tests/test_launchpad.py'
--- locolander/repos/tests/test_launchpad.py	2013-07-06 22:26:19 +0000
+++ locolander/repos/tests/test_launchpad.py	2013-07-20 18:17:23 +0000
@@ -3,11 +3,16 @@
 from datetime import datetime
 from unittest import TestCase
 
+import bzrlib.branch
 from mock import Mock, patch
 
 from repos import errors, launchpad
 
 
+# fake bzrlib Branch object
+FakeBranch = Mock(spec=bzrlib.branch.Branch)
+
+
 class FakeMP(object):
     """Fake launchpadlib Merge Proposal object."""
 
@@ -71,26 +76,40 @@
         with self.assertRaises(errors.RepositoryDoesNotExist):
             self.lp.approved_requests_for_project_url('lp:not-found')
 
-    def test_valid_project_without_approved_mp(self):
-        mps = self.lp.approved_requests_for_project_url('lp:test-project')
-        self.assertEqual(len(mps), 1)
-        mp = mps[0]
-        self.assertIsInstance(mp, dict)
-
-        expected_keys = ['date_created', 'source', 'target', 'reviewers',
-                         'commit_message']
-        for key in expected_keys:
-            self.assertIn(key, mp)
-        self.assertEqual(mp['commit_message'], 'approved mp')
-
-    def test_valid_project_return_approved_mp(self):
-        mps = self.lp.approved_requests_for_project_url('lp:test-project')
-        self.assertEqual(len(mps), 1)
-        mp = mps[0]
-        self.assertIsInstance(mp, dict)
-
-        expected_keys = ['date_created', 'source', 'target', 'reviewers',
-                         'commit_message']
-        for key in expected_keys:
-            self.assertIn(key, mp)
-        self.assertEqual(mp['commit_message'], 'approved mp')
+    @patch('repos.launchpad.Branch.open')
+    def test_valid_project_without_approved_mp(self, mock_open):
+        mps = self.lp.approved_requests_for_project_url('lp:test-project')
+        self.assertEqual(len(mps), 1)
+        mp = mps[0]
+        self.assertIsInstance(mp, dict)
+
+        expected_keys = ['date_created', 'source', 'target', 'reviewers',
+                         'commit_message', 'author']
+        for key in expected_keys:
+            self.assertIn(key, mp)
+        self.assertEqual(mp['commit_message'], 'approved mp')
+
+    @patch('repos.launchpad.Branch.open')
+    def test_valid_project_return_approved_mp(self, mock_open):
+        mps = self.lp.approved_requests_for_project_url('lp:test-project')
+        self.assertEqual(len(mps), 1)
+        mp = mps[0]
+        self.assertIsInstance(mp, dict)
+
+        expected_keys = ['date_created', 'source', 'target', 'reviewers',
+                         'commit_message', 'author']
+        for key in expected_keys:
+            self.assertIn(key, mp)
+        self.assertEqual(mp['commit_message'], 'approved mp')
+
+    @patch('repos.launchpad.Branch.open')
+    def test_get_author(self, mock_open):
+        mock_revision = Mock()
+        mock_revision.committer = 'The Author <[e-mail]>'
+        mock_repository = Mock()
+        mock_repository.get_revision.return_value = mock_revision
+        mock_open.return_value.repository = mock_repository
+
+        author = self.lp.get_author('lp:test-project')
+
+        self.assertEqual(author, 'The Author <[e-mail]>')