code_ownership 1.32.17 → 1.32.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aea9ab810bdf433b824ae72f06c4f33773139e6a5613a67ac29b5ff92e38ba70
-  data.tar.gz: 898b6d683ca5f3a4100eae345f2ff06ffff8024b63e8985b49ce86644d5401e3
+  metadata.gz: 994693da06866743ce4cf2fa3b6bee1df754ac26e10884c999f0c37c9b72c23c
+  data.tar.gz: 5b2643e5ecd989f8ea15984a59b0b0a2522dbc614441228e10f7e25958141af0
 SHA512:
-  metadata.gz: 1294593e12fccc2cdbbc9946652dd5e80c75fd862cfbc2fc1fc0b5d7fb5632d1870da55cb639ea969efb7ff8fa9202c06b82d0c257ef4eda83f40c972d791cd4
-  data.tar.gz: 5160484ffc1919619082c13793cea928155743b6319fe69606f8a4f7447fbebc62bca78f714d947ee9a293b1543cf5dbfc719e861c4a14d43d68eba5dea86a9b
+  metadata.gz: e832b86888eb90bb0beaff6410565f20c9224029af7d434698238039422ca67a6e34a0629a4441ab428fe73dddfac2bf606200191c621836989bbf67daff05a6
+  data.tar.gz: 2e5b208eb94ff9cc870e53d3673cc794f87af20f7d78c80a1493e3b9edfd2c2403285731b6b5b07292df5855ddf6e55c4f0b16d102bcb65c1dc6844ed39dfcf1

data/README.md

@@ -96,7 +96,7 @@ See `code_ownership_spec.rb` for an example.
 `CodeOwnership.for_class` can be given a class and will either return `nil`, or a `CodeTeams::Team`.
 
 ```ruby
-CodeOwnership.for_class(MyClass.name)
+CodeOwnership.for_class(MyClass)
 ```
 
 Under the hood, this finds the file where the class is defined and returns the owner of that file.

data/lib/code_ownership/mapper.rb

@@ -12,16 +12,16 @@ module CodeOwnership
     class << self
       extend T::Sig
 
-      sig { params(base: Class).void }
+      sig { params(base: T::Class[Mapper]).void }
       def included(base)
-        @mappers ||= T.let(@mappers, T.nilable(T::Array[Class]))
+        @mappers ||= T.let(@mappers, T.nilable(T::Array[T::Class[Mapper]]))
         @mappers ||= []
         @mappers << base
       end
 
       sig { returns(T::Array[Mapper]) }
       def all
-        T.unsafe(@mappers).map(&:new)
+        (@mappers || []).map(&:new)
       end
     end
 

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
 

data/lib/code_ownership/validator.rb

@@ -14,16 +14,16 @@ module CodeOwnership
     class << self
       extend T::Sig
 
-      sig { params(base: Class).void }
+      sig { params(base: T::Class[Validator]).void }
       def included(base)
-        @validators ||= T.let(@validators, T.nilable(T::Array[Class]))
+        @validators ||= T.let(@validators, T.nilable(T::Array[T::Class[Validator]]))
         @validators ||= []
         @validators << base
       end
 
       sig { returns(T::Array[Validator]) }
       def all
-        T.unsafe(@validators).map(&:new)
+        (@validators || []).map(&:new)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: code_ownership
 version: !ruby/object:Gem::Version
-  version: 1.32.17
+  version: 1.32.19
 platform: ruby
 authors:
 - Gusto Engineers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-01 00:00:00.000000000 Z
+date: 2023-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: code_teams
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.10821
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.10821
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement