code_ownership 1.35.0 → 1.36.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 687d34f0d9ad8f7421b0a599904c697e10b34ec9f638a47f1e861b2e858bf091
-  data.tar.gz: b8beee01bb8e5ff88d73117a05ad8c99c04e3ee3a7434f1a92da0e15cc7839dd
+  metadata.gz: 668edc0471999590cd95e9953151e6e30d02bf64b2bb14e544e5f7c56099c998
+  data.tar.gz: bbdff6a9af05c8026b33c206d63f083d1c9ed82831bd7b1f3cf3707aa0f54a67
 SHA512:
-  metadata.gz: c30fb93a5e634f648f00ab7269d0744cbb9dc120b3c472769a116e59066190560845ae8ee660750efb81c10d8c483373ffda8058d523ac50f16fa05266cf9e29
-  data.tar.gz: 1843017837ed962de655069fcb64d7d5121e72eb6375df14b8a7be8c35d6b9b55ba3e592bb9a240374964002ea65d1c7f87a0ddd6d565a1c74e4276c51bb56fb
+  metadata.gz: 54a6b78ddb108894b20ddee99d0a6637770485b27c154b6676021f512d2aae39159d052e8f2c7986b71c824eb9f3f7bc4a3b9d5bc0c9e1848e7bceecee3e7728
+  data.tar.gz: b4f39290cfc23f31b73642d3d6a5747ec79efc07210541c4b18c913f448c1df32efe6b4657e91f736055ab30ecf72b4910c22a0266503842aff84ad0e375be62

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

@@ -74,36 +74,54 @@ 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))
+
+          if File.directory?(file)
+            team = get_team_from_codeowners_file_within_directory(file_path)
+            return team unless team.nil?
+          end
+
+          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|
-            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)
+            team = get_team_from_codeowners_file_within_directory(
+               Pathname.new(File.join(*T.unsafe(path_components[0...i])))
+            )
+            return team unless team.nil?
+          end
 
-            potential_codeowners_file_name = potential_codeowners_file.to_s
+          team
+        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

metadata

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