test for gems override

Author: perryqh

src/ownership/fast.rs

@@ -144,31 +144,28 @@ fn load_teams(project_root: &Path, team_file_globs: &[String]) -> std::result::R
 }
 
 lazy_static! {
-    static ref TOP_OF_FILE_TEAM_AT_REGEX: Option<Regex> = Regex::new(r#"^(?:#|//)\s*@team\s+(.+)$"#).ok();
-    static ref TOP_OF_FILE_TEAM_COLON_REGEX: Option<Regex> = Regex::new(r#"(?i)^(?:#|//)\s*team\s*:\s*(.+)$"#).ok();
+    // Allow optional leading whitespace before the comment marker
+    static ref TOP_OF_FILE_TEAM_AT_REGEX: Option<Regex> = Regex::new(r#"^\s*(?:#|//)\s*@team\s+(.+)$"#).ok();
+    static ref TOP_OF_FILE_TEAM_COLON_REGEX: Option<Regex> = Regex::new(r#"(?i)^\s*(?:#|//)\s*team\s*:\s*(.+)$"#).ok();
 }
 
 fn read_top_of_file_team(path: &Path) -> Option<String> {
     let content = fs::read_to_string(path).ok()?;
-    for line in content.lines().take(15) {
-        if let Some(re) = &*TOP_OF_FILE_TEAM_AT_REGEX {
-            if let Some(cap) = re.captures(line) {
-                if let Some(m) = cap.get(1) {
-                    return Some(m.as_str().to_string());
-                }
+    let line = content.lines().next()?;
+
+    if let Some(re) = &*TOP_OF_FILE_TEAM_AT_REGEX {
+        if let Some(cap) = re.captures(line) {
+            if let Some(m) = cap.get(1) {
+                return Some(m.as_str().to_string());
             }
         }
-        if let Some(re) = &*TOP_OF_FILE_TEAM_COLON_REGEX {
-            if let Some(cap) = re.captures(line) {
-                if let Some(m) = cap.get(1) {
-                    return Some(m.as_str().to_string());
-                }
+    }
+    if let Some(re) = &*TOP_OF_FILE_TEAM_COLON_REGEX {
+        if let Some(cap) = re.captures(line) {
+            if let Some(m) = cap.get(1) {
+                return Some(m.as_str().to_string());
             }
         }
-        let trimmed = line.trim_start();
-        if !(trimmed.starts_with('#') || trimmed.starts_with("//") || trimmed.is_empty()) {
-            break;
-        }
     }
     None
 }

src/runner.rs

@@ -39,7 +39,7 @@ pub fn for_file(run_config: &RunConfig, file_path: &str, fast: bool) -> RunResul
     if fast {
         for_file_from_codeowners(run_config, file_path)
     } else {
-       // run_with_runner(run_config, |runner| runner.for_file(file_path))
+        //run_with_runner(run_config, |runner| runner.for_file(file_path))
         for_file_optimized(run_config, file_path)
     }
 }

tests/fixtures/valid_project/.github/CODEOWNERS

@@ -30,6 +30,8 @@
 # Team YML ownership
 /config/teams/payments.yml @PaymentsTeam
 /config/teams/payroll.yml @PayrollTeam
+/config/teams/ux.yml @UX
 
 # Team owned gems
 /gems/payroll_calculator/**/** @PayrollTeam
+/gems/pets/**/** @UX

tests/fixtures/valid_project/config/code_ownership.yml

@@ -1,10 +1,10 @@
 owned_globs:
-  - "{gems,config,javascript,ruby}/**/*.{rb,tsx}"
+  - "{gems,config,javascript,ruby,components}/**/*.{rb,tsx}"
 ruby_package_paths:
   - ruby/packages/**/*
 javascript_package_paths:
   - javascript/packages/**
 team_file_glob:
   - config/teams/**/*.yml
-vendored_gems_path: gems
+unbuilt_gems_path: gems
 unowned_globs:

tests/fixtures/valid_project/config/teams/ux.yml

@@ -0,0 +1,6 @@
+name: UX
+github:
+  team: '@UX'
+ruby:
+  owned_gems:
+    - pets 

tests/fixtures/valid_project/gems/pets/dog.rb

@@ -0,0 +1,5 @@
+# generated
+# next line should be ignored
+# @team Payments
+
+class Dog; end

tests/valid_project_test.rs

@@ -138,6 +138,26 @@ fn test_fast_for_file_full_path() -> Result<(), Box<dyn Error>> {
     Ok(())
 }
 
+#[test]
+fn test_for_file_with_components() -> Result<(), Box<dyn Error>> {
+    Command::cargo_bin("codeowners")?
+        .arg("--project-root")
+        .arg("tests/fixtures/valid_project")
+        .arg("--no-cache")
+        .arg("for-file")
+        .arg("gems/pets/dog.rb")
+        .assert()
+        .success()
+        .stdout(predicate::eq(indoc! {"
+            Team: UX
+            Github Team: @UX
+            Team YML: config/teams/ux.yml
+            Description:
+            - Owner specified in Team YML's `owned_gems`
+        "}));
+    Ok(())
+}
+
 #[test]
 fn test_for_file_same_team_multiple_ownerships() -> Result<(), Box<dyn Error>> {
     Command::cargo_bin("codeowners")?