code_ownership 1.36.0 → 1.36.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e34134e28ee70e58344ea6d3f90be157bbdd6945888eee07d73abf3db3ed873b
-  data.tar.gz: 1875f6d3131505551c163aa03413edefa86c6f279d2c3189d9663a74a9603758
+  metadata.gz: b73797a7557aab4536aef1ae47614f8d43e4dc634ec3ab476913c38efec1ad42
+  data.tar.gz: 5d1724a6eadb02d5bd7f1e521177f760b9134575d34a9bea634f30d45765de2f
 SHA512:
-  metadata.gz: de217fe525521395f2b6ad647257aecd69c9e8f8895fa0d466051cf4d365c3fce2dcf08ea9c9bfbeeef0c75116f3188d6f350c72becb965f7f3d49a992a0b6fa
-  data.tar.gz: abf92fcca79c8311cfa9d82fabcb0b129fdd076c9cb7a3db31c0db983dabf1e6cb5810b501e38cdab9fbf028dc3a43ed6105928469015b6bf30a33e774b5a6b6
+  metadata.gz: 404f36c3804c30f3eb0fb5fc3a18faf71667c5fe4eab25f0d4527491ce838ee51c39824f3fcacc608e5e1356e82272bbe1928f18e0bd9a65e1c1941df595e5de
+  data.tar.gz: 326d2644787ee2e9d8c054b38762495db9be3c15305519176e3045c979b96e655136f3fb1def6840b8e975e56ee693fbc72dea8d10c6f69a86f2126376f70746

data/lib/code_ownership/private/glob_cache.rb

@@ -53,14 +53,8 @@ module CodeOwnership
         @expanded_cache ||= begin
           expanded_cache = {}
           @raw_cache_contents.each do |mapper_description, globs_by_owner|
-            expanded_cache[mapper_description] = {}
-            globs_by_owner.each do |glob, owner|
-              Dir.glob(glob).each do |file, owner|
-                expanded_cache[mapper_description][file] = owner
-              end
-            end
+            expanded_cache[mapper_description] = OwnerAssigner.assign_owners(globs_by_owner)
           end
-          
           expanded_cache
         end
       end

data/lib/code_ownership/private/owner_assigner.rb

@@ -0,0 +1,22 @@
+# typed: strict
+# frozen_string_literal: true
+
+module CodeOwnership
+  module Private
+    class OwnerAssigner
+      extend T::Sig
+
+      sig { params(globs_to_owning_team_map: GlobsToOwningTeamMap).returns(GlobsToOwningTeamMap) }
+      def self.assign_owners(globs_to_owning_team_map)
+        globs_to_owning_team_map.each_with_object({}) do |(glob, owner), mapping|
+          # addresses the case where a directory name includes regex characters
+          # such as `app/services/[test]/some_other_file.ts`
+          mapping[glob] = owner if File.exist?(glob)
+          Dir.glob(glob).each do |file|
+            mapping[file] ||= owner
+          end
+        end
+      end
+    end
+  end
+end

data/lib/code_ownership/private/ownership_mappers/directory_ownership.rb

@@ -10,8 +10,6 @@ module CodeOwnership
         include Mapper
 
         CODEOWNERS_DIRECTORY_FILE_NAME = '.codeowner'
-        RELATIVE_ROOT = Pathname('.').freeze
-        ABSOLUTE_ROOT = Pathname('/').freeze
 
         @@directory_cache = T.let({}, T::Hash[String, T.nilable(CodeTeams::Team)]) # rubocop:disable Style/ClassVars
 
@@ -88,11 +86,19 @@ module CodeOwnership
 
           if File.directory?(file)
             team = get_team_from_codeowners_file_within_directory(file_path)
+            return team unless team.nil?
           end
 
-          while team.nil? && file_path != RELATIVE_ROOT && file_path != ABSOLUTE_ROOT
-            file_path = file_path.parent
-            team = get_team_from_codeowners_file_within_directory(file_path)
+          path_components = file_path.each_filename.to_a
+          if file_path.absolute?
+            path_components = ['/', *path_components]
+          end
+
+          (path_components.length - 1).downto(0).each do |i|
+            team = get_team_from_codeowners_file_within_directory(
+               Pathname.new(File.join(*T.unsafe(path_components[0...i])))
+            )
+            return team unless team.nil?
           end
 
           team

data/lib/code_ownership/private.rb

@@ -8,6 +8,7 @@ require 'code_ownership/private/team_plugins/github'
 require 'code_ownership/private/codeowners_file'
 require 'code_ownership/private/parse_js_packages'
 require 'code_ownership/private/glob_cache'
+require 'code_ownership/private/owner_assigner'
 require 'code_ownership/private/validations/files_have_owners'
 require 'code_ownership/private/validations/github_codeowners_up_to_date'
 require 'code_ownership/private/validations/files_have_unique_owners'
@@ -98,7 +99,6 @@ module CodeOwnership
       in_unowned_globs = configuration.unowned_globs.any? do |unowned_glob|
         File.fnmatch?(unowned_glob, file, File::FNM_PATHNAME | File::FNM_EXTGLOB)
       end
-
       in_owned_globs && !in_unowned_globs && File.exist?(file)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: code_ownership
 version: !ruby/object:Gem::Version
-  version: 1.36.0
+  version: 1.36.2
 platform: ruby
 authors:
 - Gusto Engineers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-01 00:00:00.000000000 Z
+date: 2024-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: code_teams
@@ -44,16 +44,16 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.10821
+        version: 0.5.11249
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.10821
+        version: 0.5.11249
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -168,6 +168,7 @@ files:
 - lib/code_ownership/private/codeowners_file.rb
 - lib/code_ownership/private/extension_loader.rb
 - lib/code_ownership/private/glob_cache.rb
+- lib/code_ownership/private/owner_assigner.rb
 - lib/code_ownership/private/ownership_mappers/directory_ownership.rb
 - lib/code_ownership/private/ownership_mappers/file_annotations.rb
 - lib/code_ownership/private/ownership_mappers/js_package_ownership.rb