rspec_chunked 0.1.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76485af77917941cf4e9afbc37c5580077bb3943fb1b9bebdaa5c9ae3c83c8f4
-  data.tar.gz: 814d02ffe139f175ae2c2ef8bb2b64d14b8c8407ee37d381fcc00c333b072ee6
+  metadata.gz: a22a1dad0fb805db73f6d53b2a9b19894a08b7c4b299de78a63e9bd88015ab6f
+  data.tar.gz: dde3ab891cdb771964db3ea58922836fae874e969a0ca86fb3b41ecc4dce20a0
 SHA512:
-  metadata.gz: 87c877e3ef437d78d6dda51fa63e1c4168c046731891c587ff50db107778a24535427536d885d9f576aa016f10b8fdb91b42062ab9545df7bcbe9fdc4670562a
-  data.tar.gz: b0e7f004c432ada92eb8ed2997626e62f8c65ec7b3331af1d98a4d879481e460a05387a5cfcb5fcaadb275e9481193def45aa8cc7c36a38357735da05a322d35
+  metadata.gz: bee4a8e04ecfb698edb4b462a658f03fb13c8b0e1500fc9d68c7234af468bfc645706a66a0036908c29e09742431f3ff43472600f26dd617d2ecd4ce5db20008
+  data.tar.gz: a5993d30cd9f60bad63761021dbba113cb7ec3addddd5ebc756bbbded12e6b635d264498aa98c3f1027f0437ad1661f5db9ee18f020cf5d7e1e5abda004c1a4f

data/README.md

@@ -16,23 +16,34 @@ If ordering is not enough, permits to balance manually by moving x percentage of
 - Add manual balance
 ```ruby
   # config/initializers/rspec_chunked.rb
-  return unless defined?(RspecChunked::ChunkedTests)
-
-  RspecChunked::ChunkedTests.balance_settings =  { 1 => { to: 2, percentage: 15 }, 4 => { to: 3, percentage: 10 } }
+  if defined?(RspecChunked::ChunkedTests)
+    data = { 1 => { to: 2, percentage: 15 },
+             4 => { to: 3, percentage: 10 } }
+    RspecChunked::ChunkedTests.balance_settings = data
+  end
 ```
 Balance tests by moving 15% tests files from group 1 into group 2 and moving 10% tests files from group 4 into group 3
 
 ## Usage
-` CI_JOBS=3 CI_JOB=1 rake rspec_chunked `
+- Basic initialization
+  ` CI_JOBS=3 CI_JOB=1 rake rspec_chunked`
+- Custom initialization
+  ` CI_JOBS=3 CI_JOB=1 CI_CMD="bundle exec rspec ..." rake rspec_chunked`
 - `CI_JOBS`: quantity of groups/workers to be split
 - `CI_JOB`: current group/worker to be executed, limit: 1 until CI_JOBS
+- `CI_CMD`: Custom rspec command
+
+### Coverage merge reports (when using [simplecov](https://github.com/simplecov-ruby/simplecov#merging-test-runs-under-different-execution-environments))
+This task will merge all coverage reports
+`rake rspec_chunked:merge_reports`
+
 
 ### Github workflow result
 - Before:    
   ![Before](/docs/before.png?raw=true)
 
-- Current:    
-  ![Current](/docs/current.png?raw=true)   
+- After:    
+  ![After](/docs/current.png?raw=true)   
 
 - Github workflow sample:
   ````yaml

data/Rakefile

@@ -25,3 +25,7 @@ Rake::TestTask.new(:test) do |t|
 end
 
 task default: :test
+
+# gem tasks
+path = File.expand_path(__dir__)
+Dir.glob("#{path}/lib/tasks/**/*.rake").each { |f| import f }

data/lib/rspec_chunked.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'rspec_chunked/railtie' if defined?(Rails)
 require 'rspec_chunked/chunked_tests'
 module RspecChunked
 end

data/lib/rspec_chunked/chunked_tests.rb

@@ -5,12 +5,13 @@ module RspecChunked
     class << self
       attr_accessor :balance_settings
     end
-    attr_accessor :qty_groups, :job_number, :balance_settings
+    attr_accessor :qty_groups, :job_number, :balance_settings, :cmd
 
-    def initialize(qty_groups, job_number)
+    def initialize(qty_groups, job_number, cmd: nil)
       @qty_groups = qty_groups
       @job_number = job_number - 1
       @balance_settings = self.class.balance_settings || {}
+      @cmd = cmd || 'bundle exec rspec'
     end
 
     def run
@@ -18,7 +19,7 @@ module RspecChunked
       tests = balanced_tests[job_number]
       qty = balanced_tests.flatten.count
       Kernel.puts "**** running #{tests.count}/#{qty} tests (group number: #{job_number + 1})"
-      Kernel.exec "bundle exec rspec #{tests.join(' ')}"
+      Kernel.exec "#{cmd} #{tests.join(' ')}"
     end
 
     private
@@ -35,7 +36,7 @@ module RspecChunked
 
     def test_files
       Dir['spec/**/*_spec.rb'].sort_by do |path|
-        File.size(File.join(__dir__, '../', path)).to_f
+        File.size(File.join('./', path)).to_f
       end
     end
 

data/lib/rspec_chunked/railtie.rb

@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
+require 'rails'
 module RspecChunked
   class Railtie < ::Rails::Railtie
+    rake_tasks do
+      load 'tasks/rspec_chunked_tasks.rake'
+    end
   end
 end

data/lib/rspec_chunked/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RspecChunked
-  VERSION = '0.1.0'
+  VERSION = '0.4.2'
 end

data/lib/tasks/rspec_chunked_tasks.rake

@@ -1,10 +1,23 @@
 # frozen_string_literal: true
 
 desc 'Run chunked rspec tests on specific qty, sample: CI_JOBS=3 CI_JOB=1 rake rspec_chunked'
-task :rspec_chunked do
+task rspec_chunked: :environment do
   qty_jobs = (ENV['CI_JOBS'] || 3).to_i
   job_number = (ENV['CI_JOB'] || 1).to_i
-
-  service = RspecChunked::ChunkedTests.new(qty_jobs, job_number)
+  service = RspecChunked::ChunkedTests.new(qty_jobs, job_number, cmd: ENV['CI_CMD'])
   service.run
+  copy_coverage(job_number)
+end
+
+def copy_coverage(job_number)
+  path = 'coverage/.resultset.json'
+  FileUtils.cp path, "coverage/.resultset-#{job_number}.json" if File.exist?(path)
+end
+
+namespace :rspec_chunked do
+  desc 'Collates all result sets generated by the different test runners'
+  task :merge_reports do
+    require 'simplecov'
+    SimpleCov.collate Dir['coverage/.resultset-*']
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec_chunked
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.4.2
 platform: ruby
 authors:
 - owen2345
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-12 00:00:00.000000000 Z
+date: 2021-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler