miss_cleo 0.3.7 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73711bb2ed13dcc0c37f04ae6aa67f6b2af3e793
-  data.tar.gz: 97ccdbbfd31a95325dc70fa45fb12c268a9ba3e1
+  metadata.gz: d918fe13d7cee5691d8fe6cc48589ebd9dd0fcbe
+  data.tar.gz: be479f4e751445144aec9b5d6f106795863cbff5
 SHA512:
-  metadata.gz: c81e1f9ba4dbbf4d3b3e68d2b6000158c2ff6851182b1b21dab42058746124abac9b09e10c35a32634425d9c07334f88e9084f35aa0a15e0c55a010092251f53
-  data.tar.gz: 996648338d022450dd25e11bd4266d0d51cd139beecd295b6a90ae4d98db9d308691cea5abad4d357c3d193ad813b7e3c53fb10d88a43ebee1a5bc6172e947ff
+  metadata.gz: 39a4f91fafa9685d0f8f2f8ec970b46d64310ba21e49a506a136de9464a616526ba0ab33d5ecd32eaa51be8dd4fd71c6bdc2daffb024bdb8978d575f73beab5f
+  data.tar.gz: 5c8f121ab1431fb0d823988443708c0423f4a9ec71117fb7505e47a2635663f25ce0e42847f2549d1f968b7d54f3222235f05877cf79c747c8981dfebc862ddb

data/bin/miss_cleo

@@ -12,7 +12,7 @@ when "predict"
     puts "e.g. 'miss_cleo predict map.json.gz"
   else
     map = File.open(ARGV[1]).read.gunzip
-    predict
+    predict(map)
   end
 else
   puts "Please run miss_cleo with 'build_deck' or 'predict'."

data/lib/miss_cleo/coverage_map.rb

@@ -0,0 +1,90 @@
+module MissCleo
+  class CoverageMap
+
+    attr_reader :map
+
+    def initialize(map = nil)
+      @map = map || Hash.new { |h, file| h[file] = Hash.new { |i, line| i[line] = [] } }
+    end
+
+    def add_to_coverage_map(test_diffs)
+      test_diffs.each do |test_to_code_map|
+        test_file_and_line = test_to_code_map.first
+        before = test_to_code_map.last["before"]
+        after = test_to_code_map.last["after"]
+        templates = test_to_code_map.last["templates"]
+
+        # calculate the per test coverage
+        delta = diff before, after
+        add_delta_to_map(delta, test_file_and_line)
+        add_templates_to_map(templates, test_file_and_line)
+      end
+
+      nil
+    end
+
+    def tests_for_lines(file, line)
+      begin
+        # NOTE: This is currently how templates and non-templates are being
+        # split. Since I will likely have to cover a bunch of blind spots
+        # manually like this, this probably needs to be rearchitected.
+        if file.include?("app/views")
+          map[file]["0"].uniq || []
+        else
+          map[file][line].uniq || []
+        end
+      rescue
+        []
+      end
+    end
+
+    private
+
+    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 add_delta_to_map(delta, test_file_and_line)
+      delta.each_pair do |file, lines|
+        file_map = 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
+
+    def add_templates_to_map(templates, test_file_and_line)
+      templates.each do |template|
+        # NOTE: Currently templates do not know how many lines of code they
+        # are. I have temporarily decided to shove them into the 0 line
+        # to make them a special case. This will probably require
+        # re-architecting
+        map[template][0] << test_file_and_line
+      end
+
+    end
+  end
+end

data/lib/miss_cleo/coverage_map_helper.rb

@@ -1,61 +1,38 @@
 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|
+    def build_deck(file_names)
+      cov_map = ::MissCleo::CoverageMap.new
+      file_names.each do |file_name|
+        File.open(file_name, "r") do |f|
           f.read
         end.tap do |contents|
           begin
-            build_coverage_map(cov_map, JSON.parse(contents))
+            cov_map.add_to_coverage_map(JSON.parse(contents))
           rescue
-            puts "#{filename} is malformed, this may affect test predictons"
+            puts "#{file_name} is malformed, this may affect test predictons"
           end
         end
       end
 
       File.open("total_coverage_map.json.gz", "w") do |f|
-        f.write(JSON.dump(cov_map).gzip)
+        f.write(JSON.dump(cov_map.map).gzip)
       end
     end
 
     def predict(unzipped_file)
-      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(unzipped_file)
+      coverage_map = ::MissCleo::CoverageMap.new(JSON.parse(unzipped_file))
       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
+        tests_to_run |= coverage_map.tests_for_lines(file, line)
       end
-      tests_to_run = tests_to_run.uniq.sort.reverse
       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
+        puts tests_to_run.sort.reverse
       end
 
       tests_to_run
@@ -69,51 +46,27 @@ module MissCleo
       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
+    def lines_changed
+      @_lines_changed ||= Set.new.tap do |changed_lines|
+        repo = Rugged::Repository.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
+                changed_lines << [file, line.new_lineno] unless exclude_from_map?(file)
+              when :deletion
+                changed_lines << [file, line.old_lineno] unless exclude_from_map?(file)
+              when :context
+                # do nothing
+              end
+            end
           end
         end
 
-        # add the "diffed" coverage to the hash
-        res[file_name] = cov
       end
     end
   end

data/lib/miss_cleo/template_helper.rb

