using fastglob

perryqh · perryqh · commit c8ca24c863cc · 2024-11-09T20:09:37.000-06:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,7 +10,7 @@ debug = true
 clap = { version = "4.5.20", features = ["derive"] }
 clap_derive = "4.5.18"
 error-stack = "0.5.0"
-glob-match = "0.2.1"
+fast-glob = "0.4.0"
 ignore = "0.4.23"
 itertools = "0.13.0"
 jwalk = "0.8.1"
diff --git a/src/ownership/mapper.rs b/src/ownership/mapper.rs
@@ -1,4 +1,4 @@
-use glob_match::glob_match;
+use fast_glob::glob_match;
 use std::{
     collections::HashMap,
     fmt::{self, Display},
diff --git a/src/project.rs b/src/project.rs
@@ -15,7 +15,7 @@ use regex::Regex;
 use tracing::{info, instrument};
 
 use crate::config::Config;
-use glob_match::glob_match;
+use fast_glob::glob_match;
 
 pub struct Project {
     pub base_path: PathBuf,
diff --git a/tests/fixtures/valid_project_with_ignored_files/.github/CODEOWNERS b/tests/fixtures/valid_project_with_ignored_files/.github/CODEOWNERS
@@ -0,0 +1,32 @@
+# STOP! - DO NOT EDIT THIS FILE MANUALLY
+# This file was automatically generated by "bin/codeownership validate".
+#
+# CODEOWNERS is used for GitHub to suggest code/file owners to various GitHub
+# teams. This is useful when developers create Pull Requests since the
+# code/file owner is notified. Reference GitHub docs for more details:
+# https://help.github.com/en/articles/about-code-owners
+
+
+# Annotations at the top of file
+/javascript/packages/PayrollFlow/index.tsx @PayrollTeam
+/ruby/app/models/bank_account.rb @PaymentsTeam
+/ruby/app/models/payroll.rb @PayrollTeam
+
+# Team-specific owned globs
+/ruby/app/payments/**/* @PaymentsTeam
+
+# Owner in .codeowner
+/ruby/app/payroll/**/** @PayrollTeam
+
+# Owner metadata key in package.yml
+/ruby/packages/payroll_flow/**/** @PayrollTeam
+
+# Owner metadata key in package.json
+/javascript/packages/PayrollFlow/**/** @PayrollTeam
+
+# Team YML ownership
+/config/teams/payments.yml @PaymentsTeam
+/config/teams/payroll.yml @PayrollTeam
+
+# Team owned gems
+/gems/payroll_calculator/**/** @PayrollTeam
diff --git a/tests/fixtures/valid_project_with_ignored_files/.ignore b/tests/fixtures/valid_project_with_ignored_files/.ignore
diff --git a/tests/fixtures/valid_project_with_ignored_files/config/code_ownership.yml b/tests/fixtures/valid_project_with_ignored_files/config/code_ownership.yml
@@ -0,0 +1,10 @@
+owned_globs:
+  - "**/*.{rb,tsx}"
+ruby_package_paths:
+  - ruby/packages/**/*
+javascript_package_paths:
+  - javascript/packages/**
+team_file_glob:
+  - config/teams/**/*.yml
+vendored_gems_path: gems
+unowned_globs:
diff --git a/tests/fixtures/valid_project_with_ignored_files/config/teams/payments.yml b/tests/fixtures/valid_project_with_ignored_files/config/teams/payments.yml
@@ -0,0 +1,5 @@
+name: Payments
+github:
+  team: '@PaymentsTeam'
+owned_globs:
+  - ruby/app/payments/**/*
diff --git a/tests/fixtures/valid_project_with_ignored_files/config/teams/payroll.yml b/tests/fixtures/valid_project_with_ignored_files/config/teams/payroll.yml
@@ -0,0 +1,9 @@
+name: Payroll
+github:
+  team: '@PayrollTeam'
+ruby:
+  owned_gems:
+    - payroll_calculator
+javascript:
+  owned_packages:
+    - 'PayrollFlow'
diff --git a/tests/fixtures/valid_project_with_ignored_files/gems/payroll_calculator/calculator.rb b/tests/fixtures/valid_project_with_ignored_files/gems/payroll_calculator/calculator.rb
@@ -0,0 +1,5 @@
+class PayrollCalculator
+  def calculate
+    10_000
+  end
+end
diff --git a/tests/fixtures/valid_project_with_ignored_files/javascript/packages/PayrollFlow/index.tsx b/tests/fixtures/valid_project_with_ignored_files/javascript/packages/PayrollFlow/index.tsx
@@ -0,0 +1 @@
+// @team Payroll
diff --git a/tests/fixtures/valid_project_with_ignored_files/javascript/packages/PayrollFlow/package.json b/tests/fixtures/valid_project_with_ignored_files/javascript/packages/PayrollFlow/package.json
@@ -0,0 +1,5 @@
+{
+    "metadata": {
+        "owner": "Payroll"
+    }
+}
diff --git a/tests/fixtures/valid_project_with_ignored_files/ruby/app/models/bank_account.rb b/tests/fixtures/valid_project_with_ignored_files/ruby/app/models/bank_account.rb
@@ -0,0 +1,3 @@
+# @team Payments
+
+class BankAccount; end
diff --git a/tests/fixtures/valid_project_with_ignored_files/ruby/app/models/payroll.rb b/tests/fixtures/valid_project_with_ignored_files/ruby/app/models/payroll.rb
@@ -0,0 +1,3 @@
+# @team Payroll
+
+class Payroll; end
diff --git a/tests/fixtures/valid_project_with_ignored_files/ruby/app/payments/nacha.rb b/tests/fixtures/valid_project_with_ignored_files/ruby/app/payments/nacha.rb
@@ -0,0 +1 @@
+class Nacha; end
diff --git a/tests/fixtures/valid_project_with_ignored_files/ruby/app/payroll/.codeowner b/tests/fixtures/valid_project_with_ignored_files/ruby/app/payroll/.codeowner
@@ -0,0 +1 @@
+Payroll
diff --git a/tests/fixtures/valid_project_with_ignored_files/ruby/app/payroll/payroll.rb b/tests/fixtures/valid_project_with_ignored_files/ruby/app/payroll/payroll.rb
@@ -0,0 +1 @@
+class Payroll; end
diff --git a/tests/fixtures/valid_project_with_ignored_files/ruby/ignored_files/git_ignored.rb b/tests/fixtures/valid_project_with_ignored_files/ruby/ignored_files/git_ignored.rb
diff --git a/tests/fixtures/valid_project_with_ignored_files/ruby/packages/payroll_flow/package.yml b/tests/fixtures/valid_project_with_ignored_files/ruby/packages/payroll_flow/package.yml
@@ -0,0 +1 @@
+owner: Payroll
diff --git a/tests/valid_project_test.rs b/tests/valid_project_test.rs
@@ -15,6 +15,20 @@ fn test_validate() -> Result<(), Box<dyn Error>> {
     Ok(())
 }
 
+#[test]
+#[ignore]
+// This functionality came for free with the ignore crate, but do we need it?
+fn test_validate_with_ignored_files() -> Result<(), Box<dyn Error>> {
+    Command::cargo_bin("codeowners")?
+        .arg("--project-root")
+        .arg("tests/fixtures/valid_project_with_ignored_files")
+        .arg("validate")
+        .assert()
+        .success();
+
+    Ok(())
+}
+
 #[test]
 fn test_generate() -> Result<(), Box<dyn Error>> {
     Command::cargo_bin("codeowners")?

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-use glob_match::glob_match;`
	`1`	`+use fast_glob::glob_match;`
`2`	`2`	`use std::{`
`3`	`3`	`collections::HashMap,`
`4`	`4`	`fmt::{self, Display},`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +class PayrollCalculator
 +  def calculate
 +    10_000
 +  end
 +end