miss_cleo 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca0559ed443b3ea335c68d740f9968bf08280993
-  data.tar.gz: db76dd62cdada7d6da85c8f8c45799c4773515ef
+  metadata.gz: f65320c1042c0c225a420c0a71a9bb176146c2ea
+  data.tar.gz: 9bee07706949fbf2529d07eee3407fe2559039a7
 SHA512:
-  metadata.gz: 6b2573361d83d35b2220c8cdd7c95c5a520156f69378e592fb58c76a49a1829571ba3808fbeb97466a35b96f82f189cf92bbdf59c6d8e2c36a601b5e31ed7904
-  data.tar.gz: a703da817837bedc711e7b58d0204ec6c128ff27452d52afd562b0332f20911327e5698670f7435ea16dc1f0693d61c2992f15dc9382dc23b4dc4f8db93105da
+  metadata.gz: 16a9d3f6c1820e6f8473a947979950177193afdfc7d195212c6275b532e50e90f75e91ea165820b26cbad6594752cacbff67c4638f211e6490190f6dfad0de0f
+  data.tar.gz: c2b1726859d10f06bc6fdb36a12dab107eba1ad7c4d6347cf22aa15d803188a9ed17ba038f2fd04c7b1303be3bea59b9bb2cabd5cb5f358977e8e2d6d1b9831e

data/bin/miss_cleo

@@ -2,112 +2,14 @@
 
 require "miss_cleo"
 require 'pry'
+include MissCleo::CoverageMapHelper
 
 case ARGV.first
 when "build_deck"
-  filenames = ARGV[1..-1]
-  cov_map = Hash.new { |h, file| h[file] = Hash.new { |i, line| i[line] = [] } }
-  filenames.each do |filename|
-    File.open(filename, "r") do |f|
-      f.read
-    end.tap do |contents|
-      build_coverage_map(cov_map, JSON.parse(contents))
-    end
-  end
-
-  File.open("total_coverage_map.json", "w") do |f|
-    f.write(JSON.dump(cov_map))
-  end
+  build_deck(ARGV[1..-1])
 when "predict"
-  repo = Rugged::Repository.new '.'
-  lines_changed = Set.new
-
-  repo.index.diff.each_patch do |patch|
-    file = patch.delta.old_file[:path]
-
-    patch.each_hunk do |hunk|
-      hunk.each_line do |line|
-        case line.line_origin
-        when :addition
-          lines_changed << [file, line.new_lineno] unless exclude_from_map?(file)
-        when :deletion
-          lines_changed << [file, line.old_lineno] unless exclude_from_map?(file)
-        when :context
-          # do nothing
-        end
-      end
-    end
-  end
-
-  coverage_map = JSON.parse(File.open("total_coverage_map.json").read)
-  tests_to_run = []
-  lines_changed.each do |file, line|
-    coverage_map && coverage_map[File.expand_path(file)] && coverage_map[File.expand_path(file)].fetch(line.to_s, []).uniq.each do |desc|
-      tests_to_run << desc
-    end
-  end
-  if lines_changed.empty?
-    puts "No line changes detected."
-  elsif tests_to_run.empty?
-    puts "No tests found. May be due to blind spot, new tests you've just written, or the changes may be untested."
-  else
-    puts "Run these tests:"
-    puts tests_to_run.uniq.sort
-  end
+  predict
 else
   puts "Please run miss_cleo with 'build_deck' or 'predict'."
 end
 
-def exclude_from_map?(file_name)
-  # Let's add a configuration for ignored files
-  file_name == "db/structure.sql"
-end
-
-def diff before, after
-  after.each_with_object({}) do |(file_name,line_cov), res|
-    before_line_cov = before[file_name] || []
-
-    # skip arrays that are exactly the same
-    next if before_line_cov == line_cov
-
-    # subtract the old coverage from the new coverage
-    cov = line_cov.zip(before_line_cov).map do |line_after, line_before|
-      if line_before
-        line_after - line_before
-      else
-        line_after
-      end
-    end
-
-    # add the "diffed" coverage to the hash
-    res[file_name] = cov
-  end
-end
-
-def build_coverage_map(cov_map, cov_diffs)
-  cov_diffs.each do |test_to_code_map|
-    if test_to_code_map.length == 4 # for Minitest
-      test_file_and_line = test_to_code_map.first(2).join('#')
-    else                # for RSpec
-      test_file_and_line = test_to_code_map.first
-    end
-    before, after = test_to_code_map.last(2)
-
-    # calculate the per test coverage
-    delta = diff before, after
-
-    delta.each_pair do |file, lines|
-      file_map = cov_map[file]
-
-      lines.each_with_index do |val, i|
-        # skip lines that weren't executed
-        next unless val && val > 0
-
-        # add the test name to the map. Multiple tests can execute the same
-        # line, so we need to use an array.
-        file_map[i + 1] << test_file_and_line
-      end
-    end
-  end
-end
-

