Merge pull request facebookarchive#51 from dflynn15/master

feat: Changes user file glob an array
Getable · Dec 4, 2015 · a9afc6b · a9afc6b
2 parents 11e11f8 + 01a1dd3
commit a9afc6b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/CONFIG.md b/CONFIG.md
@@ -5,7 +5,7 @@
   "alwaysNotifyForPaths": [
     {
       "name": "ghuser", // The user's Github username
-      "files": "src/js/**/*.js" // The file glob associated with the user
+      "files": ["src/js/**/*.js"] // The array of file globs associated with the user
     }
   ], // users will always be mentioned based on file glob
   "userBlacklist": [] // users in this list will never be mentioned by mention-bot

diff --git a/__tests__/github-mention-test.js b/__tests__/github-mention-test.js
@@ -94,7 +94,7 @@ describe('Github Mention', function() {
           alwaysNotifyForPaths: [
             {
               name: 'ghuser',
-              files: '**/*.js'
+              files: ['package.json', '**/*.js', 'README.md']
             }
           ]
         }

diff --git a/mention-bot.js b/mention-bot.js
@@ -33,7 +33,7 @@ type FileInfo = {
 
 type WhitelistUser = {
   name: string,
-  files: string
+  files: Array<string>
 };
 
 function startsWith(str, start) {
@@ -235,8 +235,14 @@ function getDefaultOwners(
   var users = whitelist || [];
 
   users.forEach(function(user) {
-    var userHasChangedFile = files.find(function(file) {
-      return minimatch(file.path, user.files);
+    let userHasChangedFile = false;
+
+    user.files.forEach(function(pattern) {
+      if (!userHasChangedFile) {
+        userHasChangedFile = files.find(function(file) {
+          return minimatch(file.path, pattern);
+        });
+      }
     });
 
     if (userHasChangedFile && owners.indexOf(user.name) === -1) {