git-recommend 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7396b42cb2f6d31e427214554481e4425f20e5b7
-  data.tar.gz: 4ef7cbba5c84eaef068e1c5c2d120e7cc09bab19
+  metadata.gz: 7dcb382ae28e749803477ed0a508f0e86ed8768e
+  data.tar.gz: b626e2449e9edb8b355122ae08ce944cada99d7e
 SHA512:
-  metadata.gz: e277ce21a284fc256370aebcb744f4d47dc5516930ce75817763439b4dd6dff8498214c7446d282902ce7945b4cee1aac5d9679b203792a59925ee35593c9ae7
-  data.tar.gz: df30d9cf8bb9d86899fd2c73d0de86613789b444ddc6394eb24caa9754890dfd651aa4406cb24dd05886cb54cd67363e51f29ae58fcd46704993855d41c15ebd
+  metadata.gz: 21d0b9d197c7f56252873cf9e626d2dd86e341e7e1bb9cb7502b58329e16754db06c96da5e4e16d74d9679968cd9e5a02133a3e6d4cf30b88bf464e46ac58d8f
+  data.tar.gz: 0bc7ce53718967075d7ed586627c314b5743e731ddf9604ed12edd7075bd5efab370ac6c0b65a1d6b9d2846b7ae296836449d90ff39d91faed54dad560717c88

data/bin/git-test

@@ -1,4 +1,4 @@
-#impacted_items!/usr/bin/env ruby
+#!/usr/bin/env ruby
 require_relative '../lib/helper.rb'
 
 GitTest.start(ARGV)

data/lib/git_test.rb

@@ -24,13 +24,14 @@ class GitTest < Thor
       # find relevant tests
       [LHS,RHS].each do |side|
         tests = (row["#{side}_tested_by"].nil? ? [] : row["#{side}_tested_by"].split(","))
+        file = row[side]
         tests.each do |test|
-          coverage[side] << row[side]
+          coverage[side] << file
           if test_plan[test].nil?
-            test_plan[test] = {'cg' => 0, LHS => 0, RHS => 0}
+            test_plan[test] = {'cg' => 0, LHS => Set.new, RHS => Set.new}
           end
           test_plan[test]['cg'] += support
-          test_plan[test][side] += 1
+          test_plan[test][side] << file 
         end
       end
     end
@@ -48,8 +49,8 @@ class GitTest < Thor
     end
     # print testplan to stdout
     $stdout.puts "test,impact,#{LHS}_covered,#{RHS}_covered"
-    test_plan.sort_by {|k,v| [v[LHS],v[RHS]].max}.each do |test,v|
-      $stdout.puts "#{test},#{v['cg']},#{v[LHS]},#{v[RHS]}"
+    test_plan.sort_by {|k,v| [v[LHS].size,v[RHS].size].max}.each do |test,v|
+      $stdout.puts "#{test},#{v['cg']},#{v[LHS].size},#{v[RHS].size}"
     end
   end
 
@@ -59,6 +60,9 @@ class GitTest < Thor
   def join
     begin
       mapping = CSV.read(options[:mapping], headers: true, skip_lines: /#/)
+      mapping.each do |row|
+        row["pattern"] = Regexp.new(row["pattern"], Regexp::IGNORECASE)
+      end
     rescue CSV::MalformedCSVError, ArgumentError => e
       $stderr.puts "An error occured when parsing the mapping file '#{options[:mapping]}:\n #{e}"
       exit 1
@@ -71,29 +75,34 @@ class GitTest < Thor
       exit 1
     end
 
+    pattern_matched = Hash.new
 
     # print header
-    CSV {|r| r << %w(#{LHS} #{RHS} support #{LHS}_tested_by #{RHS}_tested_by)}
+    CSV {|r| r << %W(#{LHS} #{RHS} support #{LHS}_tested_by #{RHS}_tested_by)}
     change_rec.each do |row|
-      lhs = row['lhs']
-      rhs = row['rhs']
       support = row["support"].to_r.to_f
-      # find relevant tests
-      lhs_tests = []
-      rhs_tests = []
-      mapping.each do |mapping_row|
-        pattern = Regexp.new(mapping_row["pattern"], Regexp::IGNORECASE)
-        test = mapping_row["test"]
-        if lhs =~ pattern
-          lhs_tests << test
-        end
 
-        if rhs =~ pattern
-          rhs_tests << test
+      tests = {'lhs': Set.new, 'rhs': Set.new}
+
+      ['lhs','rhs'].each do |side|
+        file = row[side]
+        # check if the files has already been mapped
+        if pattern_matched[file].nil?
+          pattern_matched[file] = []
+          # iterate through mapping file to find matching tests
+          mapping.each do |mapping_row|
+            pattern = mapping_row["pattern"]
+            test = mapping_row["test"]
+            if file =~ pattern
+              pattern_matched[file] << test
+            end
+          end
         end
+        tests[side] = pattern_matched[file]
       end
+
       # print new row
-      CSV {|r| r << [lhs, rhs, support, (lhs_tests.empty? ? nil : lhs_tests.join(",")), (rhs_tests.empty? ? nil : rhs_tests.join(","))]}
+      CSV {|r| r << [row['lhs'], row['rhs'], support, (tests['lhs'].empty? ? nil : tests['lhs'].join(",")), (tests['rhs'].empty? ? nil : tests['rhs'].join(","))]}
     end                          
   end
 end

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Git
   module Recommend
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-recommend
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Thomas Rolfsnes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-13 00:00:00.000000000 Z
+date: 2017-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor