code_ownership 1.32.4 → 1.32.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f304bfe47eb64942fd8bb38849942a508c37fb9a531397071fea5375fd7430cb
-  data.tar.gz: 9f24b0084e84b9856f50a119178f661d7b09c50c4c5e2ff48a078dd4276674fd
+  metadata.gz: 51a1c1b52a35af9d0c7c7a48101ccd18cd120577bfd038ce83e6552e8b40e878
+  data.tar.gz: dc7ed2634d7adf107d59b4a4d9480429894e168b203c9ddc12767743ba52e12e
 SHA512:
-  metadata.gz: 384aa25cbb2b268bf9b820de2065783c506b46b560efdec3cc7dc2761dbeab0755d6a5bdc6c8c19b5932f9e36ce581ea13d4f14bfbf138d787977e78e7fa95e1
-  data.tar.gz: 5917554485514a031239bc110b5ce99f4e84ef9b9a1af69df0564e552889be4fb5d7081d4708961f28ff497607e678c72e0ca19ceda573b6e75b81f85ac675e0
+  metadata.gz: 0aa8dd88901d526386ea1f3aae175f013e32e77cbfe7e36b2113ea8c3efccc4e8950f12f09bb01f9b3756a8de9cbe03ae470eee8de5a8bf64d599e8dab1eebf1
+  data.tar.gz: be6d7103274d1c628db0d28d1497b62364b5998540ba5e69bcd6ba0d9c2a5d5f834fe3b7aaa70654db7cfb9bbbd3af88c3c1ac9b055de0cf8475d1a9971f1435

data/lib/code_ownership/private/codeowners_file.rb

@@ -13,7 +13,16 @@ module CodeOwnership
 
       sig { returns(T::Array[String]) }
       def self.actual_contents_lines
-        (path.exist? ? path.read : "").split("\n")
+        if !path.exist?
+          [""]
+        else
+          content = path.read
+          lines = path.read.split("\n")
+          if content.end_with?("\n")
+            lines << ""
+          end
+          lines
+        end
       end
 
       sig { returns(T::Array[T.nilable(String)]) }
@@ -64,9 +73,9 @@ module CodeOwnership
 
         [
           *header.split("\n"),
-          nil, # For line between header and codeowners_file_lines
+          "", # For line between header and codeowners_file_lines
           *codeowners_file_lines,
-          nil, # For end-of-file newline
+          "", # For end-of-file newline
         ]
       end
 

data/lib/code_ownership/private/validations/files_have_owners.rb

@@ -10,22 +10,19 @@ module CodeOwnership
 
         sig { override.params(files: T::Array[String], autocorrect: T::Boolean, stage_changes: T::Boolean).returns(T::Array[String]) }
         def validation_errors(files:, autocorrect: true, stage_changes: true)
-          allow_list = Dir.glob(Private.configuration.unowned_globs)
           files_by_mapper = Private.glob_cache.files_by_mapper
 
           files_not_mapped_at_all = files.select do |file|
             files_by_mapper.fetch(file, []).count == 0
           end
 
-          files_without_owners = files_not_mapped_at_all - allow_list
-
           errors = T.let([], T::Array[String])
 
-          if files_without_owners.any?
+          if files_not_mapped_at_all.any?
             errors << <<~MSG
               Some files are missing ownership:
 
-              #{files_without_owners.map { |file| "- #{file}" }.join("\n")}
+              #{files_not_mapped_at_all.map { |file| "- #{file}" }.join("\n")}
             MSG
           end
 

data/lib/code_ownership/private/validations/github_codeowners_up_to_date.rb

@@ -14,8 +14,10 @@ module CodeOwnership
 
           actual_content_lines = CodeownersFile.actual_contents_lines
           expected_content_lines = CodeownersFile.expected_contents_lines
-          codeowners_up_to_date = actual_content_lines == expected_content_lines
+          missing_lines = expected_content_lines - actual_content_lines
+          extra_lines = actual_content_lines - expected_content_lines
 
+          codeowners_up_to_date = !missing_lines.any? && !extra_lines.any?
           errors = T.let([], T::Array[String])
 
           if !codeowners_up_to_date
@@ -26,8 +28,6 @@ module CodeOwnership
               end
             else
               # If there is no current file or its empty, display a shorter message.
-              missing_lines = expected_content_lines - actual_content_lines
-              extra_lines = actual_content_lines - expected_content_lines
 
               missing_lines_text = if missing_lines.any?
                 <<~COMMENT
@@ -53,7 +53,7 @@ module CodeOwnership
                 ""
               end
 
-              if actual_content_lines == []
+              if actual_content_lines == [""]
                 errors << <<~CODEOWNERS_ERROR
                   CODEOWNERS out of date. Run `bin/codeownership validate` to update the CODEOWNERS file
                 CODEOWNERS_ERROR

data/lib/code_ownership/private.rb

@@ -76,7 +76,7 @@ module CodeOwnership
     sig { returns(T::Array[String]) }
     def self.tracked_files
       @tracked_files ||= T.let(@tracked_files, T.nilable(T::Array[String]))
-      @tracked_files ||= Dir.glob(configuration.owned_globs)
+      @tracked_files ||= Dir.glob(configuration.owned_globs) - Dir.glob(configuration.unowned_globs)
     end
 
     sig { params(team_name: String, location_of_reference: String).returns(CodeTeams::Team) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: code_ownership
 version: !ruby/object:Gem::Version
-  version: 1.32.4
+  version: 1.32.6
 platform: ruby
 authors:
 - Gusto Engineers