simplecov-parallel 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b95a2bd0ff91d28efabb1a19de542ae7b10ee103
-  data.tar.gz: 1ea1b23f9868c17cb16dfb35fedc696957c89f35
+  metadata.gz: 8b1b18a919b8a7444c5deaa06423301665a42b75
+  data.tar.gz: 31c6e5df9833b1cdcec3fb45ffa80291c4691d75
 SHA512:
-  metadata.gz: db6acf55829fc46ace59cf4bc749009bca9d231684ff36b5d9665d19342d2d78ed101ed60ba2dd867cf8ea62f35297a680ada5fc2035a67c9d75a649f2c8c911
-  data.tar.gz: ac79ba6164a3741bbdd32b9c66eef4ad87fc1350715787c4e1892d90fd55ee17594c61b30ab65dc800e65aea97aaf03cb594d23474649b2f74a49ce2bacc8473
+  metadata.gz: cdca8ec716208c9c2600af61d97e6d27321a43826443eb3d3b1fa6370e1fc9df17ec6124d85521b0009fa4ae9fd701cc2acea98db7db62d1597b3a0c8dd9faae
+  data.tar.gz: b3097f911b8977a062dfc460b66856110cee0b6a92a8fa4ede09b70e0303963b18def6bc868c13d38d9ddebf848e220b9f2c698c2b21210ac4e0ec0a6efee440

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Development
 
+## v0.3.0
+
+* Require `circleci-parallel` 0.5.0 or later.
+
 ## v0.2.0
 
 * Require `simplecov` 0.13 or later.

data/README.md

@@ -59,7 +59,7 @@ test:
           - spec/**/*_spec.rb
 ```
 
-The formatter will be executed only on the first node (`CIRCLE_NODE_INDEX` is `0`).
+The SimpleCov formatter will be executed only on the first node (where `CIRCLE_NODE_INDEX` is `0`).
 
 ## License
 

data/Rakefile

@@ -8,6 +8,6 @@ end
 
 RuboCop::RakeTask.new
 
-task default: [:spec, :rubocop]
+task default: %i[spec rubocop]
 
-task ci: [:spec, :rubocop]
+task ci: %i[spec rubocop]

data/lib/simplecov/parallel/adapter/circleci.rb

@@ -12,22 +12,35 @@ module SimpleCov
         def activate
           require 'circleci/parallel'
           require 'fileutils'
+          configure_circleci_parallel
+          configure_simplecov
+        end
+
+        private
 
+        def configure_circleci_parallel
+          ::CircleCI::Parallel.configure do |config|
+            config.on_each_slave_node.before_sync do
+              export_slave_node_result
+            end
+
+            config.on_master_node.after_download do
+              merge_slave_node_results
+              merge_master_node_result_and_format
+            end
+          end
+        end
+
+        def configure_simplecov
           SimpleCov.command_name("#{SimpleCov.command_name} #{current_node.name}")
 
           SimpleCov.at_exit do
             puts 'Merging SimpleCov result into the master node...'
-            export_slave_node_result
-            join_nodes_and_merge_slave_node_results
-            merge_and_format_master_node_result
+            ::CircleCI::Parallel.sync
           end
         end
 
-        private
-
         def export_slave_node_result
-          return if current_node.master?
-
           # Export result to coverage/.resultset.json
           # https://github.com/colszowka/simplecov/blob/v0.12.0/lib/simplecov.rb#L89
           raise 'SimpleCov.use_merging must be set to true' unless SimpleCov.use_merging
@@ -39,30 +52,20 @@ module SimpleCov
           )
         end
 
-        def join_nodes_and_merge_slave_node_results
-          ::CircleCI::Parallel.configuration.after_download do
-            merge_slave_node_results
+        def merge_slave_node_results
+          Dir.glob('node*') do |node_dir|
+            results = load_results_from_dir(node_dir)
+            merge_and_save_results(results)
           end
-
-          ::CircleCI::Parallel.join
         end
 
-        def merge_and_format_master_node_result
-          return unless current_node.master?
-
+        def merge_master_node_result_and_format
           # Invoking `SimpleCov.result` here merges the master node data into the slave node data.
           # `SimpleCov.result.format!` is the default behavior of at_exit:
           # https://github.com/colszowka/simplecov/blob/v0.12.0/lib/simplecov/configuration.rb#L172
           SimpleCov.result.format!
         end
 
-        def merge_slave_node_results
-          Dir.glob('node*') do |node_dir|
-            results = load_results_from_dir(node_dir)
-            merge_and_save_results(results)
-          end
-        end
-
         def load_results_from_dir(dir)
           with_changing_resultset_path(dir) do
             SimpleCov::ResultMerger.results

data/lib/simplecov/parallel/version.rb

@@ -2,7 +2,7 @@ module SimpleCov
   module Parallel
     module Version
       MAJOR = 0
-      MINOR = 2
+      MINOR = 3
       PATCH = 0
 
       def self.to_s

data/simplecov-parallel.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'simplecov/parallel/version'
@@ -19,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'circleci-parallel', '~> 0.4'
+  spec.add_runtime_dependency 'circleci-parallel', '~> 0.5'
   # simplecov 0.12.0 has a bug in result merger.
   # https://github.com/colszowka/simplecov/pull/513
   spec.add_runtime_dependency 'simplecov', '~> 0.13'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simplecov-parallel
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-17 00:00:00.000000000 Z
+date: 2017-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: circleci-parallel
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: SimpleCov extension for parallelism support