Use ParsePackwerk.package_from_path (#19)

Author: Alex Evanczuk

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    code_ownership (1.28.1)
+    code_ownership (1.28.2)
       code_teams (~> 1.0)
       parse_packwerk
       sorbet-runtime

code_ownership.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "code_ownership"
-  spec.version       = '1.28.1'
+  spec.version       = '1.28.2'
   spec.authors       = ['Gusto Engineers']
   spec.email         = ['[email protected]']
   spec.summary       = 'A gem to help engineering teams declare ownership of code'

lib/code_ownership/private/ownership_mappers/package_ownership.rb

@@ -16,7 +16,7 @@ class PackageOwnership
             returns(T.nilable(::CodeTeams::Team))
         end
         def map_file_to_owner(file)
-          package = map_file_to_relevant_package(file)
+          package = ParsePackwerk.package_from_path(file)
 
           return nil if package.nil?
 
@@ -80,41 +80,6 @@ def owner_for_package(package)
         def bust_caches!
           @@package_yml_cache = {} # rubocop:disable Style/ClassVars
         end
-
-        private
-
-        # takes a file and finds the relevant `package.yml` file by walking up the directory
-        # structure. Example, given `packs/a/b/c.rb`, this looks for `packs/a/b/package.yml`, `packs/a/package.yml`,
-        # `packs/package.yml`, and `package.yml` 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
-        sig { params(file: String).returns(T.nilable(ParsePackwerk::Package)) }
-        def map_file_to_relevant_package(file)
-          file_path = Pathname.new(file)
-          path_components = file_path.each_filename.to_a.map { |path| Pathname.new(path) }
-
-          (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_package_yml_path = potential_relative_path_name.
-              join(ParsePackwerk::PACKAGE_YML_NAME)
-
-            potential_package_yml_string = potential_package_yml_path.to_s
-
-            package = nil
-            if @@package_yml_cache.key?(potential_package_yml_string)
-              package = @@package_yml_cache[potential_package_yml_string]
-            elsif potential_package_yml_path.exist?
-              package = ParsePackwerk::Package.from(potential_package_yml_path)
-
-              @@package_yml_cache[potential_package_yml_string] = package
-            else
-              @@package_yml_cache[potential_package_yml_string] = nil
-            end
-
-            return package unless package.nil?
-          end
-
-          nil
-        end
       end
     end
   end

spec/lib/code_ownership_spec.rb

@@ -103,6 +103,11 @@
             metadata:
               owner: Bar
           CONTENTS
+
+          write_file('package.yml', <<~CONTENTS)
+            enforce_dependency: true
+            enforce_privacy: true
+          CONTENTS
         end
 
         it 'lets the user know that each file can only have ownership defined in one way' do
@@ -757,7 +762,7 @@ def prevent_false_positive!
     before { create_non_empty_application }
 
     it 'returns the right team' do
-      team = CodeOwnership.for_package(ParsePackwerk.all.last)
+      team = CodeOwnership.for_package(ParsePackwerk.find('packs/my_other_package'))
       expect(team.name).to eq 'Bar'
     end
   end
@@ -802,6 +807,11 @@ def prevent_false_positive!
 
           # Some content
         CONTENTS
+
+        write_file('package.yml', <<~CONTENTS)
+          enforce_dependency: true
+          enforce_privacy: true
+        CONTENTS
       end
 
       it 'removes the annotation' do
@@ -834,6 +844,11 @@ def prevent_false_positive!
 
           // Some content
         CONTENTS
+
+        write_file('package.yml', <<~CONTENTS)
+          enforce_dependency: true
+          enforce_privacy: true
+        CONTENTS
       end
 
       it 'removes the annotation' do

spec/support/application_fixtures.rb

@@ -42,6 +42,11 @@
         owner: Bar
     CONTENTS
 
+    write_file('package.yml', <<~CONTENTS)
+      enforce_dependency: true
+      enforce_privacy: true
+    CONTENTS
+
     write_file('packs/my_other_package/my_file.rb')
   end