coverband 5.0.0.rc.3 → 5.0.0.rc.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c59cff2fa063db7a0c165e9cfefa8607151ee39699bf57cbb6bb6fce849abe97
-  data.tar.gz: 6fedd5cc2efd695370b3136f293209184b8c633e093ae75ac2f7d083c1eec13d
+  metadata.gz: c83a78e28c79671ef144ffa38e40ee061a873ef6a207437f01923188c17d3cf0
+  data.tar.gz: 80a3c0a46cfb55a5972139e034733d9fb6541f0d547caff1f004203b9ddb0484
 SHA512:
-  metadata.gz: 75740ba292febb787cbb40beaa47b1a355d9303b23b43fc949d77f918848497fca538e080e86baf5d898b4a5001a9a838ed64846cb5a039a6aaa2a300f39edf0
-  data.tar.gz: 6ed03c519ee7a4a5d24f6399c8a1a747d2de58d0a6370575f72bed528a18cd4d24c941c6e7f60902ced21883e4f664158a91881b3518577722323cb5cc5b904c
+  metadata.gz: 0b2f9965e62d911acc562c73df79f4ba13ca0df48bb18258a9069b71d3323f9167385b11fe25772d32d23575338e98e04f721dd57f6562ca40171e39f1cae591
+  data.tar.gz: 6ca2447bbddf8ac8bd6a92e4544a2e38b5a7bf84d49e9e02230ef3a2e0044436ce70d9907dad8a7d163cf909369ad4f089af49bb6a50da5b62982e3001aa48bd

data/changes.md

@@ -7,7 +7,7 @@
   - [redis bitfield](https://stackoverflow.com/questions/47100606/optimal-way-to-store-array-of-integers-in-redis-database)
 - Add support for [zadd](http://redis.io/topics/data-types-intro) so one could determine single call versus multiple calls on a line, letting us determine the most executed code in production.
 
-### Coverband 4.X
+### Coverband Future...
 
 Will be the fully modern release that drops maintenance legacy support in favor of increased performance, ease of use, and maintainability.
 
@@ -60,7 +60,14 @@ Will be the fully modern release that drops maintenance legacy support in favor
   - drops S3 support
   - drops static report support
   - drops gem support
-- ?
+  - only loaded web reporter files when required
+- improved load order allowing more time for ENV vars (better dotenv, figaro, rails secrets support)
+- improved resque patching pattern
+- improved default ignores
+- additional adapters
+  - supports web-service adapter for http coverage collection
+  - support log/file adapter
+- reduce logs / errors / alerts on bad startup configurations
 
 # Released
 

data/coverband.gemspec

@@ -34,6 +34,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "minitest-profile"
+  spec.add_development_dependency "webmock"
 
   # TODO: Remove when other production adapters exist
   # because the default configuration of redis store, we really do require

data/lib/coverband.rb

@@ -12,9 +12,11 @@ require "coverband/adapters/base"
 require "coverband/adapters/redis_store"
 require "coverband/adapters/hash_redis_store"
 require "coverband/adapters/file_store"
+require "coverband/adapters/stdout_store"
 require "coverband/utils/file_hasher"
 require "coverband/collectors/coverage"
 require "coverband/collectors/view_tracker"
+require "coverband/collectors/view_tracker_service"
 require "coverband/reporters/base"
 require "coverband/reporters/console_report"
 require "coverband/integrations/background"
@@ -25,6 +27,7 @@ Coverband::Adapters::RedisStore = Coverband::Adapters::HashRedisStore if ENV["CO
 
 module Coverband
   @@configured = false
+  SERVICE_CONFIG = "./config/coverband_service.rb"
   CONFIG_FILE = "./config/coverband.rb"
   RUNTIME_TYPE = :runtime
   EAGER_TYPE = :eager_loading
@@ -33,7 +36,11 @@ module Coverband
   ALL_TYPES = TYPES + [:merged]
 
   def self.configure(file = nil)
-    configuration_file = file || ENV.fetch("COVERBAND_CONFIG", CONFIG_FILE)
+    configuration_file = file || ENV["COVERBAND_CONFIG"]
+    if configuration_file.nil?
+      configuration_file = coverband_service? ? SERVICE_CONFIG : CONFIG_FILE
+    end
+
     configuration
     if block_given?
       yield(configuration)
@@ -46,6 +53,10 @@ module Coverband
     coverage_instance.reset_instance
   end
 
+  def self.coverband_service?
+    !!File.exist?(SERVICE_CONFIG)
+  end
+
   def self.configured?
     @@configured
   end
@@ -87,6 +98,7 @@ module Coverband
   private_class_method def self.coverage_instance
     Coverband::Collectors::Coverage.instance
   end
+
   unless ENV["COVERBAND_DISABLE_AUTO_START"]
     begin
       # Coverband should be setup as early as possible

data/lib/coverband/adapters/base.rb

@@ -112,7 +112,6 @@ module Coverband
         # transparently update from RUNTIME_TYPE = nil to RUNTIME_TYPE = :runtime
         # transparent update for format coveband_3_2
         old_report = coverage(nil, override_type: nil) if old_report.nil? && type == Coverband::RUNTIME_TYPE
-
         new_report = expand_report(new_report) unless options[:skip_expansion]
         keys = (new_report.keys + old_report.keys).uniq
         keys.each do |file|

data/lib/coverband/adapters/file_store.rb

@@ -3,14 +3,38 @@
 module Coverband
   module Adapters
     ###
-    # FilesStore store a merged coverage file to local disk
-    # Generally this is for testing and development
-    # Not recommended for production deployment, as it doesn't handle concurrency
+    # FileStore store a merged coverage file to local disk
+    #
+    # Notes: Concurrency
+    # * threadsafe as the caller to save_report uses @semaphore.synchronize
+    # * file access process safe as each file written per process PID
+    #
+    # Usage:
+    # config.store = Coverband::Adapters::FileStore.new('log/coverage.log')
+    #
+    # View Reports:
+    # Using this assumes you are syncing the coverage files
+    # to some shared storage that is accessable outside of the production server
+    # download files to a system where you want to view the reports..
+    # When viewing coverage from the filestore adapter it merges all coverage
+    # files matching the path pattern, in this case `log/coverage.log.*`
+    #
+    # run: `bundle exec rake coverband:coverage_server`
+    # open http://localhost:1022/
+    #
+    # one could also build a report via code, the output is suitable to feed into SimpleCov
+    #
+    # ```
+    # coverband.configuration.store.merge_mode = true
+    # coverband.configuration.store.coverage
+    # ```
     ###
     class FileStore < Base
+      attr_accessor :merge_mode
       def initialize(path, _opts = {})
         super()
-        @path = path
+        @path = "#{path}.#{::Process.pid}"
+        @merge_mode = false
 
         config_dir = File.dirname(@path)
         Dir.mkdir config_dir unless File.exist?(config_dir)
@@ -29,17 +53,25 @@ module Coverband
       end
 
       def coverage(_local_type = nil)
-        if File.exist?(path)
+        if merge_mode
+          data = {}
+          Dir[path.sub(/\.\d+/, ".*")].each do |path|
+            data = merge_reports(data, JSON.parse(File.read(path)), skip_expansion: true)
+          end
+          data
+        elsif File.exist?(path)
           JSON.parse(File.read(path))
         else
           {}
         end
+      rescue Errno::ENOENT
+        {}
       end
 
       def save_report(report)
         data = report.dup
         data = merge_reports(data, coverage)
-        File.open(path, "w") { |f| f.write(data.to_json) }
+        File.write(path, JSON.dump(data))
       end
 
       def raw_store

data/lib/coverband/adapters/stdout_store.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Coverband
+  module Adapters
+    ###
+    # StdoutStore is for testing and development
+    #
+    # Usage:
+    # config.store = Coverband::Adapters::StdoutStore.new
+    ###
+    class StdoutStore < Base
+      def initialize(_opts = {})
+        super()
+      end
+
+      def clear!
+        # NOOP
+      end
+
+      def size
+        0
+      end
+
+      def migrate!
+        raise NotImplementedError, "StdoutStore doesn't support migrations"
+      end
+
+      def coverage(_local_type = nil)
+        {}
+      end
+
+      def save_report(report)
+        $stdout.puts(report.to_json)
+      end
+
+      def raw_store
+        raise NotImplementedError, "StdoutStore doesn't support raw_store"
+      end
+    end
+  end
+end

data/lib/coverband/adapters/web_service_store.rb

@@ -0,0 +1,157 @@
+# frozen_string_literal: true
+
+module Coverband
+  module Adapters
+    ###
+    # WebServiceStore store a merged coverage file to local disk
+    # TODO: add webmock tests
+    ###
+    class WebServiceStore < Base
+      attr_reader :coverband_url, :process_type, :runtime_env, :hostname, :pid
+
+      def initialize(coverband_url, opts = {})
+        super()
+        require "socket"
+        require "securerandom"
+        @coverband_url = coverband_url
+        @process_type = opts.fetch(:process_type) { $PROGRAM_NAME&.split("/")&.last || Coverband.configuration.process_type }
+        @hostname = opts.fetch(:hostname) { ENV["DYNO"] || Socket.gethostname.force_encoding("utf-8").encode }
+        @hostname = @hostname.delete("'", "").delete("’", "")
+        @runtime_env = opts.fetch(:runtime_env) { Coverband.configuration.coverband_env }
+        @failed_coverage_reports = []
+      end
+
+      def logger
+        Coverband.configuration.logger
+      end
+
+      def clear!
+        # done via service UI
+        raise "not supported via service"
+      end
+
+      def clear_file!(filename)
+        # done via service UI
+        raise "not supported via service"
+      end
+
+      # NOTE: Should support nil to mean not supported
+      # the size feature doesn't really makde sense for the service
+      def size
+        0
+      end
+
+      ###
+      # Fetch coverband coverage via the API
+      # This would allow one to expore from the service and move back to the open source
+      # without having to reset coverage
+      ###
+      def coverage(local_type = nil, opts = {})
+        return if Coverband.configuration.service_disabled_dev_test_env?
+
+        local_type ||= opts.key?(:override_type) ? opts[:override_type] : type
+        env_filter = opts.key?(:env_filter) ? opts[:env_filter] : "production"
+        uri = URI("#{coverband_url}/api/coverage?type=#{local_type}&env_filter=#{env_filter}")
+        req = Net::HTTP::Get.new(uri, "Content-Type" => "application/json", "Coverband-Token" => Coverband.configuration.api_key)
+        res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == "https") do |http|
+          http.request(req)
+        end
+        coverage_data = JSON.parse(res.body)
+        coverage_data
+      rescue => e
+        logger&.error "Coverband: Error while retrieving coverage #{e}" if Coverband.configuration.verbose || Coverband.configuration.service_dev_mode
+      end
+
+      def save_report(report)
+        return if report.empty?
+
+        # We set here vs initialize to avoid setting on the primary process vs child processes
+        @pid ||= ::Process.pid
+
+        # TODO: do we need dup
+        # TODO: we don't need upstream timestamps, server will track first_seen
+        Thread.new do
+          data = expand_report(report.dup)
+          full_package = {
+            collection_type: "coverage_delta",
+            collection_data: {
+              tags: {
+                process_type: process_type,
+                app_loading: type == Coverband::EAGER_TYPE,
+                runtime_env: runtime_env,
+                pid: pid,
+                hostname: hostname
+              },
+              file_coverage: data
+            }
+          }
+
+          save_coverage(full_package)
+          retry_failed_reports
+        end&.join
+      end
+
+      def raw_store
+        raise "not supported via service"
+      end
+
+      private
+
+      def retry_failed_reports
+        retries = []
+        @failed_coverage_reports.any? do
+          begin
+            report_body = @failed_coverage_reports.pop
+            send_report_body(report_body)
+          rescue
+            retries << report_body
+          end
+        end
+        retries.each do |report_body|
+          add_retry_message(report_body)
+        end
+      end
+
+      def add_retry_message(report_body)
+        if @failed_coverage_reports.length > 5
+          logger&.info "Coverband: The errored reporting queue has reached 5. Subsequent reports will not be transmitted"
+        else
+          @failed_coverage_reports << report_body
+        end
+      end
+
+      def save_coverage(data)
+        if Coverband.configuration.api_key.nil?
+          puts "Coverband: Error: no Coverband API key was found!"
+          return
+        end
+
+        coverage_body = {remote_uuid: SecureRandom.uuid, data: data}.to_json
+        send_report_body(coverage_body)
+      rescue => e
+        add_retry_message(coverage_body)
+        logger&.info "Coverband: Error while saving coverage #{e}" if Coverband.configuration.verbose || Coverband.configuration.service_dev_mode
+      end
+
+      def send_report_body(coverage_body)
+        uri = URI("#{coverband_url}/api/collector")
+        req = ::Net::HTTP::Post.new(uri, "Content-Type" => "application/json", "Coverband-Token" => Coverband.configuration.api_key)
+        req.body = coverage_body
+        logger&.info "Coverband: saving (#{uri}) #{req.body}" if Coverband.configuration.verbose
+        res = ::Net::HTTP.start(
+          uri.hostname,
+          uri.port,
+          open_timeout: Coverband.configuration.coverband_timeout,
+          read_timeout: Coverband.configuration.coverband_timeout,
+          ssl_timeout: Coverband.configuration.coverband_timeout,
+          use_ssl: uri.scheme == "https"
+        ) do |http|
+          http.request(req)
+        end
+        if res.code.to_i >= 500
+          add_retry_message(coverage_body)
+        end
+      end
+    end
+  end
+end

data/lib/coverband/collectors/delta.rb

@@ -77,6 +77,16 @@ module Coverband
 
       def transform_oneshot_lines_results(results)
         results.each_with_object({}) do |(file, coverage), 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)
+
           @@stubs[file] ||= ::Coverage.line_stub(file)
           transformed_line_counts = coverage[:oneshot_lines].each_with_object(@@stubs[file].dup) { |line_number, line_counts|
             line_counts[line_number - 1] = 1

data/lib/coverband/collectors/view_tracker_service.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module Coverband
+  module Collectors
+    ###
+    # This class extends view tracker to support web service reporting
+    ###
+    class ViewTrackerService < ViewTracker
+      def report_views_tracked
+        reported_time = Time.now.to_i
+        if views_to_record.any?
+          relative_views = views_to_record.map! do |view|
+            roots.each do |root|
+              view = view.gsub(/#{root}/, "")
+            end
+            view
+          end
+          save_tracked_views(views: relative_views, reported_time: reported_time)
+        end
+        self.views_to_record = []
+      rescue => e
+        # we don't want to raise errors if Coverband can't reach the service
+        logger&.error "Coverband: view_tracker failed to store, error #{e.class.name}" if Coverband.configuration.verbose || Coverband.configuration.service_dev_mode
+      end
+
+      def self.supported_version?
+        defined?(Rails) && defined?(Rails::VERSION) && Rails::VERSION::STRING.split(".").first.to_i >= 4
+      end
+
+      private
+
+      def logger
+        Coverband.configuration.logger
+      end
+
+      def save_tracked_views(views:, reported_time:)
+        uri = URI("#{Coverband.configuration.service_url}/api/collector")
+        req = Net::HTTP::Post.new(uri, "Content-Type" => "application/json", "Coverband-Token" => Coverband.configuration.api_key)
+        data = {
+          collection_type: "view_tracker_delta",
+          collection_data: {
+            tags: {
+              runtime_env: Coverband.configuration.coverband_env
+            },
+            collection_time: reported_time,
+            tracked_views: views
+          }
+        }
+        # puts "sending #{data}"
+        req.body = {remote_uuid: SecureRandom.uuid, data: data}.to_json
+        Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == "https") do |http|
+          http.request(req)
+        end
+      rescue => e
+        logger&.error "Coverband: Error while saving coverage #{e}" if Coverband.configuration.verbose || Coverband.configuration.service_dev_mode
+      end
+    end
+  end
+end

data/lib/coverband/configuration.rb

@@ -6,13 +6,14 @@ module Coverband
       :additional_files, :verbose,
       :reporter, :redis_namespace, :redis_ttl,
       :background_reporting_enabled,
-      :background_reporting_sleep_seconds, :test_env,
-      :web_enable_clear, :gem_details, :web_debug, :report_on_exit,
-      :simulate_oneshot_lines_coverage, :track_views, :view_tracker,
-      :reporting_wiggle
-
+      :test_env, :web_enable_clear, :gem_details, :web_debug, :report_on_exit,
+      :simulate_oneshot_lines_coverage,
+      :view_tracker
     attr_writer :logger, :s3_region, :s3_bucket, :s3_access_key_id,
-      :s3_secret_access_key, :password
+      :s3_secret_access_key, :password, :api_key, :service_url, :coverband_timeout, :service_dev_mode,
+      :service_test_mode, :proces_type, :report_period, :track_views,
+      :background_reporting_sleep_seconds, :reporting_wiggle
+
     attr_reader :track_gems, :ignore, :use_oneshot_lines_coverage
 
     #####
@@ -61,12 +62,13 @@ module Coverband
       @logger = nil
       @store = nil
       @background_reporting_enabled = true
-      @background_reporting_sleep_seconds = 30
+      @background_reporting_sleep_seconds = nil
       @test_env = nil
       @web_enable_clear = false
       @track_gems = false
       @gem_details = false
-      @track_views = false
+      @track_views = true
+      @view_tracker = nil
       @web_debug = false
       @report_on_exit = true
       @use_oneshot_lines_coverage = ENV["ONESHOT"] || false
@@ -76,6 +78,15 @@ module Coverband
       @all_root_patterns = nil
       @password = nil
 
+      # coverband service settings
+      @api_key = nil
+      @service_url = nil
+      @coverband_timeout = nil
+      @service_dev_mode = nil
+      @service_test_mode = nil
+      @proces_type = nil
+      @report_period = nil
+
       # TODO: these are deprecated
       @s3_region = nil
       @s3_bucket = nil
@@ -115,8 +126,29 @@ module Coverband
       puts "deprecated, s3 is no longer support"
     end
 
+    def background_reporting_sleep_seconds
+      @background_reporting_sleep_seconds ||= if Coverband.coverband_service?
+        Coverband.configuration.coverband_env == "production" ? Coverband.configuration.report_period : 60
+      else
+        60
+      end
+    end
+
+    def reporting_wiggle
+      @reporting_wiggle ||= 30
+    end
+
     def store
-      @store ||= Coverband::Adapters::RedisStore.new(Redis.new(url: redis_url), redis_store_options)
+      @store ||= if Coverband.coverband_service?
+        require "coverband/adapters/web_service_store"
+        Coverband::Adapters::WebServiceStore.new(service_url)
+      else
+        Coverband::Adapters::RedisStore.new(Redis.new(url: redis_url), redis_store_options)
+      end
+    end
+
+    def track_views
+      @track_views ||= service_disabled_dev_test_env? ? false : true
     end
 
     def store=(store)
@@ -189,6 +221,43 @@ module Coverband
       Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.6.0")
     end
 
+    def api_key
+      @api_key ||= ENV["COVERBAND_API_KEY"]
+    end
+
+    def service_url
+      @service_url ||= ENV["COVERBAND_URL"] || "https://coverband.io"
+    end
+
+    def coverband_env
+      ENV["RACK_ENV"] || ENV["RAILS_ENV"] || (defined?(Rails) && Rails.respond_to?(:env) ? Rails.env : "unknown")
+    end
+
+    def coverband_timeout
+      @coverband_timeout ||= coverband_env == "development" ? 5 : 2
+    end
+
+    def service_dev_mode
+      @service_dev_mode ||= ENV["COVERBAND_ENABLE_DEV_MODE"] || false
+    end
+
+    def service_test_mode
+      @service_dev_mode ||= ENV["COVERBAND_ENABLE_TEST_MODE"] || false
+    end
+
+    def proces_type
+      @process_type ||= ENV["PROCESS_TYPE"] || "unknown"
+    end
+
+    def report_period
+      @process_type ||= (ENV["COVERBAND_REPORT_PERIOD"] || 600).to_i
+    end
+
+    def service_disabled_dev_test_env?
+      (coverband_env == "test" && !Coverband.configuration.service_test_mode) ||
+        (coverband_env == "development" && !Coverband.configuration.service_dev_mode)
+    end
+
     private
 
     def redis_url

data/lib/coverband/integrations/background.rb

@@ -28,18 +28,18 @@ module Coverband
         return if running?
 
         logger.debug("Coverband: Starting background reporting") if Coverband.configuration.verbose
-        sleep_seconds = Coverband.configuration.background_reporting_sleep_seconds
+        sleep_seconds = Coverband.configuration.background_reporting_sleep_seconds.to_i
         @thread = Thread.new {
           loop do
             Coverband.report_coverage
             Coverband.configuration.view_tracker&.report_views_tracked
             if Coverband.configuration.reporting_wiggle
-              sleep_seconds = Coverband.configuration.background_reporting_sleep_seconds + rand(Coverband.configuration.reporting_wiggle.to_i)
+              sleep_seconds = Coverband.configuration.background_reporting_sleep_seconds.to_i + rand(Coverband.configuration.reporting_wiggle.to_i)
             end
             if Coverband.configuration.verbose
               logger.debug("Coverband: background reporting coverage (#{Coverband.configuration.store.type}). Sleeping #{sleep_seconds}s")
             end
-            sleep(sleep_seconds)
+            sleep(sleep_seconds.to_i)
           end
         }
       end

data/lib/coverband/reporters/web.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "coverband"
+
 begin
   require "rack"
 rescue LoadError
@@ -11,10 +13,6 @@ module Coverband
     class Web
       attr_reader :request
 
-      def initialize
-        init_web
-      end
-
       def init_web
         full_path = Gem::Specification.find_by_name("coverband").full_gem_path
         @static = Rack::Static.new(self,

data/lib/coverband/utils/railtie.rb

@@ -15,11 +15,16 @@ module Coverband
         app.middleware.use Coverband::BackgroundMiddleware
 
         if Coverband.configuration.track_views
-          CoverbandViewTracker = Coverband::Collectors::ViewTracker.new
-          Coverband.configuration.view_tracker = CoverbandViewTracker
+          COVERBAND_VIEW_TRACKER = if Coverband.coverband_service?
+            Coverband::Collectors::ViewTrackerService.new
+          else
+            Coverband::Collectors::ViewTracker.new
+          end
+
+          Coverband.configuration.view_tracker = COVERBAND_VIEW_TRACKER
 
           ActiveSupport::Notifications.subscribe(/render_partial.action_view|render_template.action_view/) do |name, start, finish, id, payload|
-            CoverbandViewTracker.track_views(name, start, finish, id, payload) unless name.include?("!")
+            COVERBAND_VIEW_TRACKER.track_views(name, start, finish, id, payload) unless name.include?("!")
           end
         end
       rescue Redis::CannotConnectError => error
@@ -30,6 +35,7 @@ module Coverband
 
     config.after_initialize do
       unless Coverband.tasks_to_ignore?
+        Coverband.configure
         Coverband.eager_loading_coverage!
         Coverband.report_coverage
         Coverband.runtime_coverage!
@@ -39,7 +45,6 @@ module Coverband
     config.before_configuration do
       unless ENV["COVERBAND_DISABLE_AUTO_START"]
         begin
-          Coverband.configure
           Coverband.start
         rescue Redis::CannotConnectError => error
           Coverband.configuration.logger.info "Redis is not available (#{error}), Coverband not configured"

data/lib/coverband/utils/tasks.rb

@@ -12,6 +12,7 @@ namespace :coverband do
   desc "report runtime Coverband code coverage"
   task :coverage_server do
     Rake.application["environment"].invoke if Rake::Task.task_defined?("environment")
+    Coverband.configuration.store.merge_mode = true if Coverband.configuration.store.is_a?(Coverband::Adapters::FileStore)
     Rack::Server.start app: Coverband::Reporters::Web.new, Port: ENV.fetch("COVERBAND_COVERAGE_PORT", 1022).to_i
   end
 

data/lib/coverband/version.rb

@@ -5,5 +5,5 @@
 # use format '4.2.1.rc.1' ~> 4.2.1.rc to prerelease versions like v4.2.1.rc.2 and v4.2.1.rc.3
 ###
 module Coverband
-  VERSION = "5.0.0.rc.3"
+  VERSION = "5.0.0.rc.4"
 end

data/test/coverband/adapters/file_store_test.rb

@@ -13,14 +13,13 @@ class AdaptersFileStoreTest < Minitest::Test
     def setup
       super
       @test_file_path = "/tmp/coverband_filestore_test_path.json"
-      File.open(@test_file_path, "w") { |f| f.write(test_data.to_json) }
+      previous_file_path = "#{@test_file_path}.#{::Process.pid}"
+      `rm #{@test_file_path}` if File.exist?(@test_file_path)
+      `rm #{previous_file_path}` if File.exist?(previous_file_path)
+      File.open(previous_file_path, "w") { |f| f.write(test_data.to_json) }
       @store = Coverband::Adapters::FileStore.new(@test_file_path)
     end
 
-    def test_size
-      assert @store.size > 1
-    end
-
     def test_coverage
       assert_equal @store.coverage["dog.rb"]["data"][0], 1
       assert_equal @store.coverage["dog.rb"]["data"][1], 2
@@ -31,7 +30,7 @@ class AdaptersFileStoreTest < Minitest::Test
     end
 
     def test_covered_files
-      assert_equal @store.covered_files, ["dog.rb"]
+      assert @store.covered_files.include?("dog.rb")
     end
 
     def test_clear
@@ -43,6 +42,7 @@ class AdaptersFileStoreTest < Minitest::Test
       mock_file_hash
       @store.send(:save_report, "cat.rb" => [0, 1])
       assert_equal @store.coverage["cat.rb"]["data"][1], 1
+      assert @store.size > 1
     end
 
     def test_data

data/test/coverband/adapters/web_service_store_test.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require File.expand_path("../../test_helper", File.dirname(__FILE__))
+require File.expand_path("../../../lib/coverband/adapters/web_service_store", File.dirname(__FILE__))
+
+class WebServiceStoreTest < Minitest::Test
+  COVERBAND_SERVICE_URL = "http://localhost:12345"
+  FAKE_API_KEY = "12345"
+
+  def setup
+    WebMock.disable_net_connect!
+    super
+    @store = Coverband::Adapters::WebServiceStore.new(COVERBAND_SERVICE_URL)
+    Coverband.configuration.store = @store
+  end
+
+  def test_coverage
+    Coverband.configuration.api_key = FAKE_API_KEY
+    stub_request(:post, "#{COVERBAND_SERVICE_URL}/api/collector").to_return(body: {status: "OK"}.to_json, status: 200)
+    mock_file_hash
+    @store.save_report(basic_coverage)
+  end
+
+  # TODO: sort out a retry test
+  # def test_retries
+  #   Coverband.configuration.api_key = FAKE_API_KEY
+  #   stub_request(:post, "#{COVERBAND_SERVICE_URL}/api/collector").to_return(body: {status: "OK"}.to_json, status: 200)
+  #   mock_file_hash
+  #   @store.save_report(basic_coverage)
+  # end
+
+  def test_no_webservice_call_without_api_key
+    Coverband.configuration.api_key = nil
+    mock_file_hash
+    @store.save_report(basic_coverage)
+  end
+
+  def test_clear
+    assert_raises RuntimeError do
+      @store.clear!
+    end
+  end
+
+  def test_clear_file
+    assert_raises RuntimeError do
+      @store.clear_file!("app_path/dog.rb")
+    end
+  end
+
+  def test_size
+    mock_file_hash
+    @store.type = :eager_loading
+    @store.save_report("app_path/dog.rb" => [0, 1, 1])
+    assert @store.size, 1
+  end
+end

data/test/coverband/collectors/delta_test.rb

@@ -114,6 +114,7 @@ class CollectorsDeltaTest < Minitest::Test
           oneshot_lines: [2, 3]
         }
       }
+      Coverband::Collectors::Delta.class_variable_set(:@@project_directory, "dealership.rb")
       ::Coverage.expects(:line_stub).with("dealership.rb").returns([nil, 0, 0, nil])
       results = Coverband::Collectors::Delta.results(mock_coverage(current_coverage))
       expected = {

data/test/coverband/integrations/background_test.rb

@@ -15,7 +15,7 @@ class BackgroundTest < Minitest::Test
   def test_start
     Thread.expects(:new).yields.returns(ThreadDouble.new(true))
     Coverband::Background.expects(:loop).yields
-    Coverband::Background.expects(:sleep).with(30)
+    Coverband::Background.expects(:sleep).with(60)
     Coverband::Collectors::Coverage.instance.expects(:report_coverage).once
     2.times { Coverband::Background.start }
   end
@@ -23,7 +23,7 @@ class BackgroundTest < Minitest::Test
   def test_start_with_wiggle
     Thread.expects(:new).yields.returns(ThreadDouble.new(true))
     Coverband::Background.expects(:loop).yields
-    Coverband::Background.expects(:sleep).with(35)
+    Coverband::Background.expects(:sleep).with(65)
     Coverband::Background.expects(:rand).with(10).returns(5)
     Coverband.configuration.reporting_wiggle = 10
     Coverband::Collectors::Coverage.instance.expects(:report_coverage).once
@@ -33,7 +33,7 @@ class BackgroundTest < Minitest::Test
   def test_start_dead_thread
     Thread.expects(:new).yields.returns(ThreadDouble.new(false)).twice
     Coverband::Background.expects(:loop).yields.twice
-    Coverband::Background.expects(:sleep).with(30).twice
+    Coverband::Background.expects(:sleep).with(60).twice
     Coverband::Collectors::Coverage.instance.expects(:report_coverage).twice
     2.times { Coverband::Background.start }
   end

data/test/test_helper.rb

@@ -21,6 +21,7 @@ require "coverband/utils/source_file"
 require "coverband/utils/lines_classifier"
 require "coverband/utils/results"
 require "coverband/reporters/html_report"
+require "webmock/minitest"
 
 # require 'pry-byebug' unless ENV['CI'] # Ruby 2.3 on CI crashes on pry & JRuby doesn't support it
 require_relative "unique_files"
@@ -51,6 +52,7 @@ module Coverband
       Coverband::Collectors::Coverage.instance.reset_instance
       Coverband::Utils::RelativeFileConverter.reset
       Coverband::Utils::AbsoluteFileConverter.reset
+      Coverband.configuration.reporting_wiggle = 0
       Coverband.configuration.redis_namespace = "coverband_test"
       Coverband::Background.stop
       Coverband.configuration.store.instance_variable_set(:@redis, redis)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coverband
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc.3
+  version: 5.0.0.rc.4
 platform: ruby
 authors:
 - Dan Mayer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-30 00:00:00.000000000 Z
+date: 2020-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -207,6 +207,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -249,10 +263,13 @@ files:
 - lib/coverband/adapters/file_store.rb
 - lib/coverband/adapters/hash_redis_store.rb
 - lib/coverband/adapters/redis_store.rb
+- lib/coverband/adapters/stdout_store.rb
+- lib/coverband/adapters/web_service_store.rb
 - lib/coverband/at_exit.rb
 - lib/coverband/collectors/coverage.rb
 - lib/coverband/collectors/delta.rb
 - lib/coverband/collectors/view_tracker.rb
+- lib/coverband/collectors/view_tracker_service.rb
 - lib/coverband/configuration.rb
 - lib/coverband/integrations/background.rb
 - lib/coverband/integrations/background_middleware.rb
@@ -319,6 +336,7 @@ files:
 - test/coverband/adapters/file_store_test.rb
 - test/coverband/adapters/hash_redis_store_test.rb
 - test/coverband/adapters/redis_store_test.rb
+- test/coverband/adapters/web_service_store_test.rb
 - test/coverband/at_exit_test.rb
 - test/coverband/collectors/coverage_test.rb
 - test/coverband/collectors/delta_test.rb
@@ -436,6 +454,7 @@ test_files:
 - test/coverband/adapters/file_store_test.rb
 - test/coverband/adapters/hash_redis_store_test.rb
 - test/coverband/adapters/redis_store_test.rb
+- test/coverband/adapters/web_service_store_test.rb
 - test/coverband/at_exit_test.rb
 - test/coverband/collectors/coverage_test.rb
 - test/coverband/collectors/delta_test.rb