code_ownership 1.26.0 → 1.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 988c067afbabcc65d5b697aea162ba1c288787e4d7d9a84a261b00f76859aa6b
-  data.tar.gz: 6a504214d4470cfd2d1ab103f201069367e39962a390d34382410587a6067e40
+  metadata.gz: a58e46098c8c50b7888308dff49901380c69ccad8211946ff5c67d94bfd9c541
+  data.tar.gz: 68078aa4407fa01ad485574543dc47af49039d9b0b8a8e55af75a81ff4018ef6
 SHA512:
-  metadata.gz: 16b3e48c3cb734857dd66cf03f9d43d89bb92ee3ab92abfc0550004274531e03eef4abc9157fab33e25d815dd5b5c6f055d65987e7526dcb4952212930935678
-  data.tar.gz: 0f0cc9f4a1b8938e088bc258d5b247d633beaac3c68ddf37ea269fa3740d27d796b9773354e47855e79ecd5e958b49d97fd9f231f42502e62eab508d1d8ea9a1
+  metadata.gz: 8cbdffd0dc477b6ed6c69dd61df2d2f6f732b3ae90acb141193e3ec1f3bd6af364c199c3abf2b29f4faddf393e75f39438aacc9f51590b3cc20736fb7deeda3d
+  data.tar.gz: e9604ec12ccbe6e1ae14fec8222a7cc93887d7e1ababbbcf318b7a3bbd6277f98add5ff47ff3244b068b030364177460022a8a2419a398c819d227396d2d19ee

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

@@ -25,24 +25,66 @@ module CodeOwnership
             # https://help.github.com/en/articles/about-code-owners
           HEADER
 
-          contents = [
-            header,
+          expected_content_lines = [
+            *header.split("\n"),
+            nil, # For line between header and codeowners_file_lines
             *codeowners_file_lines,
             nil, # For end-of-file newline
-          ].join("\n")
+          ]
+          
+          expected_contents = expected_content_lines.join("\n")
+          actual_contents = codeowners_filepath.exist? ? codeowners_filepath.read : ""
+          actual_content_lines = actual_contents.split("\n")
 
-          codeowners_up_to_date = codeowners_filepath.exist? && codeowners_filepath.read == contents
+          codeowners_up_to_date = actual_contents == expected_contents
 
           errors = T.let([], T::Array[String])
 
           if !codeowners_up_to_date
             if autocorrect
-              codeowners_filepath.write(contents)
+              codeowners_filepath.write(expected_contents)
               if stage_changes
                 `git add #{codeowners_filepath}`
               end
             else
-              errors << "CODEOWNERS out of date. Ensure pre-commit hook is set up correctly and used. You can also run bin/codeownership validate to update the CODEOWNERS file\n"
+              # 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
+                  CODEOWNERS should contain the following lines, but does not:
+                  #{(expected_content_lines - actual_content_lines).map { |line| "- \"#{line}\""}.join("\n")}
+                COMMENT
+              end
+
+              extra_lines_text = if extra_lines.any?
+                <<~COMMENT
+                  CODEOWNERS should not contain the following lines, but it does:
+                  #{(actual_content_lines - expected_content_lines).map { |line| "- \"#{line}\""}.join("\n")}
+                COMMENT
+              end
+
+              diff_text = if missing_lines_text && extra_lines_text
+                 "#{missing_lines_text}\n#{extra_lines_text}".chomp
+              elsif missing_lines_text
+                missing_lines_text
+              elsif extra_lines_text
+                extra_lines_text
+              else
+                ""
+              end
+
+              if actual_contents == ""
+                errors << <<~CODEOWNERS_ERROR
+                  CODEOWNERS out of date. Run `bin/codeownership validate` to update the CODEOWNERS file
+                CODEOWNERS_ERROR
+              else
+                errors << <<~CODEOWNERS_ERROR
+                  CODEOWNERS out of date. Run `bin/codeownership validate` to update the CODEOWNERS file
+
+                  #{diff_text.chomp}
+                CODEOWNERS_ERROR
+              end
             end
           end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: code_ownership
 version: !ruby/object:Gem::Version
-  version: 1.26.0
+  version: 1.27.0
 platform: ruby
 authors:
 - Gusto Engineers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-01 00:00:00.000000000 Z
+date: 2022-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigrails-teams