test_diff 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjhjNGZlMzgzODhmN2M0ZjMxZTg5NWM5YTEyMGE4ZTMxOTZhMGQzMg==
+    YzM0ZGZjYzBmMWNhMDI0YzhlNTQ5ZDFhODkxYWI4ZDgzY2EzOTViNg==
   data.tar.gz: !binary |-
-    NTU0N2FmM2VlOTZiOGU3MWRlMGZjZjU3YmE3YzJiZmQ3MjY4YmZhNw==
+    ODllMWE5OTg2MjIyZTk5MmNiOTZlYzZkNjMzNTRkMmMwMDYyMmUzYg==
 SHA512:
   metadata.gz: !binary |-
-    OWZmMTEzMDdmNzcxN2UzOTc2YzdlMDg1MjdmNzVjMDFmNWQwOTg2MjA5MDJm
-    ZTA2MTFiNDk2MWZkZTNlZWVjMGVmNjFkODhlYjgwNGI5OGY0OTQwOTNjNGU2
-    M2RkMjExODFhOWU4M2IxYTgzYTk1NTY0OWJmYTcxMTdhZGRjNmE=
+    ZjMzOTBiOWMzOWQ5MDA5ZGFmNTM5M2ZkNzFiZGJjMjA2Y2FlOTk1YmVkNzAy
+    YzFkZjFkZDU3YmU3NDljMzVkNjNkOTA5NjViNjhhYjA1NzIzZDExMzk4YmFi
+    ZmZkMzc2MGI0OTAyY2M4ODE5Y2ZlMjk5NTFhOTViNjcxNGI1NWE=
   data.tar.gz: !binary |-
-    YmJiOWY1NTIxYjA1NDYzMWZhZTY3ZTNkZjI2MDBkNWRjYjg0ZmI2YjMwNDFi
-    YWJmNzk2NDM2NWY1Y2IwNDAwMjRkOGI3YzZhZjZjNWVlNjI4YTc1NzljNjY4
-    NTJjOTIzYWUzNzg1ZDJkZGIyMTdiMjUxY2Y5OGIwNWFlMDY2M2U=
+    ZDMyODgxZGI4OTdjMTZlZTU0NjFiYWY1YTc5NWVhYTQ2ZGJhNjk1ZWE4M2Zj
+    NGI0ZTljNTY5MzVmMDRjOTFiNjUwNGM4MGU1MjhkMTQ4MmE4NjYzZDkzNmQy
+    MzI3ZDA3NGQ2ZDAxZWY0YTE3YjBkZDgwZTU5NGMyYWE0OWQ2Zjc=

data/Rakefile

@@ -5,7 +5,7 @@ RuboCop::RakeTask.new
 
 require 'rake/testtask'
 Rake::TestTask.new do |t|
-  t.pattern = 'test/**/*_spec.rb'
+  t.pattern = 'test/**/*_test.rb'
 end
 
-task default: %w(test build rubocop)
+task default: %w(rubocop test build)

data/lib/test_diff/build_coverage.rb

@@ -10,15 +10,7 @@ module TestDiff
       @batch_queue = Queue.new
       @storage = Storage.new
       @continue = continue
-      if File.file?(spec_folder)
-        @batch_queue << spec_folder
-      else
-        Dir["#{spec_folder}/**/*_spec.rb"].each do |spec_name|
-          if !continue || @storage.get(spec_name).empty?
-            @batch_queue << spec_name
-          end
-        end
-      end
+      RunableTests.add_all(@batch_queue, continue)
     end
 
     def run
@@ -74,16 +66,18 @@ 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?
-        # ARGV = ['-b',main_spec_file]
-        s = Time.now
-        result = run_tests(main_spec_file)
-        if result
-          save_coverage_data(main_spec_file, Time.now - s)
-        else
-          Coverage.result # disable coverage
-          exit!(false) unless @continue
-        end
-        # ::Spec::Runner::CommandLine.run(options)
+        run_test(main_spec_file)
+      end
+    end
+
+    def run_test(main_spec_file)
+      s = Time.now
+      result = run_tests(main_spec_file)
+      if result
+        save_coverage_data(main_spec_file, Time.now - s)
+      else
+        Coverage.result # disable coverage
+        exit!(false) unless @continue
       end
     end
 

data/lib/test_diff/build_coverage_diff.rb

@@ -7,14 +7,14 @@ module TestDiff
     def initialize(spec_folder, pre_load, continue)
       @spec_folder = spec_folder
       @sha1 = File.read('test_diff_coverage/sha')
-      @specs_to_run = []
+      @tests_to_run = []
       @storage = Storage.new
       @pre_load = pre_load
       @continue = continue
     end
 
     def run
-      add_changed_files
+      RunableTests.new(@tests_to_run, @spec_folder).add_changed_files
       remove_tests_that_do_not_exist
       remove_tests_in_wrong_folder
       require 'coverage.so'
@@ -32,9 +32,8 @@ module TestDiff
     end
 
     def run_batch
-      puts "Running #{@specs_to_run.size} tests"
-      require 'spec'
-      timing_thread = start_timing_thread(Time.now, @specs_to_run.size)
+      puts "Running #{@tests_to_run.size} tests"
+      timing_thread = start_timing_thread(Time.now, @tests_to_run.size)
       start
       timing_thread.join
       puts 'Test done, compacting db'
@@ -43,8 +42,8 @@ module TestDiff
 
     def start_timing_thread(start_time, original_size)
       Thread.new do
-        until @specs_to_run.empty?
-          last_size = @specs_to_run.size
+        until @tests_to_run.empty?
+          last_size = @tests_to_run.size
           completed = original_size - last_size
           if completed > 0
             time_per_spec = (Time.now - start_time).to_f / completed.to_f
@@ -57,8 +56,8 @@ module TestDiff
     end
 
     def start
-      until @specs_to_run.empty?
-        pid = start_process_fork(@specs_to_run.pop)
+      until @tests_to_run.empty?
+        pid = start_process_fork(@tests_to_run.pop)
         pid, status =  Process.waitpid2(pid)
         fail 'Test Failed' unless status.success?
       end
@@ -105,48 +104,15 @@ module TestDiff
     end
 
     def remove_tests_that_do_not_exist
-      @specs_to_run.delete_if do |s|
+      @tests_to_run.delete_if do |s|
         !File.exist?(s)
       end
     end
 
     def remove_tests_in_wrong_folder
-      @specs_to_run.delete_if do |s|
+      @tests_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

@@ -12,7 +12,7 @@ module TestDiff
     end
 
     def run
-      add_changed_files
+      RunableTests.new(@tests_to_run, @tests_folder).add_changed_files
       remove_tests_that_do_not_exist
       remove_tests_in_wrong_folder
       select_test_group
@@ -27,8 +27,11 @@ module TestDiff
 
     def select_test_group
       return unless groups_of
-      groups_size = (@tests_to_run.length / groups_of.to_f).ceil
-      @tests_to_run = @tests_to_run.slice(group.to_i * groups_size, groups_size) || []
+      new_set_of_tests_to_run = []
+      @tests_to_run.each_with_index do |test, i|
+        new_set_of_tests_to_run << test if i % groups_of.to_i == group.to_i
+      end
+      @tests_to_run = new_set_of_tests_to_run
     end
 
     def remove_tests_that_do_not_exist
@@ -42,38 +45,5 @@ module TestDiff
         !s.filename.start_with?("#{tests_folder}/")
       end
     end
