test_diff 0.1.2 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWVkMDZlMTVhZWIwMDYzMjk1ZTM1MTc4N2ZlMDQwZjFlZWM4Mzc3Nw==
+    MDg5NWQ4MmE3YzUzOGNlZDIwYjdkYTI3YzczNjJhM2VhNmE4NWM2MA==
   data.tar.gz: !binary |-
-    ZTAzOGEwOTNkNTRjZGYwM2Q4YTZhODdjN2I4ZGQ1Y2QyZDJkZThkOA==
+    MzJjODhhYjg5MmQ0NzNlMzcwNjA1NDE2MWVmYTY1NWE4ZTVmODNhNQ==
 SHA512:
   metadata.gz: !binary |-
-    ZTEyNzk0OTBkZjRkNGIxM2ExOTM2YzRlZmZlZDZlY2NmZmIzNzIyOTFlZmEw
-    ODUxZTdjYzhlOGJjZGQ2ZDNmZWE3Y2VmNjI5ZjViZmExZWQ1OTM1OGQ5YjI4
-    OTljNjRmZWVkN2FjYTVlMWEzZGNjNjcyODlkODMyZGE4MjNjMGY=
+    NGI0MjdlYjVhZWM2NjQ4ZTk5MmI4OGRiMzllOWY5Y2RhZGQ0YzFhY2UzYmMy
+    OTU0MzA3OWZjNzk3NWUwOGY1MjE3ZTYxYmMyMmQwNDU4YjcyMTE0OTI0ZWUz
+    OGVhOGQ4ZTBlZjE4OGEzZmQ5MzJmYWNjMTdiNmRmNjVjOTA1ZjQ=
   data.tar.gz: !binary |-
-    NGFhYzA4MjU2MmZkZjAyZGFlYWUwZDNlYTY0YmRhNjMwNzExNGRjZmU0Y2M3
-    NTlmOWE1MzMyYjM3NjM0OGZiNTQ0NWEyMzg2NDRhNTdiMDFmOGJiMzRlN2I4
-    NWMxZmNiNjI4MzgyOTg3OWY4NGU5ZDU3MzBlMjMwZDdjN2VkYWQ=
+    OTM0M2EzZmZjZjVlOTk1NTI1NTlkNTdmODA0MjlkYjQyNTQ1MDgxYTI0ODRk
+    OTA5ZmMyNTY0NGYyNmE4Mjk0MGY3NzM1ZWEzODJlZTc5YmExYzBmMWY2NzVm
+    MzlmYWNiYzNhODU4MTQwZTBhNWRjMzZjNjg3OGZmNGIwYzE5NTQ=

data/exe/test_diff

@@ -20,6 +20,11 @@ class TestDiffBuilder < Thor
   def run_spec_diff(spec_folder = 'spec', groups_of = nil, group = '0')
     TestDiff::RunDiff.new(spec_folder, groups_of, group).run
   end
+
+  desc 'build_coverage_diff spec master', 'runs the specs difference between the branches'
+  def build_coverage_diff(spec_folder = 'spec', pre_load = nil, continue = nil)
+    TestDiff::BuildCoverageDiff.new(spec_folder, pre_load, continue).run
+  end
 end
 
 TestDiffBuilder.start(ARGV)

data/lib/test_diff/build_coverage_diff.rb

