adding Authors functionality; fixing one rogue pep8 violation

.mailmap

@@ -0,0 +1,11 @@
+# Format is:
+# <preferred e-mail> <other e-mail 1>
+# <preferred e-mail> <other e-mail 2>
+<corywright@gmail.com> <cory.wright@rackspace.com>
+<jsuh@isi.edu> <jsuh@bespin>
+<josh@jk0.org> <josh.kearney@rackspace.com>
+<rconradharris@gmail.com> <rick.harris@rackspace.com> 
+<rconradharris@gmail.com> <rick@quasar.racklabs.com>
+<rick@openstack.org> <rclark@chat-blanc>
+<soren.hansen@rackspace.com> <soren@linux2go.dk>
+<soren.hansen@rackspace.com> <soren@openstack.org>

Authors

@@ -0,0 +1,20 @@
+Andrey Brindeyev <abrindeyev@griddynamics.com>
+Brian Waldon <brian.waldon@rackspace.com>
+Christopher MacGown <chris@slicehost.com>
+Cory Wright <corywright@gmail.com>
+Dan Prince <dan.prince@rackspace.com>
+Donal Lafferty <donal.lafferty@citrix.com>
+Eldar Nugaev <enugaev@griddynamics.com>
+Ewan Mellor <ewan.mellor@citrix.com>
+Jay Pipes <jaypipes@gmail.com>
+Jinwoo 'Joseph' Suh <jsuh@isi.edu>
+Josh Kearney <josh@jk0.org>
+Ken Pepple <ken.pepple@gmail.com>
+Matt Dietz <matt.dietz@rackspace.com>
+Monty Taylor <mordred@inaugust.com>
+Rick Clark <rick@openstack.org>
+Rick Harris <rconradharris@gmail.com>
+Soren Hansen <soren.hansen@rackspace.com>
+Taku Fukushima <tfukushima@dcl.info.waseda.ac.jp>
+Thierry Carrez <thierry@openstack.org>
+Vishvananda Ishaya <vishvananda@gmail.com>

bin/glance

@@ -209,8 +209,8 @@ EXAMPLES
             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:"

tests/unit/test_misc.py

@@ -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()

tools/pip-requires

@@ -15,3 +15,4 @@ mox==0.5.0
 swift
 -f http://pymox.googlecode.com/files/mox-0.5.0.tar.gz
 sqlalchemy-migrate>=0.6
+bzr