coverband 4.2.7 → 5.0.0.rc.3

data/lib/coverband/adapters/base.rb

@@ -3,11 +3,11 @@
 module Coverband
   module Adapters
     class Base
-      DATA_KEY = 'data'
-      FIRST_UPDATED_KEY = 'first_updated_at'
-      LAST_UPDATED_KEY = 'last_updated_at'
-      FILE_HASH = 'file_hash'
-      ABSTRACT_KEY = 'abstract'
+      DATA_KEY = "data"
+      FIRST_UPDATED_KEY = "first_updated_at"
+      LAST_UPDATED_KEY = "last_updated_at"
+      FILE_HASH = "file_hash"
+      ABSTRACT_KEY = "abstract"
 
       attr_accessor :type
 
@@ -40,11 +40,11 @@ module Coverband
       end
 
       def size_in_mib
-        format('%<size>.2f', size: (size.to_f / 2**20))
+        format("%<size>.2f", size: (size.to_f / 2**20))
       end
 
       def save_report(_report)
-        raise 'abstract'
+        raise "abstract"
       end
 
       def get_coverage_report
@@ -76,7 +76,7 @@ module Coverband
         runtime_data = coverage(Coverband::RUNTIME_TYPE)
         eager_data = coverage(Coverband::EAGER_TYPE)
         eager_data.values do |vals|
-          vals['data'].map! { |line_coverage| line_coverage ? (0 - line_coverage) : line_coverage }
+          vals["data"].map! { |line_coverage| line_coverage ? (0 - line_coverage) : line_coverage }
         end
         merge_reports(runtime_data, eager_data, skip_expansion: true)
       end
@@ -117,14 +117,14 @@ module Coverband
         keys = (new_report.keys + old_report.keys).uniq
         keys.each do |file|
           new_report[file] = if new_report[file] &&
-                                old_report[file] &&
-                                new_report[file][FILE_HASH] == old_report[file][FILE_HASH]
-                               merge_expanded_data(new_report[file], old_report[file])
-                             elsif new_report[file]
-                               new_report[file]
-                             else
-                               old_report[file]
-                             end
+              old_report[file] &&
+              new_report[file][FILE_HASH] == old_report[file][FILE_HASH]
+            merge_expanded_data(new_report[file], old_report[file])
+          elsif new_report[file]
+            new_report[file]
+          else
+            old_report[file]
+          end
         end
         new_report
       end
@@ -145,7 +145,7 @@ module Coverband
         elsif Coverband.configuration.simulate_oneshot_lines_coverage
           latest.map.with_index { |v, i| (v + original[i] >= 1 ? 1 : 0) if v && original[i] }
         else
-          latest.map.with_index { |v, i| (v && original[i]) ? v + original[i] : nil }
+          latest.map.with_index { |v, i| v && original[i] ? v + original[i] : nil }
         end
       end
     end

data/lib/coverband/adapters/file_store.rb

@@ -5,7 +5,7 @@ module Coverband
     ###
     # FilesStore store a merged coverage file to local disk
     # Generally this is for testing and development
-    # Not recommended for production deployment
+    # Not recommended for production deployment, as it doesn't handle concurrency
     ###
     class FileStore < Base
       def initialize(path, _opts = {})
@@ -39,7 +39,7 @@ module Coverband
       def save_report(report)
         data = report.dup
         data = merge_reports(data, coverage)
-        File.open(path, 'w') { |f| f.write(data.to_json) }
+        File.open(path, "w") { |f| f.write(data.to_json) }
       end
 
       def raw_store

data/lib/coverband/adapters/hash_redis_store.rb

@@ -1,19 +1,19 @@
 # frozen_string_literal: true
 
-require 'securerandom'
+require "securerandom"
 
 module Coverband
   module Adapters
     class HashRedisStore < Base
-      FILE_KEY = 'file'
-      FILE_LENGTH_KEY = 'file_length'
+      FILE_KEY = "file"
+      FILE_LENGTH_KEY = "file_length"
       META_DATA_KEYS = [DATA_KEY, FIRST_UPDATED_KEY, LAST_UPDATED_KEY, FILE_HASH].freeze
       ###
       # This key isn't related to the coverband version, but to the interal format
       # used to store data to redis. It is changed only when breaking changes to our
       # redis format are required.
       ###
-      REDIS_STORAGE_FORMAT_VERSION = 'coverband_hash_3_3'
+      REDIS_STORAGE_FORMAT_VERSION = "coverband_hash_3_3"
 
       JSON_PAYLOAD_EXPIRATION = 5 * 60
 
@@ -25,14 +25,17 @@ module Coverband
         @save_report_batch_size = opts[:save_report_batch_size] || 100
         @format_version = REDIS_STORAGE_FORMAT_VERSION
         @redis = redis
-        raise 'HashRedisStore requires redis >= 2.6.0' unless supported?
+        raise "HashRedisStore requires redis >= 2.6.0" unless supported?
 
         @ttl = opts[:ttl]
         @relative_file_converter = opts[:relative_file_converter] || Utils::RelativeFileConverter
       end
 
       def supported?
-        Gem::Version.new(@redis.info['redis_version']) >= Gem::Version.new('2.6.0')
+        Gem::Version.new(@redis.info["redis_version"]) >= Gem::Version.new("2.6.0")
+      rescue Redis::CannotConnectError => error
+        Coverband.configuration.logger.info "Redis is not available (#{error}), Coverband not configured"
+        Coverband.configuration.logger.info "If this is a setup task like assets:precompile feel free to ignore"
       end
 
       def clear!
@@ -60,7 +63,7 @@ module Coverband
         updated_time = type == Coverband::EAGER_TYPE ? nil : report_time
         keys = []
         report.each_slice(@save_report_batch_size) do |slice|
-          files_data = slice.map do |(file, data)|
+          files_data = slice.map { |(file, data)|
             relative_file = @relative_file_converter.convert(file)
             file_hash = file_hash(relative_file)
             key = key(relative_file, file_hash: file_hash)
@@ -73,11 +76,11 @@ module Coverband
               report_time: report_time,
               updated_time: updated_time
             )
-          end
+          }
           next unless files_data.any?
 
-          arguments_key = [@redis_namespace, SecureRandom.uuid].compact.join('.')
-          @redis.set(arguments_key, { ttl: @ttl, files_data: files_data }.to_json, ex: JSON_PAYLOAD_EXPIRATION)
+          arguments_key = [@redis_namespace, SecureRandom.uuid].compact.join(".")
+          @redis.set(arguments_key, {ttl: @ttl, files_data: files_data}.to_json, ex: JSON_PAYLOAD_EXPIRATION)
           @redis.evalsha(hash_incr_script, [arguments_key])
         end
         @redis.sadd(files_key, keys) if keys.any?
@@ -85,11 +88,11 @@ module Coverband
 
       def coverage(local_type = nil)
         files_set = files_set(local_type)
-        @redis.pipelined do
+        @redis.pipelined {
           files_set.map do |key|
             @redis.hgetall(key)
           end
-        end.each_with_object({}) do |data_from_redis, hash|
+        }.each_with_object({}) do |data_from_redis, hash|
           add_coverage_for_file(data_from_redis, hash)
         end
       end
@@ -99,11 +102,11 @@ module Coverband
       end
 
       def size
-        'not available'
+        "not available"
       end
 
       def size_in_mib
-        'not available'
+        "not available"
       end
 
       private
@@ -115,7 +118,7 @@ module Coverband
         return unless file_hash(file) == data_from_redis[FILE_HASH]
 
         data = coverage_data_from_redis(data_from_redis)
-        hash[file] = data_from_redis.select { |meta_data_key, _value| META_DATA_KEYS.include?(meta_data_key) }.merge!('data' => data)
+        hash[file] = data_from_redis.select { |meta_data_key, _value| META_DATA_KEYS.include?(meta_data_key) }.merge!("data" => data)
         hash[file][LAST_UPDATED_KEY] = hash[file][LAST_UPDATED_KEY].blank? ? nil : hash[file][LAST_UPDATED_KEY].to_i
         hash[file].merge!(LAST_UPDATED_KEY => hash[file][LAST_UPDATED_KEY], FIRST_UPDATED_KEY => hash[file][FIRST_UPDATED_KEY].to_i)
       end