-
-    def add_changed_files
-      _build_tests_to_run
-
-      @tests_to_run.flatten!
-      @tests_to_run.sort!
-      @tests_to_run.uniq!
-    end
-
-    def _build_tests_to_run
-      files = []
-      Config.version_control.changed_files.each do |file_name|
-        if Config.test_pattern.match(file_name)
-          @tests_to_run << Config.storage.test_info_for(file_name)
-        elsif !file_name.start_with?(@tests_folder)
-          files << file_name
-          _add_rails_view_spec(file_name)
-        end
-      end
-      _add_calculated_tests(files)
-    end
-
-    def _add_calculated_tests(files)
-      @tests_to_run << Config.storage.select_tests_for(files, tests_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', "#{tests_folder}/views").gsub('.erb', '.erb_spec.rb')
-      return unless  File.exist?(view_spec_name)
-      @tests_to_run << view_spec_name
-    end
   end
 end

data/lib/test_diff/runable_tests.rb

@@ -0,0 +1,56 @@
+# TestDiff module
+module TestDiff
+  # class used to find tests that are runable
+  class RunableTests
+    def self.add_all(list, continue = false)
+      if File.file?(spec_folder)
+        list << spec_folder
+      else
+        Dir["#{spec_folder}/**/*_spec.rb"].each do |spec_name|
+          has_no_data = Config.storage.get(spec_name).empty?
+          list << spec_name if has_no_data || !continue
+        end
+      end
+    end
+
+    attr_reader :tests_folder
+
+    def initialize(list_to_add_to, tests_folder)
+      @tests_to_run = list_to_add_to
+      @tests_folder = tests_folder
+    end
+
+    def add_changed_files
+      _build_tests_to_run
+
+      @tests_to_run.flatten!
+      @tests_to_run.sort!
+      @tests_to_run.uniq!
+    end
+
+    def _build_tests_to_run
+      files = []
+      Config.version_control.changed_files.each do |file_name|
+        if Config.test_pattern.match(file_name)
+          @tests_to_run << Config.storage.test_info_for(file_name)
+        elsif !file_name.start_with?(@tests_folder)
+          files << file_name
+          _add_rails_view_spec(file_name)
+        end
+      end
+      _add_calculated_tests(files)
+    end
+
+    def _add_calculated_tests(files)
+      @tests_to_run << Config.storage.select_tests_for(files, tests_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', "#{tests_folder}/views").gsub('.erb', '.erb_spec.rb')
+      return unless File.exist?("#{Config.working_directory}/#{view_spec_name}")
+      @tests_to_run << Config.storage.test_info_for(view_spec_name)
+    end
+  end
+end

data/lib/test_diff/test_runner/rspec.rb

@@ -7,7 +7,7 @@ module TestDiff
     class Rspec
       def run_tests(specs)
         if specs.any?
-          puts "bundle exec rspec #{specs.join(' ')}"
+          STDERR.puts "bundle exec rspec #{specs.join(' ')}"
           exec "bundle exec rspec #{specs.join(' ')}"
         else
           puts 'no specs found to run'

data/lib/test_diff/test_runner/spec.rb

@@ -7,7 +7,7 @@ module TestDiff
     class Spec
       def run_tests(specs)
         if specs.any?
-          puts "bundle exec spec #{specs.join(' ')}"
+          STDERR.puts "bundle exec spec #{specs.join(' ')}"
           exec "bundle exec spec #{specs.join(' ')}"
         else
           puts 'no specs found to run'

data/lib/test_diff/version.rb

@@ -1,4 +1,4 @@
 # version number
 module TestDiff
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/lib/test_diff.rb

@@ -4,6 +4,7 @@ require 'test_diff/test_info'
 require 'test_diff/version_control/git'
 require 'test_diff/test_runner/rspec'
 require 'test_diff/config'
+require 'test_diff/runable_tests'
 require 'test_diff/build_coverage'
 require 'test_diff/run_diff'
 require 'test_diff/build_coverage_diff'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test_diff
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Grant Speelman
@@ -133,6 +133,7 @@ files:
 - lib/test_diff/build_coverage_diff.rb
 - lib/test_diff/config.rb
 - lib/test_diff/run_diff.rb
+- lib/test_diff/runable_tests.rb
 - lib/test_diff/storage.rb
 - lib/test_diff/test_info.rb
 - lib/test_diff/test_runner/rspec.rb