adding erb support

Author: perryqh

dev/run_benchmarks_for_gv.sh

@@ -9,5 +9,4 @@ echo "To run these benchmarks on your application, you can place this repo next
 
 hyperfine --warmup=2 --runs=3 --export-markdown tmp/codeowners_benchmarks_gv.md \
   '../rubyatscale/codeowners-rs/target/release/codeowners gv' \
-  'bin/codeownership validate' \
-  'bin/codeowners-rs gv' 
+  'bin/codeownership validate' 

src/common_test.rs

@@ -31,7 +31,7 @@ pub mod tests {
     const DEFAULT_CODE_OWNERSHIP_YML: &str = indoc! {"
         ---
         owned_globs:
-          - \"{app,components,config,frontend,lib,packs,spec}/**/*.{rb,rake,js,jsx,ts,tsx,json,yml}\"
+          - \"{app,components,config,frontend,lib,packs,spec,ruby}/**/*.{rb,rake,js,jsx,ts,tsx,json,yml,erb}\"
         unowned_globs:
           - config/code_ownership.yml
         javascript_package_paths:
@@ -248,7 +248,7 @@ pub mod tests {
                 },
                 TestProjectFile {
                     relative_path: "packs/jscomponents/comp-colon.ts".to_owned(),
-                    content: "// @team: FooColon\n".to_owned(),
+                    content: "// @team: Foo\n".to_owned(),
                 },
                 TestProjectFile {
                     relative_path: "packs/[admin]/comp.ts".to_owned(),
@@ -259,8 +259,8 @@ pub mod tests {
                     content: "# @team Bar\n".to_owned(),
                 },
                 TestProjectFile {
-                    relative_path: "packs/bar/comp-colon.rb".to_owned(),
-                    content: "# @team: BarColon\n".to_owned(),
+                    relative_path: "packs/bar/comp_colon.rb".to_owned(),
+                    content: "# @team: Bar\n".to_owned(),
                 },
                 TestProjectFile {
                     relative_path: "ruby/app/views/foos/edit.erb".to_owned(),

src/ownership/mapper/team_file_mapper.rs

@@ -100,15 +100,15 @@ mod tests {
                     disabled: false,
                 },
                 Entry {
-                    path: "packs/bar/comp-colon.rb".to_owned(),
-                    github_team: "@BarColon".to_owned(),
-                    team_name: "BarColon".to_owned(),
+                    path: "packs/bar/comp_colon.rb".to_owned(),
+                    github_team: "@Bar".to_owned(),
+                    team_name: "Bar".to_owned(),
                     disabled: false,
                 },
                 Entry {
                     path: "packs/jscomponents/comp-colon.ts".to_owned(),
-                    github_team: "@FooColon".to_owned(),
-                    team_name: "FooColon".to_owned(),
+                    github_team: "@Foo".to_owned(),
+                    team_name: "Foo".to_owned(),
                     disabled: false,
                 },
                 Entry {
@@ -144,8 +144,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()),
+                (PathBuf::from("packs/jscomponents/comp-colon.ts"), "Foo".to_owned()),
+                (PathBuf::from("packs/bar/comp_colon.rb"), "Bar".to_owned()),
                 (PathBuf::from("ruby/app/views/foos/edit.erb"), "Foo".to_owned()),
                 (PathBuf::from("ruby/app/views/foos/show.html.erb"), "Bar".to_owned()),
                 (PathBuf::from("ruby/app/views/foos/_row.html.erb"), "Bam".to_owned()),

src/project_builder.rs

@@ -19,6 +19,8 @@ use crate::{
 
 type AbsolutePath = PathBuf;
 type RelativePath = PathBuf;
+
+#[derive(Debug)]
 enum EntryType {
     Directory(AbsolutePath, RelativePath),
     RubyPackage(AbsolutePath, RelativePath),
@@ -120,7 +122,6 @@ impl<'a> ProjectBuilder<'a> {
         if let Some(report) = maybe_error {
             return Err(report);
         }
-
         self.build_project_from_entry_types(entry_types)
     }
 

src/project_file_builder.rs

@@ -13,7 +13,8 @@ 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#"^(?:#|//|<!--|<%#)\s*@team:?\s*(.*?)\s*(?:-->|%>)?$"#).expect("error compiling regular expression");
 }
 
 impl<'a> ProjectFileBuilder<'a> {
@@ -103,5 +104,23 @@ mod tests {
             .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()));
     }
 }

tests/fixtures/valid_project/.github/CODEOWNERS

@@ -12,6 +12,9 @@
 /javascript/packages/list/page-admin.tsx @PaymentsTeam
 /ruby/app/models/bank_account.rb @PaymentsTeam
 /ruby/app/models/payroll.rb @PayrollTeam
+/ruby/app/views/foos/edit.erb @PayrollTeam
+/ruby/app/views/foos/index.html.erb @UX
+/ruby/app/views/foos/new.html.erb @PayrollTeam
 
 # Team-specific owned globs
 /ruby/app/payments/**/* @PaymentsTeam

tests/fixtures/valid_project/config/code_ownership.yml

@@ -1,5 +1,5 @@
 owned_globs:
-  - "{gems,config,javascript,ruby,components}/**/*.{rb,tsx,erb,html.erb}"
+  - "{gems,config,javascript,ruby,components}/**/*.{rb,tsx,erb}"
 ruby_package_paths:
   - ruby/packages/**/*
 javascript_package_paths:

tests/fixtures/valid_project/ruby/app/views/foos/edit.erb

@@ -1 +1 @@
-<%# @team: Payments %>
+<%# @team: Payroll %>

tests/fixtures/valid_project/ruby/app/views/foos/index.html.erb

@@ -1 +1 @@
-<!-- @team: UX -->
+<!-- @team UX -->

tests/valid_project_test.rs

@@ -258,6 +258,8 @@ fn test_for_team() -> Result<(), Box<dyn Error>> {
             ## Annotations at the top of file
             /javascript/packages/PayrollFlow/index.tsx
             /ruby/app/models/payroll.rb
+            /ruby/app/views/foos/edit.erb
+            /ruby/app/views/foos/new.html.erb
 
             ## Team-specific owned globs
             This team owns nothing in this category.