code_owners 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: baea109754326800382bc8665df1e20634680187a1209f612bcc14f1447a962e
-  data.tar.gz: 25975f589029d740031c6c14832341a605fa885386be3f88bcb992cb427b1bf0
+  metadata.gz: 42ad83e6c56f3bb34904d52dde4eb0f689fde59ea59868ecd4c428f3f13c8762
+  data.tar.gz: f8abb4f85d6fdf586432d047d9c24a521ea4411853a4a36e88de57556698d6a1
 SHA512:
-  metadata.gz: be4b52ceca387c455f3b597f47c3f61aed0d3c381eb4d52e6f2d9c25311d0505704ebb817af0ab73892521bdb1f804fc3a560bfb49c54e1f62b03bf20fe6b796
-  data.tar.gz: b31b2929d9023a3609bbd8286b4579ff87c8af5f4a6fc9025ccce9f8bdbddb65c09facf92c7a6873dd20423e925e083de41ba7de8800210ea2cf2b67b749082a
+  metadata.gz: 80e88fb5714e128bcb401a8ecd7be79e631c3105c370d7ac275bc2ffd60ac92182b5d6090ad60782cba0cc6af89a60a0758466d4ebc703269ad83ea8d8cf5e4e
+  data.tar.gz: fa22fe034e7256b8637564a74803c044e85c675399978e8ccfc4d114b1b88d958501f5143c205d8cc159c40a1f823f269567cf6e22a84df896e5161f6a385113

data/Gemfile.lock

@@ -1,29 +1,29 @@
 PATH
   remote: .
   specs:
-    code_owners (2.0.0)
+    code_owners (2.0.1)
       pathspec
       rake
 
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.3)
+    diff-lcs (1.5.0)
     pathspec (0.2.1)
     rake (13.0.6)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
 
 PLATFORMS
   ruby

data/lib/code_owners/version.rb

@@ -1,3 +1,3 @@
 module CodeOwners
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/lib/code_owners.rb

@@ -18,12 +18,12 @@ module CodeOwners
     # this maps the collection of ownership patterns and owners to actual files
     def ownerships(opts = {})
       log("Calculating ownerships for #{opts.inspect}", opts)
-      patterns = pattern_owners(codeowners_data(opts), opts)
+      patowns = pattern_owners(codeowners_data(opts), opts)
       if opts[:no_git]
         files = files_to_own(opts)
-        ownerships_by_ruby(patterns, files, opts)
+        ownerships_by_ruby(patowns, files, opts)
       else
-        ownerships_by_gitignore(patterns, opts)
+        ownerships_by_gitignore(patowns, opts)
       end
     end
 
@@ -78,24 +78,35 @@ module CodeOwners
     ###############
     # ruby approach
 
-    def ownerships_by_ruby(patterns, files, opts = {})
-      ownerships = files.map { |f| { file: f, owner: NO_OWNER, line: nil, pattern: nil } }
+    def ownerships_by_ruby(patowns, files, opts = {})
+      pattern_list = build_ruby_patterns(patowns, opts)
+      unowned = { owner: NO_OWNER, line: nil, pattern: nil }
 
-      patterns.each_with_index do |(pattern, owner), i|
-        next if pattern == ""
-        pattern = pattern.gsub(/\/\*$/, "/**")
-        spec_pattern = PathSpec::GitIgnoreSpec.new(pattern)
-        ownerships.each do |o|
-          next unless spec_pattern.match(o[:file])
-          o[:owner]   = owner
-          o[:line]    = i+1
-          o[:pattern] = pattern
+      files.map do |file|
+        last_match = nil
+        # have a flag to go through in reverse order as potential optimization?
+        # really depends on the data
+        pattern_list.each do |p|
+          last_match = p if p[:pattern_regex].match(file)
         end
+        (last_match || unowned).dup.tap{|h| h[:file] = file }
       end
-
-      ownerships
     end
 
+    def build_ruby_patterns(patowns, opts = {})
+      pattern_list = []
+      patowns.each_with_index do |(pattern, owner), i|
+        next if pattern == ""
+        pattern_list << {
+          owner: owner,
+          line: i+1,
+          pattern: pattern,
+          # gsub because spec approach needs a little help matching remainder of tree recursively
+          pattern_regex: PathSpec::GitIgnoreSpec.new(pattern.gsub(/\/\*$/, "/**"))
+        }
+      end
+      pattern_list
+    end
 
 
     ##############

data/spec/code_owners_spec.rb

@@ -46,10 +46,10 @@ RSpec.describe CodeOwners do |rspec|
         results = CodeOwners.ownerships(no_git: true)
         expect(results).to match_array([
           {:file=>"zip", :owner=>"UNOWNED", :line=>nil, :pattern=>nil},
-          {:file=>"foo.rb", :owner=>"own2", :line=>2, :pattern=>"foo*"},
-          {:file=>"foo/bar.rb", :owner=>"own3", :line=>3, :pattern=>"foo/**"},
-          {:file=>"foo/bar/baz.rb", :owner=>"own3", :line=>3, :pattern=>"foo/**"},
-          {:file=>"foo/bar/baz/meow.txt", :owner=>"own3", :line=>3, :pattern=>"foo/**"},
+          {:file=>"foo.rb", :owner=>"own2", :line=>2, :pattern=>"foo*", pattern_regex: anything},
+          {:file=>"foo/bar.rb", :owner=>"own3", :line=>3, :pattern=>"foo/**", pattern_regex: anything},
+          {:file=>"foo/bar/baz.rb", :owner=>"own3", :line=>3, :pattern=>"foo/**", pattern_regex: anything},
+          {:file=>"foo/bar/baz/meow.txt", :owner=>"own3", :line=>3, :pattern=>"foo/**", pattern_regex: anything},
           {:file=>"waffles", :owner=>"UNOWNED", :line=>nil, :pattern=>nil}
         ])
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: code_owners
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Jonathan Cheatham