@@ -129,9 +132,9 @@ module Coverband
       end
 
       def script_input(key:, file:, file_hash:, data:, report_time:, updated_time:)
-        coverage_data = data.each_with_index.each_with_object({}) do |(coverage, index), hash|
+        coverage_data = data.each_with_index.each_with_object({}) { |(coverage, index), hash|
           hash[index] = coverage if coverage
-        end
+        }
         meta = {
           first_updated_at: report_time,
           file: file,
@@ -153,8 +156,8 @@ module Coverband
 
       def lua_script_content
         File.read(File.join(
-                    File.dirname(__FILE__), '../../../lua/lib/persist-coverage.lua'
-                  ))
+          File.dirname(__FILE__), "../../../lua/lib/persist-coverage.lua"
+        ))
       end
 
       def values_from_redis(local_type, files)
@@ -178,12 +181,12 @@ module Coverband
       end
 
       def key(file, local_type = nil, file_hash:)
-        [key_prefix(local_type), file, file_hash].join('.')
+        [key_prefix(local_type), file, file_hash].join(".")
       end
 
       def key_prefix(local_type = nil)
         local_type ||= type
-        [@format_version, @redis_namespace, local_type].compact.join('.')
+        [@format_version, @redis_namespace, local_type].compact.join(".")
       end
     end
   end

data/lib/coverband/adapters/redis_store.rb

@@ -11,19 +11,19 @@ module Coverband
       # used to store data to redis. It is changed only when breaking changes to our
       # redis format are required.
       ###
-      REDIS_STORAGE_FORMAT_VERSION = 'coverband_3_2'
+      REDIS_STORAGE_FORMAT_VERSION = "coverband_3_2"
 
       attr_reader :redis_namespace
 
       def initialize(redis, opts = {})
         super()
-        @redis           = redis
-        @ttl             = opts[:ttl]
+        @redis = redis
+        @ttl = opts[:ttl]
         @redis_namespace = opts[:redis_namespace]
-        @format_version  = REDIS_STORAGE_FORMAT_VERSION
-        @keys            = {}
+        @format_version = REDIS_STORAGE_FORMAT_VERSION
+        @keys = {}
         Coverband::TYPES.each do |type|
-          @keys[type] = [@format_version, @redis_namespace, type].compact.join('.')
+          @keys[type] = [@format_version, @redis_namespace, type].compact.join(".")
         end
       end
 
@@ -54,15 +54,15 @@ module Coverband
       ###
       def migrate!
         reset_base_key
-        @format_version = 'coverband3_1'
+        @format_version = "coverband3_1"
         previous_data = coverage
         if previous_data.empty?
-          puts 'no previous data to migrate found'
+          puts "no previous data to migrate found"
           exit 0
         end
-        relative_path_report = previous_data.each_with_object({}) do |(key, vals), fixed_report|
+        relative_path_report = previous_data.each_with_object({}) { |(key, vals), fixed_report|
           fixed_report[Utils::RelativeFileConverter.convert(key)] = vals
-        end
+        }
         clear!
         reset_base_key
         @format_version = REDIS_STORAGE_FORMAT_VERSION
@@ -78,7 +78,7 @@ module Coverband
         local_type ||= opts.key?(:override_type) ? opts[:override_type] : type
         data = redis.get type_base_key(local_type)
         data = data ? JSON.parse(data) : {}
-        data.delete_if { |file_path, file_data| file_hash(file_path) != file_data['file_hash'] } unless opts[:skip_hash_check]
+        data.delete_if { |file_path, file_data| file_hash(file_path) != file_data["file_hash"] } unless opts[:skip_hash_check]
         data
       end
 
@@ -105,7 +105,7 @@ module Coverband
       end
 
       def base_key
-        @base_key ||= [@format_version, @redis_namespace, type].compact.join('.')
+        @base_key ||= [@format_version, @redis_namespace, type].compact.join(".")
       end
 
       def type_base_key(local_type)

data/lib/coverband/at_exit.rb

@@ -6,7 +6,7 @@ module Coverband
 
     @at_exit_registered = nil
     def self.register
-      return if ENV['COVERBAND_DISABLE_AT_EXIT']
+      return if ENV["COVERBAND_DISABLE_AT_EXIT"]
       return if @at_exit_registered
 
       @semaphore.synchronize do

