allow colon after @team

Author: perryqh

src/common_test.rs

@@ -246,13 +246,21 @@ pub mod tests {
                     relative_path: "packs/jscomponents/comp.ts".to_owned(),
                     content: "// @team Foo\n".to_owned(),
                 },
+                TestProjectFile {
+                    relative_path: "packs/jscomponents/comp-colon.ts".to_owned(),
+                    content: "// @team: FooColon\n".to_owned(),
+                },
                 TestProjectFile {
                     relative_path: "packs/[admin]/comp.ts".to_owned(),
                     content: "// @team Bar\n".to_owned(),
                 },
                 TestProjectFile {
                     relative_path: "packs/bar/comp.rb".to_owned(),
-                    content: "// @team Bar\n".to_owned(),
+                    content: "# @team Bar\n".to_owned(),
+                },
+                TestProjectFile {
+                    relative_path: "packs/bar/comp-colon.rb".to_owned(),
+                    content: "# @team: BarColon\n".to_owned(),
                 },
             ],
         );

src/ownership/mapper/team_file_mapper.rs

@@ -50,12 +50,12 @@ impl Mapper for TeamFileMapper {
 
         for owned_file in &self.project.files {
             if let Some(ref owner) = owned_file.owner {
-                let team = team_by_name.get(owner);
-
-                if let Some(team) = team {
-                    let relative_path = self.project.relative_path(&owned_file.path);
-                    path_to_team.insert(relative_path.to_owned(), team.name.clone());
-                }
+                let relative_path = self.project.relative_path(&owned_file.path);
+                let team_name = team_by_name
+                    .get(owner)
+                    .map(|team| team.name.clone())
+                    .unwrap_or_else(|| owner.clone());
+                path_to_team.insert(relative_path.to_owned(), team_name);
             }
         }
 
@@ -114,6 +114,8 @@ mod tests {
                 (PathBuf::from("packs/[admin]/comp.ts"), "Bar".to_owned()),
                 (PathBuf::from("packs/bar/comp.rb"), "Bar".to_owned()),
                 (PathBuf::from("packs/jscomponents/comp.ts"), "Foo".to_owned()),
+                (PathBuf::from("packs/jscomponents/comp-colon.ts"), "FooColon".to_owned()),
+                (PathBuf::from("packs/bar/comp-colon.rb"), "BarColon".to_owned()),
             ]),
             Source::TeamFile,
         )];

src/ownership/tests.rs

@@ -13,7 +13,7 @@ pub struct ProjectFileBuilder<'a> {
 }
 
 lazy_static! {
-    static ref TEAM_REGEX: Regex = Regex::new(r#"^(?:#|//) @team (.*)$"#).expect("error compiling regular expression");
+    static ref TEAM_REGEX: Regex = Regex::new(r#"^(?:#|//) @team:? (.*)$"#).expect("error compiling regular expression");
 }
 
 impl<'a> ProjectFileBuilder<'a> {
@@ -73,3 +73,35 @@ pub(crate) fn build_project_file_without_cache(path: &PathBuf) -> ProjectFile {
 
     ProjectFile { path: path.clone(), owner }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_team_regex() {
+        let owner = TEAM_REGEX
+            .captures("// @team Foo")
+            .and_then(|cap| cap.get(1))
+            .map(|m| m.as_str().to_string());
+        assert_eq!(owner, Some("Foo".to_string()));
+
+        let owner = TEAM_REGEX
+            .captures("// @team Foo")
+            .and_then(|cap| cap.get(1))
+            .map(|m| m.as_str().to_string());
+        assert_eq!(owner, Some("Foo".to_string()));
+
+        let owner = TEAM_REGEX
+            .captures("// @team: Foo")
+            .and_then(|cap| cap.get(1))
+            .map(|m| m.as_str().to_string());
+        assert_eq!(owner, Some("Foo".to_string()));
+
+        let owner = TEAM_REGEX
+            .captures("# @team: Foo")
+            .and_then(|cap| cap.get(1))
+            .map(|m| m.as_str().to_string());
+        assert_eq!(owner, Some("Foo".to_string()));
+    }
+}

src/project_file_builder.rs

@@ -9,6 +9,7 @@
 
 # Annotations at the top of file
 /javascript/packages/PayrollFlow/index.tsx @PayrollTeam
+/javascript/packages/list/page-admin.tsx @PaymentsTeam
 /ruby/app/models/bank_account.rb @PaymentsTeam
 /ruby/app/models/payroll.rb @PayrollTeam
 

tests/fixtures/valid_project/.github/CODEOWNERS

@@ -0,0 +1 @@
+// @team: Payments

tests/fixtures/valid_project/javascript/packages/list/page-admin.tsx

@@ -1,3 +1,3 @@
-# @team Payroll
+# @team: Payroll
 
 class Payroll; end

tests/fixtures/valid_project/ruby/app/models/payroll.rb

@@ -34,7 +34,6 @@ fn test_validate() -> Result<(), Box<dyn Error>> {
             - ruby/app/models/blockchain.rb is referencing an invalid team - 'Web3'
 
             Some files are missing ownership
-            - ruby/app/models/blockchain.rb
             - ruby/app/unowned.rb
 
         "}));