test_diff 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7be473c3e92a840440cda6b28dc949df0537fa0609ceac286ede4ea8ed6e0b1a
-  data.tar.gz: 7dcb1ddb32ecdd1ce6be3290c7cb69c18b700efc2ace0eb521a6f70beac916e8
+  metadata.gz: 2c60bbb0ba468e66251ee6a5bc4640eb868daa0a2e19585e5f2036bd1867672b
+  data.tar.gz: 0abaa8178186abec9c3755195341db54c22e5787688c984659ed88c29d87b164
 SHA512:
-  metadata.gz: 975ed0a4f7883ea2699fb21658b129c6e6181ccdb4d404c8e9296dc43048675720121b8e5b4758dbbd8bb2aa3ff0c267ac113f02ffa3e34a5ee8fdd28b6bcaa6
-  data.tar.gz: 809699defd831c5f7aca2d2ff01846033b2225f6f02d6ec0475d6302aa224c72deec2cd04bbec4f1872f7e90e646e2a2816957698827c66c4448e3a7b0f3ca57
+  metadata.gz: 9c268a1b15442b9df3c232a61d0220933e4831339b58e2194f88c4e878a976918be806f2490ef6880ab7d20bd71ee09b66cd5d7fd9b51bccc56b919c4e9f9f88
+  data.tar.gz: b7b5bb54b2c7870fdaeca86cd6eb04db8e871872ab3d782a9c82669f0e4529b3c4cd0a7251e48d96da4d9521f9b596c3a76315ccdd2d0fcaa8d1005e8f9d81bf

data/README.md

@@ -22,7 +22,7 @@ And then execute:
 
 ## Rails Setup
 
-Suggest to disabled `eager_load` in `config/environments/test.rb` based on `ENV['TEST_DIFF_COVERAGE']`
+If `eager_load` is enabled in `config/environments/test.rb`, disable it based on `ENV['TEST_DIFF_COVERAGE']`
 EG:
 
 ```ruby
@@ -41,15 +41,27 @@ end
 
 ## Usage
 
-Building the test coverage index
+Building the test coverage index (run once a day on your main branch)
 
-    $ test_diff build_coverage spec spec/spec_helper.rb
+```bash
+    $ test_diff build_coverage spec/spec_helper.rb
     $ # part here to upload test_diff_coverage to a shared space, ie aws
+```
 
-Running a test difference
+Running a test difference (after commit on your separate branch)
 
+```bash
     $ # part here to download test_diff_coverage from shared space, ie aws
     $ test_diff rspec
