Merge lp:~rackspace-titan/glance/add-authors-lp706387 into lp:~hudson-openstack/glance/trunk

[Brian Waldon]

Adding prefilled Authors, mailmap files
Adding test to validate Authors file is properly set up

[Jay Pipes (jaypipes)]

Tested locally. All looks good, all tests passing. Nice work, B-dog. ;)

review: Approve

[Todd Willey (xtoddx)]

lgtm

review: Approve

=== added file '.mailmap'
--- .mailmap	1970-01-01 00:00:00 +0000
+++ .mailmap	2011-04-27 18:03:22 +0000
@@ -0,0 +1,11 @@
+# Format is:
+# <preferred e-mail> <other e-mail 1>
+# <preferred e-mail> <other e-mail 2>
+<[e-mail]> <[e-mail]>
+<[e-mail]> <jsuh@bespin>
+<[e-mail]> <[e-mail]>
+<[e-mail]> <[e-mail]> 
+<[e-mail]> <[e-mail]>
+<[e-mail]> <rclark@chat-blanc>
+<[e-mail]> <[e-mail]>
+<[e-mail]> <[e-mail]>

=== added file 'Authors'
--- Authors	1970-01-01 00:00:00 +0000
+++ Authors	2011-04-27 18:03:22 +0000
@@ -0,0 +1,20 @@
+Andrey Brindeyev <[e-mail]>
+Brian Waldon <[e-mail]>
+Christopher MacGown <[e-mail]>
+Cory Wright <[e-mail]>
+Dan Prince <[e-mail]>
+Donal Lafferty <[e-mail]>
+Eldar Nugaev <[e-mail]>
+Ewan Mellor <[e-mail]>
+Jay Pipes <[e-mail]>
+Jinwoo 'Joseph' Suh <[e-mail]>
+Josh Kearney <[e-mail]>
+Ken Pepple <[e-mail]>
+Matt Dietz <[e-mail]>
+Monty Taylor <[e-mail]>
+Rick Clark <[e-mail]>
+Rick Harris <[e-mail]>
+Soren Hansen <[e-mail]>
+Taku Fukushima <[e-mail]>
+Thierry Carrez <[e-mail]>
+Vishvananda Ishaya <[e-mail]>

=== modified file 'bin/glance'
--- bin/glance	2011-04-26 04:27:41 +0000
+++ bin/glance	2011-04-27 18:03:22 +0000
@@ -209,8 +209,8 @@
             pieces = str(e).split('\n')
             for piece in pieces:
                 print piece
-            print ("Note: Your image metadata may still be in the registry, but "
-                   "the image's status will likely be 'killed'.")
+            print ("Note: Your image metadata may still be in the registry, "
+                   "but the image's status will likely be 'killed'.")
             return FAILURE
     else:
         print "Dry run. We would have done the following:"

=== added file 'tests/unit/test_misc.py'
--- tests/unit/test_misc.py	1970-01-01 00:00:00 +0000
+++ tests/unit/test_misc.py	2011-04-27 18:03:22 +0000
@@ -0,0 +1,77 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010-2011 OpenStack, LLC
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import os
+import unittest
+
+
+def parse_mailmap(mailmap='.mailmap'):
+    mapping = {}
+    if os.path.exists(mailmap):
+        fp = open(mailmap, 'r')
+        for l in fp:
+            l = l.strip()
+            if not l.startswith('#') and ' ' in l:
+                canonical_email, alias = l.split(' ')
+                mapping[alias] = canonical_email
+    return mapping
+
+
+def str_dict_replace(s, mapping):
+    for s1, s2 in mapping.iteritems():
+        s = s.replace(s1, s2)
+    return s
+
+
+class AuthorsTestCase(unittest.TestCase):
+    def test_authors_up_to_date(self):
+        topdir = os.path.normpath(os.path.dirname(__file__) + '/../../')
+        if os.path.exists(os.path.join(topdir, '.bzr')):
+            contributors = set()
+
+            mailmap = parse_mailmap(os.path.join(topdir, '.mailmap'))
+
+            import bzrlib.workingtree
+            tree = bzrlib.workingtree.WorkingTree.open(topdir)
+            tree.lock_read()
+            try:
+                parents = tree.get_parent_ids()
+                g = tree.branch.repository.get_graph()
+                for p in parents:
+                    rev_ids = [r for r, _ in g.iter_ancestry(parents)
+                               if r != "null:"]
+                    revs = tree.branch.repository.get_revisions(rev_ids)
+                    for r in revs:
+                        for author in r.get_apparent_authors():
+                            email = author.split(' ')[-1]
+                            mailmapped = str_dict_replace(email, mailmap)
+                            contributors.add(mailmapped)
+
+                authors_file = open(os.path.join(topdir, 'Authors'),
+                                    'r').read()
+
+                missing = set()
+                for contributor in contributors:
+                    if contributor == 'glance-core':
+                        continue
+                    if not contributor in authors_file:
+                        missing.add(contributor)
+
+                self.assertTrue(len(missing) == 0,
+                                '%r not listed in Authors' % missing)
+            finally:
+                tree.unlock()

=== modified file 'tools/pip-requires'
--- tools/pip-requires	2011-02-27 20:54:29 +0000
+++ tools/pip-requires	2011-04-27 18:03:22 +0000
@@ -15,3 +15,4 @@
 swift
 -f http://pymox.googlecode.com/files/mox-0.5.0.tar.gz
 sqlalchemy-migrate>=0.6
+bzr