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

[Ricardo Kirkner]

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

20. By Ricardo Kirkner on 2013-07-13

expose locolanderweb models in admin

21. By Ricardo Kirkner on 2013-07-14

merged trunk

22. By Ricardo Kirkner on 2013-07-14

regenerated migration

23. By Ricardo Kirkner on 2013-07-20

merged trunk

24. By Ricardo Kirkner on 2013-07-20

reverted unwanted changes

Unmerged revisions

=== modified file '.bzrignore'
--- .bzrignore	2013-06-21 22:23:29 +0000
+++ .bzrignore	2013-07-13 17:31:27 +0000
@@ -1,2 +1,3 @@
 docker/files/ssh
 locolander.db
+supervisord.log

=== modified file '.locolander.yml'
--- .locolander.yml	2013-06-29 22:14:32 +0000
+++ .locolander.yml	2013-07-13 17:31:27 +0000
@@ -1,26 +1,5 @@
 precise:
-    pip:
-        distribute: 0.6.34
-        Django: 1.5.1
-        github3.py: 0.7.0
-        httplib2: 0.8.0
-        keyring: 1.5.0
-        launchpadlib: 1.10.2
-        lazr.authentication: 0.1.2
-        lazr.restfulclient: 0.13.3
-        lazr.uri: 1.0.3
-        mock: 1.0.1
-        oauth: 1.0.1
-        pep8: 1.4.5
-        pyflakes: 0.7.2
-        PyYAML: 3.10.0
-        requests: 1.2.3
-        simplejson: 3.3.0
-        South: 0.8.1
-        testresources: 0.2.7
-        wadllib: 1.3.2
-        wsgi-intercept: 0.5.1
-        zope.interface: 4.0.5
+    pip: -r requirements.txt
 
 metadata:
     test_script: ./run_tests.sh

=== modified file 'README'
--- README	2013-06-21 20:26:50 +0000
+++ README	2013-07-13 17:31:27 +0000
@@ -1,50 +1,40 @@
 
+==========
 LocoLander
 ==========
 
-.. image:: locolander/locolanderweb/media/locolander.png
-
-
-To Do
-=====
-
-* automate docker bootstrap
-
-  - install docker
-  - install squid
-  - setup squid as a global cache
-
-* generate Dockerfile
-
-  - parse custom project file
-  - write Dockerfile for project image
-  - include "env http_proxy http://172.16.42.1:3128" in Dockerfile to use global squid cache
-
-* build project images
-
-  - use generated Dockerfile to run 'docker build'
-
-    - step1: install base image and system packages
-    - step2: download pip dependencies from PyPI
-    - step3: cut internet access
-    - step4: install pip dependencies from locally downloaded cache
-
-  - tag built image with project name
-
-* main script
-
-  - get target branch (trunk)
-  - merge source branch into target
-  - run tests
-  - capture output
-  - commit merge and push to target upstream
-
-* main process
-
-  - build project image
-  - run main script in image
-  - extract output from container
-
-* prevent inbound/outbound network access inside of container
-
-* implement quotas (disk, cpu, mem)
+.. image::- locolander/locolanderweb/media/locolander.png
+
+
+Installing
+==========
+
+As redis cannot be installed in a virtualenv, you'll need to install it from
+the system packages
+::
+
+    sudo apt-get install redis-server
+
+Everything else can be installed in a virtualenv
+::
+
+    sudo apt-get install fabric
+    fab bootstrap
+
+
+Running
+=======
+
+Once everything is installed, you can start the full stack easily
+::
+
+    fab start_supervisor
+
+
+Developing
+==========
+
+In order to run the tests, you can just do
+::
+
+    fab test

=== added file 'TODO'
--- TODO	1970-01-01 00:00:00 +0000
+++ TODO	2013-07-13 17:31:27 +0000
@@ -0,0 +1,43 @@
+To Do
+=====
+
+* automate docker bootstrap
+
+  - install docker
+  - install squid
+  - setup squid as a global cache
+
+* generate Dockerfile
+
+  - parse custom project file
+  - write Dockerfile for project image
+  - include "env http_proxy http://172.16.42.1:3128" in Dockerfile to use global squid cache
+
+* build project images
+
+  - use generated Dockerfile to run 'docker build'
+
+    - step1: install base image and system packages
+    - step2: download pip dependencies from PyPI
+    - step3: cut internet access
+    - step4: install pip dependencies from locally downloaded cache
+
+  - tag built image with project name
+
+* main script
+
+  - get target branch (trunk)
+  - merge source branch into target
+  - run tests
+  - capture output
+  - commit merge and push to target upstream
+
+* main process
+
+  - build project image
+  - run main script in image
+  - extract output from container
+
+* prevent inbound/outbound network access inside of container
+
+* implement quotas (disk, cpu, mem)

=== added directory 'config'
=== added file 'config/supervisord.conf'
--- config/supervisord.conf	1970-01-01 00:00:00 +0000
+++ config/supervisord.conf	2013-07-13 17:31:27 +0000
@@ -0,0 +1,37 @@
+; Sample supervisor config file.
+
+[supervisord]
+nodaemon = true
+loglevel = info
+logfile = supervisord.log
+
+
+; service configuration sections
+
+[program:gunicorn]
+command = gunicorn_django locolander/locolander/settings.py
+autostart = true
+autorestart = true
+stdout_logfile = supervisord.log
+redirect_stderr = true
+
+[program:redis]
+command = redis-server
+autostart = true
+autorestart = true
+stdout_logfile = supervisord.log
+redirect_stderr = true
+
+[program:celeryd]
+command = python locolander/manage.py celeryd
+autostart = true
+autorestart = true
+stdout_logfile = supervisord.log
+redirect_stderr = true
+
+[program:flower]
+command = python locolander/manage.py celery flower
+autostart = true
+autorestart = true
+stdout_logfile = supervisord.log
+redirect_stderr = true

=== modified file 'fabfile.py'
--- fabfile.py	2013-07-09 18:42:01 +0000
+++ fabfile.py	2013-07-13 17:31:27 +0000
@@ -24,3 +24,28 @@
 @virtualenv
 def test():
     local('./run_tests.sh')
+
+
+@virtualenv
+def start_redis():
+    local('redis-server')
+
+
+@virtualenv
+def start_gunicorn():
+    local('gunicorn_django locolander/locolander/settings.py')
+
+
+@virtualenv
+def start_celery():
+    manage('celeryd')
+
+
+@virtualenv
+def start_flower():
+    manage('celery flower')
+
+
+@virtualenv
+def start_supervisor():
+    local('supervisord -c config/supervisord.conf -n')

=== modified file 'locolander/locolander/settings.py'
--- locolander/locolander/settings.py	2013-06-23 00:00:56 +0000
+++ locolander/locolander/settings.py	2013-07-13 17:31:27 +0000
@@ -2,9 +2,6 @@
 
 import os
 
-from django.core.urlresolvers import reverse
-
-
 PROJECT_DIR = os.path.abspath(os.path.dirname(__file__))
 
 DEBUG = True
@@ -134,6 +131,7 @@
     # 'django.contrib.admindocs',
     'locolanderweb',
     'south',
+    'djcelery',
 )
 
 # A sample logging configuration. The only tangible logging
@@ -165,10 +163,11 @@
     }
 }
 
-LOGIN_URL = reverse('login')
-LOGIN_REDIRECT_URL = reverse('home')
-
-try:
-    from local_setting import *
-except:
-    pass
+# settings for celery/redis
+import djcelery
+djcelery.setup_loader()
+
+BROKER_URL = 'redis://localhost:6379/0'
+
+LOGIN_URL = '/login/'
+LOGIN_REDIRECT_URL = '/'

=== modified file 'locolander/locolander/urls.py'
--- locolander/locolander/urls.py	2013-06-23 00:00:56 +0000
+++ locolander/locolander/urls.py	2013-07-13 17:31:27 +0000
@@ -1,5 +1,6 @@
 from django.conf.urls import patterns, include, url
 from django.contrib import admin
+from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 admin.autodiscover()
 
 
@@ -14,3 +15,6 @@
     # Uncomment the next line to enable the admin:
     url(r'^admin/', include(admin.site.urls)),
 )
+
+# enable staticfiles for gunicorn
+urlpatterns += staticfiles_urlpatterns()

=== added file 'locolander/locolanderweb/migrations/0003_auto__chg_field_project_url__add_field_mergerequest_author.py'
--- locolander/locolanderweb/migrations/0003_auto__chg_field_project_url__add_field_mergerequest_author.py	1970-01-01 00:00:00 +0000
+++ locolander/locolanderweb/migrations/0003_auto__chg_field_project_url__add_field_mergerequest_author.py	2013-07-13 17:31:27 +0000
@@ -0,0 +1,93 @@
+# -*- coding: utf-8 -*-
+from south.db import db
+from south.v2 import SchemaMigration
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+
+        # Changing field 'Project.url'
+        db.alter_column(u'locolanderweb_project', 'url', self.gf('django.db.models.fields.CharField')(max_length=256))
+        # 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):
+
+        # Changing field 'Project.url'
+        db.alter_column(u'locolanderweb_project', 'url', self.gf('django.db.models.fields.URLField')(max_length=200))
+        # 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-13 17:31:27 +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-13 17:31:27 +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-06 23:19:29 +0000
+++ locolander/locolanderweb/tests/test_models.py	2013-07-13 17:31:27 +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-06 23:19:29 +0000
+++ locolander/repos/launchpad.py	2013-07-13 17:31:27 +0000
@@ -5,6 +5,10 @@
 import os
 import re
 
+from datetime import datetime
+
+import bzrlib.plugin
+from bzrlib.branch import Branch
 from launchpadlib.launchpad import Launchpad
 
 from repos import errors
@@ -29,6 +33,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."""
@@ -49,12 +61,15 @@
         proposals = repo.getMergeProposals()
         for mp in proposals:
             if mp.queue_status.lower() == 'approved':
+                created = mp.date_created
                 approved.append({
                     # XXX: needs UTC processing?
-                    'date_created': mp.date_created,
+                    'date_created': datetime(created.year, created.month,
+                                             created.day),
                     'source': mp.source_branch.bzr_identity,
                     '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-13 17:31:27 +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]>')

=== modified file 'requirements.txt'
--- requirements.txt	2013-07-13 15:38:09 +0000
+++ requirements.txt	2013-07-13 17:31:27 +0000
@@ -1,22 +1,40 @@
-distribute==0.6.34
+amqp==1.0.12
+anyjson==0.3.3
+billiard==2.7.3.31
+bzr==2.6b2
+celery==3.0.21
+cssselect==0.8
 Django==1.5.1
+django-celery==3.0.17
+flower==0.5.2
 github3.py==0.7.0
+gunicorn==17.5
 httplib2==0.8
 keyring==1.5
+kombu==2.5.12
 launchpadlib==1.10.2
 lazr.authentication==0.1.2
 lazr.restfulclient==0.13.3
 lazr.uri==1.0.3
+lxml==3.2.1
+meld3==0.6.10
 mock==1.0.1
 oauth==1.0.1
-pep8==1.4.5
-pyflakes==0.7.2
+pep8==1.4.6
+pyflakes==0.7.3
 pyquery==1.2.4
+python-dateutil==2.1
+pytz==2013b
 PyYAML==3.10
+redis==2.7.6
 requests==1.2.3
 simplejson==3.3.0
+six==1.3.0
 South==0.8.1
+supervisor==3.0b2
 testresources==0.2.7
+tornado==3.1
 wadllib==1.3.2
 wsgi-intercept==0.5.1
+wsgiref==0.1.2
 zope.interface==4.0.5