simplecov-parallel 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b1b18a919b8a7444c5deaa06423301665a42b75
-  data.tar.gz: 31c6e5df9833b1cdcec3fb45ffa80291c4691d75
+  metadata.gz: 94c1078b42b512f30e37baa11820592cd8f684db
+  data.tar.gz: 89cb64d580fb09735300b48a5361a95d3b6f494f
 SHA512:
-  metadata.gz: cdca8ec716208c9c2600af61d97e6d27321a43826443eb3d3b1fa6370e1fc9df17ec6124d85521b0009fa4ae9fd701cc2acea98db7db62d1597b3a0c8dd9faae
-  data.tar.gz: b3097f911b8977a062dfc460b66856110cee0b6a92a8fa4ede09b70e0303963b18def6bc868c13d38d9ddebf848e220b9f2c698c2b21210ac4e0ec0a6efee440
+  metadata.gz: a39a2254f81216ba3be22eeccf83f3a476a73308c6f9334f7c6e5a7f733c61f5130c55145b567ee50b4dfdbc8ac498888f239f163718aa50f4a68e8245f8ff87
+  data.tar.gz: fee0652236fbc6ed4c0fc5b6ec2242104c20ae64345b6483aeb7a4e2c980781746f7ee8051e076576d94548c2d412c94671bdc81c3a0619192e4ecd61bad4cbe

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Development
 
+## v0.4.0
+
+* Fix an issue with `simplecov` 0.15 or later.
+* Require `simplecov` 0.15 or later.
+
 ## v0.3.0
 
 * Require `circleci-parallel` 0.5.0 or later.

data/Gemfile

@@ -5,7 +5,7 @@ gemspec
 group :development, :test do
   gem 'rake', '~> 11.0'
   gem 'rspec', '~> 3.5'
-  gem 'rubocop', '~> 0.42'
+  gem 'rubocop', '~> 0.51'
 end
 
 group :test do

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

@@ -63,11 +63,13 @@ module SimpleCov
           # 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::ResultMerger.clear_resultset
           SimpleCov.result.format!
         end
 
         def load_results_from_dir(dir)
           with_changing_resultset_path(dir) do
+            SimpleCov::ResultMerger.clear_resultset
             SimpleCov::ResultMerger.results
           end
         end

data/lib/simplecov/parallel/version.rb

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

data/simplecov-parallel.gemspec

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'simplecov/parallel/version'
@@ -21,9 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   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'
+  spec.add_runtime_dependency 'simplecov', '~> 0.15'
 
   spec.add_development_dependency 'bundler', '~> 1.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simplecov-parallel
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-01 00:00:00.000000000 Z
+date: 2017-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: circleci-parallel
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: bundler
   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.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: SimpleCov extension for parallelism support