feat: check .codeowner within directory if it is provided to for_file

Author: att14

lib/code_ownership/private/ownership_mappers/directory_ownership.rb

@@ -74,36 +74,48 @@ def owner_for_codeowners_file(codeowners_file)
           )
         end
 
-        # takes a file and finds the relevant `.codeowner` file by walking up the directory
+        # Takes a file and finds the relevant `.codeowner` file by walking up the directory
         # structure. Example, given `a/b/c.rb`, this looks for `a/b/.codeowner`, `a/.codeowner`,
         # and `.codeowner` in that order, stopping at the first file to actually exist.
+        # If the parovided file is a directory, it will look for `.codeowner` in that directory.
         # We do additional caching so that we don't have to check for file existence every time
         sig { params(file: String).returns(T.nilable(CodeTeams::Team)) }
         def map_file_to_relevant_owner(file)
           file_path = Pathname.new(file)
-          path_components = file_path.each_filename.to_a.map { |path| Pathname.new(path) }
+          team = T.let(nil, T.nilable(CodeTeams::Team))
 
-          (path_components.length - 1).downto(0).each do |i|
-            potential_relative_path_name = T.must(path_components[0...i]).reduce(Pathname.new('')) { |built_path, path| built_path.join(path) }
-            potential_codeowners_file = potential_relative_path_name.join(CODEOWNERS_DIRECTORY_FILE_NAME)
+          if File.directory?(file)
+            team = get_team_from_codeowners_file_within_directory(file_path)
+            return team unless team.nil?
+          end
+
+          while file_path != Pathname('.') && file_path != Pathname('/')
+            file_path = file_path.parent
+            team = get_team_from_codeowners_file_within_directory(file_path)
+            return team unless team.nil?
+          end
 
-            potential_codeowners_file_name = potential_codeowners_file.to_s
+          nil
+        end
 
-            team = nil
-            if @@directory_cache.key?(potential_codeowners_file_name)
-              team = @@directory_cache[potential_codeowners_file_name]
-            elsif potential_codeowners_file.exist?
-              team = owner_for_codeowners_file(potential_codeowners_file)
+        sig { params(directory: Pathname).returns(T.nilable(CodeTeams::Team)) }
+        def get_team_from_codeowners_file_within_directory(directory)
+          potential_codeowners_file = directory.join(CODEOWNERS_DIRECTORY_FILE_NAME)
 
-              @@directory_cache[potential_codeowners_file_name] = team
-            else
-              @@directory_cache[potential_codeowners_file_name] = nil
-            end
+          potential_codeowners_file_name = potential_codeowners_file.to_s
 
-            return team unless team.nil?
+          team = nil
+          if @@directory_cache.key?(potential_codeowners_file_name)
+            team = @@directory_cache[potential_codeowners_file_name]
+          elsif potential_codeowners_file.exist?
+            team = owner_for_codeowners_file(potential_codeowners_file)
+
+            @@directory_cache[potential_codeowners_file_name] = team
+          else
+            @@directory_cache[potential_codeowners_file_name] = nil
           end
 
-          nil
+          return team
         end
       end
     end

spec/lib/code_ownership/private/ownership_mappers/directory_ownership_spec.rb

@@ -21,6 +21,10 @@ module CodeOwnership
       it 'can find the owner of files in a sub-directory of a team-owned directory' do
         expect(CodeOwnership.for_file('a/b/c/c_file.jsx').name).to eq 'Bar'
       end
+
+      it 'looks for codeowner file within directory' do
+        expect(CodeOwnership.for_file('a/b').name).to eq 'Bar'
+      end
     end
   end
 end