@@ -0,0 +1,22 @@
+module MissCleo
+  module TemplateHelper
+    module_function
+
+    def template_coverage
+      @template_coverage ||= []
+    end
+
+    def add_to_template_coverage(template)
+      template_coverage << trim_path(template)
+    end
+
+    def reset_coverage
+      template_coverage = []
+    end
+
+    def trim_path(path)
+      path.gsub(/#{Regexp.quote(`pwd`.chomp)}\//, "")
+    end
+
+  end
+end

data/lib/miss_cleo/test_configurations/action_view_hook.rb

@@ -0,0 +1,11 @@
+module MissCleo
+  module TestConfigurations
+    module ActionViewHook
+      module_function
+
+      def record_template(template)
+        MissCleo::TemplateHelper.add_to_template_coverage(template)
+      end
+    end
+  end
+end

data/lib/miss_cleo/test_configurations/cucumber_config.rb

@@ -8,11 +8,13 @@ module MissCleo
         if ENV["COVERAGE"]
           Coverage.start
           context.Around do |scenario, execute|
+            MissCleo::TemplateHelper.reset_coverage
             before = Coverage.peek_result
             execute.call
             after = Coverage.peek_result
+            templates = MissCleo::TemplateHelper.template_coverage
             if file_and_line = scenario.try(:file_colon_line)
-              LOGS << [ file_and_line, CoverageFilter.filter_and_trim(before), CoverageFilter.filter_and_trim(after) ]
+              LOGS << [ file_and_line, { before: CoverageFilter.filter_and_trim(before), after: CoverageFilter.filter_and_trim(after), templates: templates } ]
             end
           end
 

data/lib/miss_cleo/test_configurations/rails_action_view_config.rb

@@ -0,0 +1,10 @@
+module MissCleo
+  module TestConfigurations
+    module ActionViewConfig
+      def render(*args)
+        MissCleo::TestConfigurations::ActionViewHook.record_template(identifier)
+        super(*args)
+      end
+    end
+  end
+end

data/lib/miss_cleo/test_configurations/rspec_config.rb

@@ -12,11 +12,16 @@ module MissCleo
           end
 
           RSpec.configuration.around(:example) do |example|
+            MissCleo::TemplateHelper.reset_coverage
             before = Coverage.peek_result
             example.call
             after = Coverage.peek_result
-            LOGS << [ example.location, CoverageFilter.filter_and_trim(before),
-                      CoverageFilter.filter_and_trim(after) ]
+            templates = MissCleo::TemplateHelper.template_coverage
+            LOGS << [ example.location, {
+              before: CoverageFilter.filter_and_trim(before),
+              after: CoverageFilter.filter_and_trim(after),
+              templates: templates
+            } ]
           end
         end
       end

data/lib/miss_cleo/version.rb

@@ -1,3 +1,3 @@
 module MissCleo
-  VERSION = "0.3.7"
+  VERSION = "0.4.0"
 end

data/lib/miss_cleo.rb

@@ -8,9 +8,13 @@ require 'gzip'
 
 require "miss_cleo/version"
 require 'miss_cleo/coverage_filter'
+require 'miss_cleo/coverage_map'
 require 'miss_cleo/test_configurations/cucumber_config'
 require 'miss_cleo/test_configurations/rspec_config'
 require 'miss_cleo/coverage_map_helper.rb'
+require 'miss_cleo/test_configurations/action_view_hook'
+require 'miss_cleo/test_configurations/rails_action_view_config'
+require 'miss_cleo/template_helper'
 
 module MissCleo
 end

data/miss_cleo.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Dean Hu", "Lee Ourand", "John Bernier"]
   spec.email         = ["devs@gust.com"]
 
-  spec.summary       = %q{Predict your test failures}
+  spec.summary       = %q{Regression Test Selection}
   spec.description   = %q{Miss Cleo frees you from having to run your full test suite to be confident in your recent code changes. Call me now!}
   spec.homepage      = "http://github.com/gust/miss_cleo"
   spec.license       = "MIT"
@@ -18,8 +18,9 @@ Gem::Specification.new do |spec|
   spec.executables   = ["miss_cleo"]
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.8"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_runtime_dependency "rugged"
-  spec.add_runtime_dependency "gzip"
+  spec.add_development_dependency "bundler", "~> 1.7.6"
+  spec.add_development_dependency "rake", "~> 10.5.0"
+  spec.add_development_dependency "pry", "~> 0.9.12"
+  spec.add_runtime_dependency "rugged", "~> 0.23.3"
+  spec.add_runtime_dependency "gzip", "~> 1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: miss_cleo
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.0
 platform: ruby
 authors:
 - Dean Hu
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-25 00:00:00.000000000 Z
+date: 2016-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -18,56 +18,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 1.7.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 1.7.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 10.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 10.5.0
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.12
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.12
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.23.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.23.3
 - !ruby/object:Gem::Dependency
   name: gzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 description: Miss Cleo frees you from having to run your full test suite to be confident
   in your recent code changes. Call me now!
 email:
@@ -90,8 +104,12 @@ files:
 - bin/setup
 - lib/miss_cleo.rb
 - lib/miss_cleo/coverage_filter.rb
+- lib/miss_cleo/coverage_map.rb
 - lib/miss_cleo/coverage_map_helper.rb
+- lib/miss_cleo/template_helper.rb
+- lib/miss_cleo/test_configurations/action_view_hook.rb
 - lib/miss_cleo/test_configurations/cucumber_config.rb
+- lib/miss_cleo/test_configurations/rails_action_view_config.rb
 - lib/miss_cleo/test_configurations/rspec_config.rb
 - lib/miss_cleo/version.rb
 - miss_cleo.gemspec
@@ -115,9 +133,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Predict your test failures
+summary: Regression Test Selection
 test_files: []
 has_rdoc: