code_ownership 1.32.18 → 1.32.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f00d3f6cebe0c0c1a832fe6bd5487b39edb84a0cb316ecbcea33bbf2b090d9bd
-  data.tar.gz: 6092a31cf222e8b734f19338d612ac1b08c121c20dbc822b1271e97ab11980c0
+  metadata.gz: 994693da06866743ce4cf2fa3b6bee1df754ac26e10884c999f0c37c9b72c23c
+  data.tar.gz: 5b2643e5ecd989f8ea15984a59b0b0a2522dbc614441228e10f7e25958141af0
 SHA512:
-  metadata.gz: 054d5179ae0516d621f71e222308c28c769dfcfe1fd66595ddbe23f6f18126bbfc683ef9a6882a67e8599e88b5fd6800eb95c8f1b55e80c66a13bd8c13a245ba
-  data.tar.gz: a1bcaa5dce9cb34158ce59d73b17d7cdc1494502ca802aa01b5bc3f5af507fd8187b5561e8b26f24151ec1e72eeee24a12c4b314f853af4a0f9230530e6d500d
+  metadata.gz: e832b86888eb90bb0beaff6410565f20c9224029af7d434698238039422ca67a6e34a0629a4441ab428fe73dddfac2bf606200191c621836989bbf67daff05a6
+  data.tar.gz: 2e5b208eb94ff9cc870e53d3673cc794f87af20f7d78c80a1493e3b9edfd2c2403285731b6b5b07292df5855ddf6e55c4f0b16d102bcb65c1dc6844ed39dfcf1

data/lib/code_ownership/private/codeowners_file.rb

@@ -53,7 +53,10 @@ module CodeOwnership
 
         cache.each do |mapper_description, ownership_map_cache|
           ownership_entries = []
-          ownership_map_cache.each do |path, code_team|
+          sorted_ownership_map_cache = ownership_map_cache.sort_by do |glob, team|
+            glob
+          end
+          sorted_ownership_map_cache.to_h.each do |path, code_team|
             team_mapping = github_team_map[code_team.name]
             next if team_mapping.nil?
 

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

@@ -14,10 +14,8 @@ module CodeOwnership
 
           actual_content_lines = CodeownersFile.actual_contents_lines
           expected_content_lines = CodeownersFile.expected_contents_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?
+          codeowners_up_to_date = actual_content_lines == expected_content_lines
           errors = T.let([], T::Array[String])
 
           if !codeowners_up_to_date
@@ -26,8 +24,14 @@ module CodeOwnership
               if stage_changes
                 `git add #{CodeownersFile.path}`
               end
+            # If there is no current file or its empty, display a shorter message.
+            elsif actual_content_lines == [""]
+              errors << <<~CODEOWNERS_ERROR
+                CODEOWNERS out of date. Run `bin/codeownership validate` to update the CODEOWNERS file
+              CODEOWNERS_ERROR
             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
@@ -50,20 +54,19 @@ module CodeOwnership
               elsif extra_lines_text
                 extra_lines_text
               else
-                ""
+                <<~TEXT
+                  There may be extra lines, or lines are out of order.
+                  You can try to regenerate the CODEOWNERS file from scratch:
+                  1) `rm .github/CODEOWNERS`
+                  2) `bin/codeownership validate`
+                TEXT
               end
 
-              if actual_content_lines == [""]
-                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
+              errors << <<~CODEOWNERS_ERROR
+                CODEOWNERS out of date. Run `bin/codeownership validate` to update the CODEOWNERS file
 
-                  #{diff_text.chomp}
-                CODEOWNERS_ERROR
-              end
+                #{diff_text.chomp}
+              CODEOWNERS_ERROR
             end
           end
 

metadata

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