test_diff 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c60bbb0ba468e66251ee6a5bc4640eb868daa0a2e19585e5f2036bd1867672b
-  data.tar.gz: 0abaa8178186abec9c3755195341db54c22e5787688c984659ed88c29d87b164
+  metadata.gz: ad2a0134d2a5f656ec7039d12ec01bd1684afb91e7bf0f67ef62a2396c7285df
+  data.tar.gz: e0627266c8e8e0ca9909e1fffd45ffeed387f40fb99656d33c0954106ae1f356
 SHA512:
-  metadata.gz: 9c268a1b15442b9df3c232a61d0220933e4831339b58e2194f88c4e878a976918be806f2490ef6880ab7d20bd71ee09b66cd5d7fd9b51bccc56b919c4e9f9f88
-  data.tar.gz: b7b5bb54b2c7870fdaeca86cd6eb04db8e871872ab3d782a9c82669f0e4529b3c4cd0a7251e48d96da4d9521f9b596c3a76315ccdd2d0fcaa8d1005e8f9d81bf
+  metadata.gz: 61bb314ad64fb1659a2c4ddfd468b6017837f87688444b298efb5bb74d0b25b5ebb824260592a9eaa68f19b3043344c12eddd22af79765354cbdadb9bf9715b6
+  data.tar.gz: eea506cdb23716104ab4e0302b4a88ca9bd07c2d5ba8131b2053e4e18e7b2b8c4c1036ff3d8f875fe1a315986239f88d50d80362027390a0464ff545e2643a8a

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]

data/lib/test_diff/coverage_data.rb

@@ -0,0 +1,16 @@
+module TestDiff
+  # runs each spec and saves it to storage
+  module CoverageData
+    def self.get(result = ::Coverage.result)
+      data = {}
+      result.each do |file_name, stats|
+        relative_file_name = file_name.gsub("#{FileUtils.pwd}/", '')
+        is_active = stats.map(&:to_i).any?(&:nonzero?)
+        if file_name.start_with?(FileUtils.pwd) && is_active
+          data[relative_file_name] = stats.join(',')
+        end
+      end
+      data
+    end
+  end
+end

data/lib/test_diff/coverage_runner.rb

@@ -1,3 +1,6 @@
+require 'test_diff/coverage_data'
+require 'test_diff/execution_times'
+
 module TestDiff
   # runs each spec and saves it to storage
   class CoverageRunner
@@ -10,11 +13,12 @@ module TestDiff
       @batch_queue = batch_queue
       @storage = Storage.new
       @continue = continue
+      @execution_times = ExecutionTimes.new
+      @execution_times.clear
     end
 
     def run
       require 'coverage.so'
-      Coverage.start
 
       ENV['TEST_DIFF_COVERAGE'] = 'yes'
 
@@ -40,6 +44,7 @@ module TestDiff
 
     def require_pre_load
       return unless @pre_load
+      ::Coverage.start
       puts "pre_loading #{@pre_load}"
       $LOAD_PATH << "#{Dir.getwd}/spec"
       require File.expand_path(@pre_load)
@@ -66,7 +71,6 @@ module TestDiff
         _pid, status = Process.waitpid2(pid)
         raise 'Test Failed' unless status.success?
       end
-      Coverage.result # disable coverage
     end
 
     def start_process_fork(main_spec_file)
@@ -74,6 +78,7 @@ module TestDiff
         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?
+        ::Coverage.start
         run_test(main_spec_file)
       end
     end
@@ -82,7 +87,8 @@ module TestDiff
       s = Time.now
       result = run_tests(main_spec_file)
       if result
-        save_coverage_data(main_spec_file, Time.now - s)
+        save_execution_time(main_spec_file, Time.now - s)
+        save_coverage_data(main_spec_file)
       else
         $stderr.puts(@last_output.string)
         Coverage.result # disable coverage
@@ -95,16 +101,13 @@ module TestDiff
       ::RSpec::Core::Runner.run([main_spec_file], @last_output, @last_output).zero?
     end
 
-    def save_coverage_data(main_spec_file, execution_time)
-      data = { '__execution_time__' => execution_time }
-      Coverage.result.each do |file_name, stats|
-        relative_file_name = file_name.gsub("#{FileUtils.pwd}/", '')
-        if file_name.start_with?(FileUtils.pwd)
-          data[relative_file_name] = stats.join(',')
-        end
-      end
-      @storage.set(main_spec_file, data)
+    def save_coverage_data(main_spec_file)
+      @storage.set(main_spec_file, CoverageData.get)
       @storage.flush if @storage.respond_to?(:flush)
     end
+
+    def save_execution_time(main_spec_file, execution_time)
+      @execution_times.add(main_spec_file, execution_time)
+    end
   end
 end

data/lib/test_diff/execution_times.rb

@@ -0,0 +1,49 @@
+require 'test_diff/logging'
+
+module TestDiff
+  # runs each spec and saves it to storage
+  class ExecutionTimes
+    include Logging
+
+    def initialize(directory = 'test_diff_coverage', filename = 'execution_times.txt')
+      @file_name = "#{directory}/#{filename}"
+    end
+
+    def clear
+      return unless file_exist?
+      log_debug "Deleting #{@file_name}"
+      File.delete(@file_name)
+      reset_times
+    end
+
+    def add(main_spec_file, execution_time)
+      File.open(@file_name, 'a+') do |file|
+        file.write "#{main_spec_file}:#{execution_time}\n"
+      end
+      reset_times
+    end
+
+    def get(file)
+      time = times[file]
+      return nil if time.nil?
+      time.to_i
+    end
+
+    alias [] :get
+
+    private
+
+    def times
+      return {} unless file_exist?
+      @times ||= Hash[File.readlines(@file_name).map(&:chomp).map { |line| line.split(':') }]
+    end
+
+    def reset_times
+      @times = nil
+    end
+
+    def file_exist?
+      File.exist?(@file_name)
+    end
+  end
+end

