much faster

Author: perryqh

src/ownership.rs

@@ -9,11 +9,11 @@ use std::{
 };
 use tracing::{info, instrument};
 
+pub(crate) mod codeowners_file_parser;
 mod file_generator;
 mod file_owner_finder;
 pub mod for_file_fast;
 pub(crate) mod mapper;
-pub(crate) mod codeowners_file_parser;
 mod validator;
 
 use crate::{
@@ -24,9 +24,9 @@ use crate::{
 pub use validator::Errors as ValidatorErrors;
 
 use self::{
+    codeowners_file_parser::parse_for_team,
     file_generator::FileGenerator,
     mapper::{JavascriptPackageMapper, Mapper, RubyPackageMapper, TeamFileMapper, TeamGemMapper, TeamGlobMapper, TeamYmlMapper},
-    codeowners_file_parser::parse_for_team,
     validator::Validator,
 };
 

src/ownership/codeowners_file_parser.rs

@@ -4,8 +4,8 @@ use crate::{
 };
 use fast_glob::glob_match;
 use memoize::memoize;
-use regex::Regex;
 use rayon::prelude::*;
+use regex::Regex;
 use std::{
     collections::HashMap,
     error::Error,
@@ -42,15 +42,12 @@ impl Parser {
             return Ok(HashMap::new());
         }
 
-        let codeowners_lines_in_priority = build_codeowners_lines_in_priority(
-            self.codeowners_file_path.to_string_lossy().into_owned(),
-        );
+        let codeowners_lines_in_priority = build_codeowners_lines_in_priority(self.codeowners_file_path.to_string_lossy().into_owned());
         // Pre-parse lines once to avoid repeated split and to handle malformed lines early
         let codeowners_entries: Vec<(String, String)> = codeowners_lines_in_priority
             .iter()
             .map(|line| {
-                line
-                    .split_once(' ')
+                line.split_once(' ')
                     .map(|(glob, team_name)| (glob.to_string(), team_name.to_string()))
                     .ok_or_else(|| IoError::new(std::io::ErrorKind::InvalidInput, "Invalid line"))
             })

src/runner.rs

@@ -362,10 +362,8 @@ fn for_file_optimized(run_config: &RunConfig, file_path: &str) -> RunResult {
 mod tests {
     use tempfile::tempdir;
 
-    use crate::{common_test, ownership::mapper::Source};
-    use ignore::{DirEntry, WalkBuilder, WalkParallel, WalkState};
-
     use super::*;
+    use crate::{common_test, ownership::mapper::Source};
 
     #[test]
     fn test_version() {
@@ -421,42 +419,33 @@ mod tests {
 
     #[test]
     fn test_teams_for_files_from_codeowners() {
-       let project_root = Path::new("/Users/perryhertler/workspace/zenpayroll");
-       let codeowners_file_path = project_root.join(".github/CODEOWNERS");
-       let config_path = project_root.join("config/code_ownership.yml");
-       let run_config = RunConfig {
-           project_root: project_root.to_path_buf(),
-           codeowners_file_path: codeowners_file_path.to_path_buf(),
-           config_path: config_path.to_path_buf(),
-           no_cache: false,
-       };
-
-       // Collect all files in packs and frontend directories recursively
-       let mut file_paths = Vec::new();
-       for dir in ["packs", "frontend"] {
-           let dir_path = project_root.join(dir);
-           if dir_path.exists() && dir_path.is_dir() {
-               for entry in WalkBuilder::new(&dir_path)
-                   .filter_entry(|e| {
-                       let name = e.file_name().to_str().unwrap_or("");
-                       !(name == "node_modules" || name == "dist" || name == ".git")
-                   })
-                   .build() 
-                   .filter_map(|e| e.ok())
-                   .filter(|e| e.file_type().map(|t| t.is_file()).unwrap_or(false))
-                   .filter_map(|e| e.path().strip_prefix(project_root).ok().map(|p| p.to_string_lossy().to_string()))
-               {
-                   file_paths.push(entry);
-               }        
-           }
-       }
-
-       let start_time = std::time::Instant::now();
-       let teams = teams_for_files_from_codeowners(&run_config, &file_paths).unwrap();
-       let end_time = std::time::Instant::now();
-       println!("Time taken: {:?}", end_time.duration_since(start_time));
-       println!("Teams: {:?}", teams);
-       assert_eq!(teams.len(), 1);
-
+        let project_root = Path::new("tests/fixtures/valid_project");
+        let file_paths = [
+            "javascript/packages/items/item.ts",
+            "config/teams/payroll.yml",
+            "ruby/app/models/bank_account.rb",
+            "made/up/file.rb",
+            "ruby/ignored_files/git_ignored.rb",
+        ];
+        let run_config = RunConfig {
+            project_root: project_root.to_path_buf(),
+            codeowners_file_path: project_root.join(".github/CODEOWNERS").to_path_buf(),
+            config_path: project_root.join("config/code_ownership.yml").to_path_buf(),
+            no_cache: false,
+        };
+        let teams =
+            teams_for_files_from_codeowners(&run_config, &file_paths.iter().map(|s| s.to_string()).collect::<Vec<String>>()).unwrap();
+        assert_eq!(teams.len(), 3);
+        assert_eq!(
+            teams.get("javascript/packages/items/item.ts").map(|t| t.name.as_str()),
+            Some("Payroll")
+        );
+        assert_eq!(teams.get("config/teams/payroll.yml").map(|t| t.name.as_str()), Some("Payroll"));
+        assert_eq!(
+            teams.get("ruby/app/models/bank_account.rb").map(|t| t.name.as_str()),
+            Some("Payments")
+        );
+        assert_eq!(teams.get("made/up/file.rb").map(|t| t.name.as_str()), None);
+        assert_eq!(teams.get("ruby/ignored_files/git_ignored.rb").map(|t| t.name.as_str()), None);
     }
 }