code_ownership 1.35.0 → 1.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 687d34f0d9ad8f7421b0a599904c697e10b34ec9f638a47f1e861b2e858bf091
-  data.tar.gz: b8beee01bb8e5ff88d73117a05ad8c99c04e3ee3a7434f1a92da0e15cc7839dd
+  metadata.gz: e34134e28ee70e58344ea6d3f90be157bbdd6945888eee07d73abf3db3ed873b
+  data.tar.gz: 1875f6d3131505551c163aa03413edefa86c6f279d2c3189d9663a74a9603758
 SHA512:
-  metadata.gz: c30fb93a5e634f648f00ab7269d0744cbb9dc120b3c472769a116e59066190560845ae8ee660750efb81c10d8c483373ffda8058d523ac50f16fa05266cf9e29
-  data.tar.gz: 1843017837ed962de655069fcb64d7d5121e72eb6375df14b8a7be8c35d6b9b55ba3e592bb9a240374964002ea65d1c7f87a0ddd6d565a1c74e4276c51bb56fb
+  metadata.gz: de217fe525521395f2b6ad647257aecd69c9e8f8895fa0d466051cf4d365c3fce2dcf08ea9c9bfbeeef0c75116f3188d6f350c72becb965f7f3d49a992a0b6fa
+  data.tar.gz: abf92fcca79c8311cfa9d82fabcb0b129fdd076c9cb7a3db31c0db983dabf1e6cb5810b501e38cdab9fbf028dc3a43ed6105928469015b6bf30a33e774b5a6b6

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

@@ -10,6 +10,8 @@ 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
 
@@ -74,36 +76,46 @@ module CodeOwnership
           )
         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.
-        # We do additional caching so that we don't have to check for file existence every time
+        # If the parovided file is a directory, it will look for `.codeowner` in that directory and then upwards.
+        # 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)
+          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)
+          end
+
+          team
+        end
 
-            potential_codeowners_file_name = potential_codeowners_file.to_s
+        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)
 
-            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)
+          potential_codeowners_file_name = potential_codeowners_file.to_s
 
-              @@directory_cache[potential_codeowners_file_name] = team
-            else
-              @@directory_cache[potential_codeowners_file_name] = 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)
 
-            return team unless team.nil?
+            @@directory_cache[potential_codeowners_file_name] = team
+          else
+            @@directory_cache[potential_codeowners_file_name] = nil
           end
 
-          nil
+          return team
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: code_ownership
 version: !ruby/object:Gem::Version
-  version: 1.35.0
+  version: 1.36.0
 platform: ruby
 authors:
 - Gusto Engineers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-29 00:00:00.000000000 Z
+date: 2023-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: code_teams