@@ -0,0 +1,152 @@
+# TestDiff module
+module TestDiff
+  # class used to build the coverage file
+  class BuildCoverageDiff
+    attr_reader :spec_folder, :pre_load, :sha1
+
+    def initialize(spec_folder, pre_load, continue)
+      @spec_folder = spec_folder
+      @sha1 = File.read('test_diff_coverage/sha')
+      @specs_to_run = []
+      @storage = Storage.new
+      @pre_load = pre_load
+      @continue = continue
+    end
+
+    def run
+      add_changed_files
+      remove_tests_that_do_not_exist
+      remove_tests_in_wrong_folder
+      require 'coverage.so'
+      Coverage.start
+      require_pre_load
+      run_batch
+    end
+
+    private
+
+    def require_pre_load
+      return unless pre_load
+      puts "pre_loading #{pre_load}"
+      require File.expand_path(pre_load)
+    end
+
+    def run_batch
+      puts "Running #{@specs_to_run.size} tests"
+      require 'spec'
+      timing_thread = start_timing_thread(Time.now, @specs_to_run.size)
+      start
+      timing_thread.join
+      puts 'Test done, compacting db'
+      @storage.compact if @storage.respond_to?(:compact)
+    end
+
+    def start_timing_thread(start_time, original_size)
+      Thread.new do
+        until @specs_to_run.empty?
+          last_size = @specs_to_run.size
+          completed = original_size - last_size
+          if completed > 0
+            time_per_spec = (Time.now - start_time).to_f / completed.to_f
+            est_time_left = time_per_spec * last_size
+            puts "specs left #{last_size}, est time_left: #{est_time_left.to_i}"
+          end
+          sleep(60)
+        end
+      end
+    end
+
+    def start
+      until @specs_to_run.empty?
+        pid = start_process_fork(@specs_to_run.pop)
+        pid, status =  Process.waitpid2(pid)
+        fail 'Test Failed' unless status.success?
+      end
+      Coverage.result # disable coverage
+    end
+
+    def start_process_fork(main_spec_file)
+      Process.fork do
+        puts "running #{main_spec_file}"
+        ActiveRecord::Base.connection.reconnect! if defined?(ActiveRecord::Base)
+        Time.zone_default = (Time.zone = 'UTC') if Time.respond_to?(:zone_default) && Time.zone_default.nil?
+        # ARGV = ['-b',main_spec_file]
+        if run_tests(main_spec_file)
+          save_coverage_data(main_spec_file)
+        else
+          Coverage.result # disable coverage
+          exit!(false) unless @continue
+        end
+        # ::Spec::Runner::CommandLine.run(options)
+      end
+    end
+
+    def run_tests(main_spec_file)
+      options ||= begin
+        parser = ::Spec::Runner::OptionParser.new($stderr, $stdout)
+        parser.order!(['-b', main_spec_file])
+        parser.options
+      end
+      Spec::Runner.use options
+      options.run_examples
+    end
+
+    def save_coverage_data(main_spec_file)
+      data = {}
+      Coverage.result.each do |file_name, stats|
+        relative_file_name = file_name.gsub("#{FileUtils.pwd}/", '')
+        if file_name.include?(FileUtils.pwd)
+          data[relative_file_name] = stats.join(',')
+        end
+      end
+      YAML::ENGINE.yamler = 'psych'
+      @storage.set(main_spec_file, data)
+      @storage.flush if @storage.respond_to?(:flush)
+    end
+
+    def remove_tests_that_do_not_exist
+      @specs_to_run.delete_if do |s|
+        !File.exist?(s)
+      end
+    end
+
+    def remove_tests_in_wrong_folder
+      @specs_to_run.delete_if do |s|
+        !s.start_with?("#{spec_folder}/")
+      end
+    end
+
+    def add_changed_files
+      _build_specs_to_run
+
+      @specs_to_run.flatten!
+      @specs_to_run.sort!
+      @specs_to_run.uniq!
+    end
+
+    def _build_specs_to_run
+      files = []
+      `git diff --name-only #{sha1} HEAD`.split("\n").each do |file_name|
+        if file_name.end_with?('spec.rb') || file_name.end_with?('test.rb')
+          @specs_to_run << file_name
+        elsif !file_name.start_with?(@storage.folder)
+          files << file_name
+          _add_rails_view_spec(file_name)
+        end
+      end
+      _add_calculated_tests(files)
+    end
+
+    def _add_calculated_tests(files)
+      @specs_to_run << @storage.find_for(files, spec_folder)
+    end
+
+    def _add_rails_view_spec(file_name)
+      # try and find a matching view spec
+      return unless file_name.include?('app/views')
+      view_spec_name = file_name.gsub('app/views', "#{spec_folder}/views").gsub('.erb', '.erb_spec.rb')
+      return unless  File.exist?(view_spec_name)
+      @specs_to_run << view_spec_name
+    end
+  end
+end

data/lib/test_diff/run_diff.rb

@@ -35,7 +35,7 @@ module TestDiff
     def select_test_group
       return unless groups_of
       groups_size = (@specs_to_run.length / groups_of.to_f).ceil
-      @specs_to_run = @specs_to_run.slice(group.to_i * groups_size, groups_size)
+      @specs_to_run = @specs_to_run.slice(group.to_i * groups_size, groups_size) || []
     end
 
     def remove_tests_that_do_not_exist

data/lib/test_diff/version.rb

@@ -1,4 +1,4 @@
 # version number
 module TestDiff
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

data/lib/test_diff.rb

@@ -2,6 +2,7 @@ require 'test_diff/version'
 require 'test_diff/storage'
 require 'test_diff/build_coverage'
 require 'test_diff/run_diff'
+require 'test_diff/build_coverage_diff'
 require 'test_diff/track_build'
 
 # main module

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test_diff
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Grant Speelman
@@ -130,6 +130,7 @@ files:
 - exe/test_diff
 - lib/test_diff.rb
 - lib/test_diff/build_coverage.rb
+- lib/test_diff/build_coverage_diff.rb
 - lib/test_diff/run_diff.rb
 - lib/test_diff/storage.rb
 - lib/test_diff/track_build.rb