Merge 77456a0 into f984d6e

danmayer · May 1, 2019 · 5a184b1 · 5a184b1
2 parents f984d6e + 77456a0
commit 5a184b1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/lib/coverband/collectors/coverage.rb b/lib/coverband/collectors/coverage.rb
@@ -36,12 +36,14 @@ def eager_loading!
       end
 
       def report_coverage(force_report = false)
-        return if !ready_to_report? && !force_report
-        raise 'no Coverband store set' unless @store
+        @semaphore.synchronize do
+          return if !ready_to_report? && !force_report
+          raise 'no Coverband store set' unless @store
 
-        files_with_line_usage = filtered_files(Delta.results)
+          files_with_line_usage = filtered_files(Delta.results)
 
-        @store.save_report(files_with_line_usage)
+          @store.save_report(files_with_line_usage)
+        end
       rescue StandardError => e
         if @verbose
           @logger&.error 'coverage failed to store'
@@ -80,6 +82,7 @@ def ready_to_report?
       end
 
       def initialize
+        @semaphore = Mutex.new
         raise NotImplementedError, 'Coverage needs Ruby > 2.3.0' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0')
 
         require 'coverage'

diff --git a/lib/coverband/collectors/delta.rb b/lib/coverband/collectors/delta.rb
@@ -3,7 +3,6 @@
 module Coverband
   module Collectors
     class Delta
-      @semaphore = Mutex.new
       @@previous_coverage = {}
       attr_reader :current_coverage
 
@@ -18,9 +17,7 @@ def self.results
       end
 
       def self.results(process_coverage = RubyCoverage)
-        @semaphore.synchronize do
-          new(process_coverage.results).results
-        end
+        new(process_coverage.results).results
       end
 
       def results