data/lib/test_diff/storage.rb

@@ -5,8 +5,23 @@ module TestDiff
   class Storage
     attr_reader :folder
 
-    def initialize(folder = 'test_diff_coverage')
+    def initialize(folder = 'test_diff_coverage',
+                   execution_times = ExecutionTimes.new('test_diff_coverage'))
       @folder = folder
+      @execution_times = execution_times
+      @preload_name = '_preload_'
+    end
+
+    def preload=(coverage_data)
+      raise 'Data must be a Hash' unless coverage_data.is_a?(Hash)
+      get_store(@preload_name).transaction do |store|
+        store.roots.each do |key|
+          store.delete(key)
+        end
+        coverage_data.keys.sort.each do |key|
+          store[key] = coverage_data[key]
+        end
+      end
     end
 
     def set(file, coverage_data)
@@ -33,9 +48,7 @@ module TestDiff
 
     def find_for(files, sub_folder = nil)
       results = []
-      root_folder = @folder
-      root_folder += "/#{sub_folder}" if sub_folder
-      Dir["#{root_folder}/**/*.yml"].each do |storage_file|
+      each_file(sub_folder) do |storage_file|
         find_for_storage_file(results, storage_file, files)
       end
       results
@@ -43,23 +56,18 @@ module TestDiff
 
     def select_tests_for(files, sub_folder = nil)
       results = []
-      root_folder = @folder
-      root_folder += "/#{sub_folder}" if sub_folder
-      Dir["#{root_folder}/**/*.yml"].each do |storage_file|
-        select_tests_for_storage_file(results, storage_file, files)
+      preload_files = preload_found_files(files)
+      each_file(sub_folder) do |storage_file|
+        next if storage_file.include?(@preload_name)
+        if preload_files.any? || found_files(storage_file, files).any?
+          results << TestInfo.new(storage_file, @execution_times[storage_file])
+        end
       end
       results
     end
 
     def test_info_for(file)
-      result = TestInfo.new(file, nil)
-      YAML::Store.new("#{file}.yml").transaction(true) do |store|
-        result = TestInfo.new(file, store['__execution_time__'])
-      end
-      result
-    rescue PStore::Error => e
-      STDERR.puts e.message
-      result
+      TestInfo.new(file, @execution_times[file])
     end
 
     def clear
@@ -70,32 +78,25 @@ module TestDiff
 
     private
 
-    def find_for_storage_file(results, storage_file, files)
-      YAML::Store.new(storage_file).transaction(true) do |store|
-        found_files = files & store.roots
-        found_files.each do |file|
-          if _active_file?(store[file])
-            results << storage_file.gsub('.yml', '').gsub("#{@folder}/", '')
-          end
-        end
+    def found_files(storage_file, files)
+      get_store(storage_file).transaction(true) do |store|
+        files & store.roots
       end
     end
 
-    def select_tests_for_storage_file(results, storage_file, files)
-      YAML::Store.new(storage_file).transaction(true) do |store|
-        found_files = files & store.roots
-        found_files.each do |file|
-          next unless _active_file?(store[file])
-          results << TestInfo.new(
-            storage_file.gsub('.yml', '').gsub("#{@folder}/", ''),
-            store['__execution_time__']
-          )
-        end
+    def preload_found_files(files)
+      get_store(@preload_name).transaction(true) do |store|
+        files & store.roots
       end
     end
 
-    def _active_file?(file)
-      !file.to_s.split(',').delete_if { |s| s == '' || s == '0' }.empty?
+    def find_for_storage_file(results, storage_file, files)
+      get_store(storage_file).transaction(true) do |store|
+        found_files = files & store.roots
+        found_files.each do |_file|
+          results << storage_file.gsub('.yml', '').gsub("#{@folder}/", '')
+        end
+      end
     end
 
     def get_store(file)
@@ -104,5 +105,13 @@ module TestDiff
       FileUtils.mkdir_p(dir)
       YAML::Store.new "#{dir}/#{filename}"
     end
+
+    def each_file(sub_folder = nil)
+      root_folder = @folder
+      root_folder += "/#{sub_folder}" if sub_folder
+      Dir["#{root_folder}/**/*.yml"].sort.each do |full_storage_file|
+        yield full_storage_file.gsub("#{@folder}/", '').gsub('.yml', '')
+      end
+    end
   end
 end

data/lib/test_diff/version.rb

@@ -1,4 +1,4 @@
 # version number
 module TestDiff
-  VERSION = '0.5.0'.freeze
+  VERSION = '0.6.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test_diff
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Grant Speelman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-17 00:00:00.000000000 Z
+date: 2019-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -93,6 +93,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -105,7 +106,9 @@ files:
 - lib/test_diff/build_coverage.rb
 - lib/test_diff/build_coverage_diff.rb
 - lib/test_diff/config.rb
+- lib/test_diff/coverage_data.rb
 - lib/test_diff/coverage_runner.rb
+- lib/test_diff/execution_times.rb
 - lib/test_diff/logging.rb
 - lib/test_diff/run_diff.rb
 - lib/test_diff/runable_tests.rb
@@ -138,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Gem that attempts to find the tests that are required to run for the changes