data/lib/coverband/collectors/coverage.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'singleton'
-require_relative 'delta'
+require "singleton"
+require_relative "delta"
 
 module Coverband
   module Collectors
@@ -25,7 +25,6 @@ module Coverband
         @verbose = Coverband.configuration.verbose
         @logger = Coverband.configuration.logger
         @test_env = Coverband.configuration.test_env
-        @track_gems = Coverband.configuration.track_gems
         Delta.reset
         self
       end
@@ -49,53 +48,42 @@ module Coverband
 
       def report_coverage
         @semaphore.synchronize do
-          raise 'no Coverband store set' unless @store
+          raise "no Coverband store set" unless @store
 
           files_with_line_usage = filtered_files(Delta.results)
           @store.save_report(files_with_line_usage)
         end
-      rescue StandardError => e
-        @logger&.error 'coverage failed to store'
+      rescue => e
+        @logger&.error "coverage failed to store"
         @logger&.error "Coverband Error: #{e.inspect} #{e.message}"
         e.backtrace.each { |line| @logger&.error line } if @verbose
         raise e if @test_env
       end
 
-      protected
-
-      ###
-      # Normally I would break this out into additional methods
-      # and improve the readability but this is in a tight loop
-      # on the critical performance path, and any refactoring I come up with
-      # would slow down the performance.
-      ###
-      def track_file?(file)
-        @ignore_patterns.none? do |pattern|
-          file.match(pattern)
-        end && (file.start_with?(@project_directory) ||
-                (@track_gems &&
-                 Coverband.configuration.gem_paths.any? { |path| file.start_with?(path) }))
-      end
-
       private
 
       def filtered_files(new_results)
-        new_results.select! { |file, coverage| track_file?(file) && coverage.any? { |value| value&.nonzero? } }
+        new_results.select! { |_file, coverage| coverage.any? { |value| value&.nonzero? } }
         new_results
       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')
+        raise NotImplementedError, "Coverage needs Ruby > 2.3.0" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.3.0")
 
-        require 'coverage'
+        require "coverage"
+        if RUBY_PLATFORM == "java"
+          unless ::Coverage.respond_to?(:line_stub)
+            require "coverband/utils/jruby_ext"
+          end
+        end
         if defined?(SimpleCov) && defined?(Rails) && defined?(Rails.env) && Rails.env.test?
           puts "Coverband: detected SimpleCov in test Env, allowing it to start Coverage"
           puts "Coverband: to ensure no error logs or missing Coverage call `SimpleCov.start` prior to requiring Coverband"
         else
-          if Coverage.ruby_version_greater_than_or_equal_to?('2.6.0')
+          if Coverage.ruby_version_greater_than_or_equal_to?("2.6.0")
             ::Coverage.start(oneshot_lines: Coverband.configuration.use_oneshot_lines_coverage) unless ::Coverage.running?
-          elsif Coverage.ruby_version_greater_than_or_equal_to?('2.5.0')
+          elsif Coverage.ruby_version_greater_than_or_equal_to?("2.5.0")
             ::Coverage.start unless ::Coverage.running?
           else
             ::Coverage.start

data/lib/coverband/collectors/delta.rb

@@ -39,23 +39,33 @@ module Coverband
 
       def self.reset
         @@previous_coverage = {}
+        @@project_directory = File.expand_path(Coverband.configuration.root)
+        @@ignore_patterns = Coverband.configuration.ignore
       end
 
       private
 
       def generate
-        # TODO: if we filtered before doing this we would avoid calculating the line diff on a ton of files
-        # This would be a fairly noticeable perf win
         current_coverage.each_with_object({}) do |(file, line_counts), new_results|
+          ###
+          # Eager filter:
+          # Normally I would break this out into additional methods
+          # and improve the readability but this is in a tight loop
+          # on the critical performance path, and any refactoring I come up with
+          # would slow down the performance.
+          ###
+          next unless @@ignore_patterns.none? { |pattern| file.match(pattern) } &&
+            file.start_with?(@@project_directory)
+
           # This handles Coverage branch support, setup by default in
           # simplecov 0.18.x
           arr_line_counts = line_counts.is_a?(Hash) ? line_counts[:lines] : line_counts
           new_results[file] = if @@previous_coverage && @@previous_coverage[file]
