code_ownership 1.38.0 → 1.38.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7883f0d73587e099adf43101b91f0a2f296912cfa3e994e2f1c70472de918e4b
-  data.tar.gz: 1e11b8c1ce41986fa40325b3edf10369b00a7ed8a42f47e2ed4fe9694f565642
+  metadata.gz: b40aef85c83e70ad2c2a8ba45030b3e894b184ec71e897443d47b859343a8636
+  data.tar.gz: 27741ae85077282dca91f42f274325d66ee25b8ed01eaab733aab581f23e6e4e
 SHA512:
-  metadata.gz: 5a381fc3a9867de019b70ada03aca768c427b05198449c4d6478f245f79fefd8e2bd56ab5df06fbe62577d12ce6f6bf80a6509f8347f65831ab8251075b1047f
-  data.tar.gz: 5ea28b28bbf41f5620fbf07d6d4083f8dcfea577648612fd8f05d4e128007ff73d6cec2e1a433ef84cf35a1e4b2c8b4a2d4fca0a8bbaeafedca948be293aaaba
+  metadata.gz: 8d8c2765433571d6407ec67608554fb04dc9b14d84948ddf9b227874aca628e3fd4e927c6154a3d41ede65bdd8628f522e77c089fab9727ec6860339a03673e3
+  data.tar.gz: 0c8eeb737cbbcce93210c43f0f6c21d846761fa94daa97243796747db3343bf6fd40c033cd3337a628716dd91714354ed5d2af1a2eda1ea29ea716f9ef0687e7

data/lib/code_ownership/private/codeowners_file.rb

@@ -73,7 +73,26 @@ module CodeOwnership
 
           next if ownership_entries.none?
 
-          codeowners_file_lines += ['', "# #{mapper_description}", *ownership_entries.sort]
+          # When we have a special character at the beginning of a folder name, then this character
+          # may be prioritized over *. However, we want the most specific folder to be listed last
+          # in the CODEOWNERS file, so we should prioritize any character above an asterisk in the
+          # same position.
+          if mapper_description == OwnershipMappers::FileAnnotations::DESCRIPTION
+            # individually owned files definitely won't have globs so we don't need to do special sorting
+            sorted_ownership_entries = ownership_entries.sort
+          else
+            sorted_ownership_entries = ownership_entries.sort do |entry1, entry2|
+              if entry2.start_with?(entry1.split('**').first)
+                -1
+              elsif entry1.start_with?(entry2.split('**').first)
+                1
+              else
+                entry1 <=> entry2
+              end
+            end
+          end
+
+          codeowners_file_lines += ['', "# #{mapper_description}", *sorted_ownership_entries]
         end
 
         [

data/lib/code_ownership.rb

@@ -136,13 +136,23 @@ module CodeOwnership
     #
     #   ./app/controllers/some_controller.rb:43:in `block (3 levels) in create'
     #
-    backtrace_line = %r{\A(#{Pathname.pwd}/|\./)?
-        (?<file>.+)       # Matches 'app/controllers/some_controller.rb'
-        :
-        (?<line>\d+)      # Matches '43'
-        :in\s
-        `(?<function>.*)' # Matches "`block (3 levels) in create'"
-      \z}x
+    backtrace_line = if RUBY_VERSION >= '3.4.0'
+      %r{\A(#{Pathname.pwd}/|\./)?
+          (?<file>.+)       # Matches 'app/controllers/some_controller.rb'
+          :
+          (?<line>\d+)      # Matches '43'
+          :in\s
+          '(?<function>.*)' # Matches "`block (3 levels) in create'"
+        \z}x
+    else
+      %r{\A(#{Pathname.pwd}/|\./)?
+          (?<file>.+)       # Matches 'app/controllers/some_controller.rb'
+          :
+          (?<line>\d+)      # Matches '43'
+          :in\s
+          `(?<function>.*)' # Matches "`block (3 levels) in create'"
+        \z}x
+    end
 
     backtrace.lazy.filter_map do |line|
       match = line.match(backtrace_line)

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: code_ownership
 version: !ruby/object:Gem::Version
-  version: 1.38.0
+  version: 1.38.2
 platform: ruby
 authors:
 - Gusto Engineers
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-06 00:00:00.000000000 Z
+date: 2025-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: code_teams
@@ -205,7 +204,6 @@ metadata:
   source_code_uri: https://github.com/rubyatscale/code_ownership
   changelog_uri: https://github.com/rubyatscale/code_ownership/releases
   allowed_push_host: https://rubygems.org
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -220,8 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A gem to help engineering teams declare ownership of code
 test_files: []