From 501d646e6c2d3c4004b54713aaf668c3f675cf2f Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Thu, 2 Apr 2015 09:33:47 -0400
Subject: [PATCH] Add a few folks from the ansible ecosystem

Also, adjust the jsonschema email definition. '+' is allowed in an email
address, and some people use it to separate out email from different
places.

Change-Id: I62803e83efc46ae6e708736b9fc613c64fe2c995
---
 etc/default_data.json           | 38 +++++++++++++++++++++++++++++++++
 etc/default_data.schema.json    |  2 +-
 tests/unit/test_config_files.py |  5 ++++-
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/etc/default_data.json b/etc/default_data.json
index 3e8721821..0f93be389 100644
--- a/etc/default_data.json
+++ b/etc/default_data.json
@@ -123,6 +123,17 @@
             "user_name": "Aaron Greengrass",
             "emails": ["aaron@greenbtn.com"]
         },
+        {
+            "github_id": "abadger",
+            "companies": [
+                {
+                    "company_name": "RedHat",
+                    "end_date": null
+                }
+            ],
+            "user_name": "Toshio Kuratomi",
+            "emails": ["toshio@fedoraproject.org", "a.badger@gmail.com"]
+        },
         {
             "launchpad_id": "abhijeet-jain",
             "gerrit_id": "Abhijeet.Jain",
@@ -978,6 +989,17 @@
             "user_name": "Basil Baby",
             "emails": ["basilbaby@gmail.com"]
         },
+        {
+            "github_id": "bcoca",
+            "companies": [
+                {
+                    "company_name": "Ansible",
+                    "end_date": null
+                }
+            ],
+            "user_name": "Brian Coca",
+            "emails": ["bcoca@ansible.com", "brian.coca+git@gmail.com"]
+        },
         {
             "launchpad_id": "bcwaldon",
             "companies": [
@@ -6255,6 +6277,18 @@
             "user_name": "Thiago Morello",
             "emails": ["thiago.morello@locaweb.com.br"]
         },
+        {
+            "launchpad_id": "mpdehaan",
+            "github_id": "mpdehaan",
+            "companies": [
+                {
+                    "company_name": "Ansible",
+                    "end_date": "2015-Jan-30"
+                }
+            ],
+            "user_name": "Michael DeHaan",
+            "emails": ["michael.dehaan@gmail.com","michael.dehaan@ansible.com"]
+        },
         {
             "launchpad_id": "mpmsimo",
             "companies": [
@@ -10422,6 +10456,10 @@
             "domains": ["anl.gov"],
             "company_name": "Argonne National Laboratory"
         },
+        {
+            "domains": ["ansible.com"],
+            "company_name": "Ansible"
+        },
         {
             "domains": ["apple.com"],
             "company_name": "Apple, Inc."
diff --git a/etc/default_data.schema.json b/etc/default_data.schema.json
index a0bd8287f..f60b078dd 100644
--- a/etc/default_data.schema.json
+++ b/etc/default_data.schema.json
@@ -28,7 +28,7 @@
                         "type": "array",
                         "items": {
                             "type": "string",
-                            "pattern": "^[a-z\\d_\\.-]+@([a-z\\d\\.-]+\\.)+(([a-z]+)|\\(none\\))$"
+                            "pattern": "^[a-z\\d_\\.\\+-]+@([a-z\\d\\.-]+\\.)+(([a-z]+)|\\(none\\))$"
                         },
                         "minItems": 1
                     },
diff --git a/tests/unit/test_config_files.py b/tests/unit/test_config_files.py
index 997dcef35..96541a0c2 100644
--- a/tests/unit/test_config_files.py
+++ b/tests/unit/test_config_files.py
@@ -82,7 +82,10 @@ class TestConfigFiles(testtools.TestCase):
     def _verify_default_data_by_schema(self, file_name):
         default_data = self._read_file(file_name)
         schema = self._read_file('etc/default_data.schema.json')
-        jsonschema.validate(default_data, schema)
+        try:
+            jsonschema.validate(default_data, schema)
+        except jsonschema.ValidationError as e:
+            self.fail(e)
 
     def test_default_data_schema_conformance(self):
         self._verify_default_data_by_schema('etc/default_data.json')