-                                prev_line_counts = @@previous_coverage[file].is_a?(Hash) ? @@previous_coverage[file][:lines] : @@previous_coverage[file]
-                                array_diff(arr_line_counts, prev_line_counts)
-                              else
-                                arr_line_counts
-                              end
+            prev_line_counts = @@previous_coverage[file].is_a?(Hash) ? @@previous_coverage[file][:lines] : @@previous_coverage[file]
+            array_diff(arr_line_counts, prev_line_counts)
+          else
+            arr_line_counts
+          end
         end
       end
 
@@ -68,9 +78,9 @@ module Coverband
       def transform_oneshot_lines_results(results)
         results.each_with_object({}) do |(file, coverage), new_results|
           @@stubs[file] ||= ::Coverage.line_stub(file)
-          transformed_line_counts = coverage[:oneshot_lines].each_with_object(@@stubs[file].dup) do |line_number, line_counts|
+          transformed_line_counts = coverage[:oneshot_lines].each_with_object(@@stubs[file].dup) { |line_number, line_counts|
             line_counts[line_number - 1] = 1
-          end
+          }
           new_results[file] = transformed_line_counts
         end
       end

data/lib/coverband/collectors/view_tracker.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'singleton'
+require "singleton"
 
 module Coverband
   module Collectors
@@ -14,12 +14,12 @@ module Coverband
     # TODO: test and ensure slim, haml, and other support
     ###
     class ViewTracker
-      DEFAULT_TARGET = Dir.glob('app/views/**/*.html.erb').reject { |file| file.match(/(_mailer)/) }
+      DEFAULT_TARGET = Dir.glob("app/views/**/*.html.erb").reject { |file| file.match(/(_mailer)/) }
       attr_accessor :target, :logged_views, :views_to_record
       attr_reader :logger, :roots, :store, :ignore_patterns
 
       def initialize(options = {})
-        raise NotImplementedError, 'View Tracker requires Rails 4 or greater' unless self.class.supported_version?
+        raise NotImplementedError, "View Tracker requires Rails 4 or greater" unless self.class.supported_version?
 
         @project_directory = File.expand_path(Coverband.configuration.root)
         @ignore_patterns = Coverband.configuration.ignore
@@ -28,7 +28,7 @@ module Coverband
         @target = options.fetch(:target) { DEFAULT_TARGET }
 
         @roots = options.fetch(:roots) { Coverband.configuration.all_root_patterns }
-        @roots = @roots.split(',') if @roots.is_a?(String)
+        @roots = @roots.split(",") if @roots.is_a?(String)
         @one_time_timestamp = false
 
         @logged_views = []
@@ -65,7 +65,7 @@ module Coverband
         normalized_views = {}
         views.each_pair do |view, time|
           roots.each do |root|
-            view = view.gsub(/#{root}/, '')
+            view = view.gsub(/#{root}/, "")
           end
           normalized_views[view] = time
         end
@@ -90,7 +90,7 @@ module Coverband
         if (tracking_time = redis_store.get(tracker_time_key))
           Time.at(tracking_time.to_i).iso8601
         else
-          'N/A'
+          "N/A"
         end
       end
 
@@ -115,14 +115,14 @@ module Coverband
           redis_store.hset(tracker_key, file, reported_time)
         end
         self.views_to_record = []
-      rescue StandardError => e
+      rescue => e
         # we don't want to raise errors if Coverband can't reach redis.
         # This is a nice to have not a bring the system down
         logger&.error "Coverband: view_tracker failed to store, error #{e.class.name}"
       end
 
       def self.supported_version?
-        defined?(Rails) && defined?(Rails::VERSION) && Rails::VERSION::STRING.split('.').first.to_i >= 4
+        defined?(Rails) && defined?(Rails::VERSION) && Rails::VERSION::STRING.split(".").first.to_i >= 4
       end
 
       protected
@@ -154,11 +154,11 @@ module Coverband
       end
 
       def tracker_key
-        'render_tracker_2'
+        "render_tracker_2"
       end
 
       def tracker_time_key
-        'render_tracker_time'
+        "render_tracker_time"
       end
     end
   end