data/lib/miss_cleo/coverage_filter.rb

@@ -14,7 +14,7 @@ module MissCleo
     def self.normalize_paths(result_hash)
       normalized_hash = Hash.new
       result_hash.each do |key, value|
-        trimmed_key = key.gsub(/#{Regexp.quote(`pwd`.chomp)}/, "")
+        trimmed_key = key.gsub(/#{Regexp.quote(`pwd`.chomp)}\//, "")
         normalized_hash[trimmed_key] = value
       end
 

data/lib/miss_cleo/coverage_map_helper.rb

@@ -0,0 +1,117 @@
+module MissCleo
+  module CoverageMapHelper
+
+    def build_deck(filenames)
+      cov_map = Hash.new { |h, file| h[file] = Hash.new { |i, line| i[line] = [] } }
+      filenames.each do |filename|
+        File.open(filename, "r") do |f|
+          f.read
+        end.tap do |contents|
+          begin
+            build_coverage_map(cov_map, JSON.parse(contents))
+          rescue
+            puts "#{filename} is malformed, this may affect test predictons"
+          end
+        end
+      end
+
+      File.open("total_coverage_map.json", "w") do |f|
+        f.write(JSON.dump(cov_map))
+      end
+    end
+
+    def predict
+      repo = Rugged::Repository.new '.'
+      lines_changed = Set.new
+
+      repo.index.diff.each_patch do |patch|
+        file = patch.delta.old_file[:path]
+
+        patch.each_hunk do |hunk|
+          hunk.each_line do |line|
+            case line.line_origin
+            when :addition
+              lines_changed << [file, line.new_lineno] unless exclude_from_map?(file)
+            when :deletion
+              lines_changed << [file, line.old_lineno] unless exclude_from_map?(file)
+            when :context
+              # do nothing
+            end
+          end
+        end
+      end
+
+      coverage_map = JSON.parse(File.open("total_coverage_map.json").read)
+      tests_to_run = []
+      lines_changed.each do |file, line|
+        coverage_map && coverage_map[file] && coverage_map[file].fetch(line.to_s, []).uniq.each do |desc|
+          tests_to_run << desc
+        end
+      end
+      if lines_changed.empty?
+        puts "No line changes detected."
+      elsif tests_to_run.empty?
+        puts "No tests found. May be due to blind spot, new tests you've just written, or the changes may be untested."
+      else
+        puts "Run these tests:"
+        puts tests_to_run.uniq.sort
+      end
+    end
+
+
+    private
+
+    def exclude_from_map?(file_name)
+      # Let's add a configuration for ignored files
+      file_name == "db/structure.sql"
+    end
+
+    def build_coverage_map(cov_map, cov_diffs)
+      cov_diffs.each do |test_to_code_map|
+        if test_to_code_map.length == 4 # for Minitest
+          test_file_and_line = test_to_code_map.first(2).join('#')
+        else                # for RSpec
+          test_file_and_line = test_to_code_map.first
+        end
+        before, after = test_to_code_map.last(2)
+
+        # calculate the per test coverage
+        delta = diff before, after
+
+        delta.each_pair do |file, lines|
+          file_map = cov_map[file]
+
+          lines.each_with_index do |val, i|
+            # skip lines that weren't executed
+            next unless val && val > 0
+
+            # add the test name to the map. Multiple tests can execute the same
+            # line, so we need to use an array.
+            file_map[i + 1] << test_file_and_line
+          end
+        end
+      end
+    end
+
+    def diff before, after
+      after.each_with_object({}) do |(file_name,line_cov), res|
+        before_line_cov = before[file_name] || []
+
+        # skip arrays that are exactly the same
+        next if before_line_cov == line_cov
+
+        # subtract the old coverage from the new coverage
+        cov = line_cov.zip(before_line_cov).map do |line_after, line_before|
+          if line_before
+            line_after - line_before
+          else
+            line_after
+          end
+        end
+
+        # add the "diffed" coverage to the hash
+        res[file_name] = cov
+      end
+    end
+  end
+end

data/lib/miss_cleo/version.rb

@@ -1,3 +1,3 @@
 module MissCleo
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: miss_cleo
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Dean Hu
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -62,6 +62,7 @@ files:
 - bin/setup
 - lib/miss_cleo.rb
 - lib/miss_cleo/coverage_filter.rb
+- lib/miss_cleo/coverage_map_helper.rb
 - lib/miss_cleo/test_configurations/cucumber_config.rb
 - lib/miss_cleo/test_configurations/rspec_config.rb
 - lib/miss_cleo/version.rb