+```
+
+Updating the test coverage index (after separate branch merge into main branch)
+
+```bash
+    $ # part here to download test_diff_coverage from shared space, ie aws
+    $ test_diff build_coverage_diff spec/spec_helper.rb
+    $ # part here to upload test_diff_coverage to a shared space, ie aws
+```
 
 ## Development
 

data/exe/test_diff

@@ -6,9 +6,16 @@ require 'test_diff'
 
 # thor class to allow execution
 class TestDiffBuilder < Thor
-  desc 'build_coverage spec', 'runs the specs and generates reverse_coverage'
-  def build_coverage(spec_folder = 'spec', pre_load = nil, continue = nil)
-    TestDiff::BuildCoverage.new(spec_folder, pre_load, continue).run
+  desc 'build_coverage spec', 'runs the specs and generates coverage index'
+  method_option :spec_folder, desc: 'Folder where specs located', default: 'spec', type: :string, banner: 'spec'
+  method_option :stop_on_failure, desc: 'Stop building coverage if spec fails', default: false, type: :boolean
+  method_option :only_missing, desc: 'build coverage for missing specs', default: false, type: :boolean
+  def build_coverage(pre_load = nil)
+    TestDiff::BuildCoverage.new(options[:spec_folder],
+                                pre_load,
+                                options[:stop_on_failure],
+                                options[:only_missing])
+                           .run
     track_build
   end
 
@@ -18,13 +25,16 @@ class TestDiffBuilder < Thor
   end
 
   desc 'rspec', 'runs the specs difference between the branches'
-  def rspec(spec_folder = 'spec', groups_of = nil, group = '0')
-    TestDiff::RunDiff.new(spec_folder, groups_of, group).run
+  method_option :spec_folder, desc: 'Folder where specs located', default: 'spec', type: :string, banner: 'spec'
+  def rspec(groups_of = nil, group = '0')
+    TestDiff::RunDiff.new(options[:spec_folder], groups_of, group).run
   end
 
-  desc 'build_coverage_diff spec', '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
+  desc 'build_coverage_diff spec', 'runs the specs difference and updates coverage index'
+  method_option :spec_folder, desc: 'Folder where specs located', default: 'spec', type: :string, banner: 'spec'
+  method_option :stop_on_failure, desc: 'Stop building coverage if spec fails', default: false, type: :boolean
+  def build_coverage_diff(pre_load = nil)
+    TestDiff::BuildCoverageDiff.new(options[:spec_folder], pre_load, options[:stop_on_failure]).run
     track_build
   end
 end

data/lib/test_diff/build_coverage.rb

@@ -2,16 +2,17 @@
 module TestDiff
   # class used to build the coverage file
   class BuildCoverage
-    def initialize(spec_folder, pre_load, continue)
+    def initialize(spec_folder, pre_load, stop_on_failure, only_missing)
       @spec_folder = spec_folder
       @pre_load = pre_load
       @batch_queue = Queue.new
-      @continue = continue
+      @stop_on_failure = stop_on_failure
+      @only_missing = only_missing
     end
 
     def run
-      RunableTests.add_all(@spec_folder, @batch_queue, @continue)
-      CoverageRunner.run(@batch_queue, @pre_load, @continue)
+      RunableTests.add_all(@spec_folder, @batch_queue, @only_missing)
+      CoverageRunner.run(@batch_queue, @pre_load, !@stop_on_failure)
     end
   end
 end

data/lib/test_diff/coverage_runner.rb

@@ -16,6 +16,8 @@ module TestDiff
       require 'coverage.so'
       Coverage.start
 
+      ENV['TEST_DIFF_COVERAGE'] = 'yes'
+
       require_boot
       require_rspec
       require_pre_load
@@ -26,9 +28,14 @@ module TestDiff
     private
 
     def require_boot
-      return unless File.exist?('config/boot.rb')
-      puts 'Loading config/boot.rb'
-      require File.expand_path('config/boot.rb')
+      if File.exist?('config/boot.rb')
+        puts 'Loading config/boot.rb'
+        require File.expand_path('config/boot.rb')
+      elsif File.exist?('Gemfile')
+        puts 'Bundler setup'
+        ENV['BUNDLE_GEMFILE'] ||= File.expand_path('Gemfile')
+        require 'bundler/setup'
+      end
     end
 
     def require_pre_load
@@ -39,8 +46,8 @@ module TestDiff
     end
 
     def require_rspec
-      puts 'Loading rspec'
-      require 'rspec'
+      puts 'Loading rspec/core'
+      require 'rspec/core'
     end
 
     def pre_run_checks
@@ -64,7 +71,6 @@ module TestDiff
 
     def start_process_fork(main_spec_file)
       Process.fork do
-        ENV['TEST_DIFF_COVERAGE'] = 'yes'
         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?
@@ -78,7 +84,7 @@ module TestDiff
       if result
         save_coverage_data(main_spec_file, Time.now - s)
       else
-        $stderr.puts(@last_output.to_s)
+        $stderr.puts(@last_output.string)
         Coverage.result # disable coverage
         exit!(false) unless @continue
       end

data/lib/test_diff/logging.rb

@@ -7,9 +7,13 @@ module TestDiff
     end
 
     def log_debug(*args)
-      Config.logger.info(*args)
+      Config.logger.debug(*args)
+    end
+
+    def log_error(*args)
+      Config.logger.error(*args)
     end
 
-    module_function :log_debug, :log_info
+    module_function :log_debug, :log_info, :log_error
   end
 end

data/lib/test_diff/timing_tracker.rb

@@ -6,6 +6,8 @@ module TestDiff
       new(queue).run(&block)
     end
 
+    include Logging
+
     def initialize(queue)
       @queue = queue
       @original_size = queue_size
@@ -33,14 +35,14 @@ module TestDiff
         begin
           do_timing
         rescue => e
-          puts "----- Timing failed: #{e.message} -----"
+          log_error "----- Timing failed: #{e.message} -----"
         end
       end
     end
 
     def do_timing
-      puts "Timing #{@original_size} specs"
-      sleep_time = 30.0
+      log_info "Timing #{@original_size} specs"
+      sleep_time = 90.0
       until queue_empty?
         last_current_size = queue_size
         sleep(sleep_time)
@@ -48,9 +50,9 @@ module TestDiff
         current_completed = last_current_size - current_size
         if current_completed > 0
           est_time_left = (sleep_time / current_completed.to_f) * current_size
-          puts "specs left #{current_size}, est time_left: #{est_time_left.to_i}"
+          log_info "specs left #{current_size}, est time_left: #{est_time_left.to_i}"
         else
-          puts "specs left #{current_size}, est time_left: N/A"
+          log_info "specs left #{current_size}, est time_left: N/A"
         end
       end
     end

data/lib/test_diff/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test_diff
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Grant Speelman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-15 00:00:00.000000000 Z
+date: 2018-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor