coverband 1.5.4 → 2.0.0.alpha

data/test/unit/reports_console_test.rb

@@ -1,37 +1,34 @@
+# frozen_string_literal: true
+
 require File.expand_path('../test_helper', File.dirname(__FILE__))
 
 class SimpleCovReportTest < Test::Unit::TestCase
   BASE_KEY = Coverband::Adapters::RedisStore::BASE_KEY
 
   def setup
-    @fake_redis = fake_redis
-    @store = Coverband::Adapters::RedisStore.new(@fake_redis, array: true)
+    @redis = Redis.new
+    @redis.flushdb
+    @store = Coverband::Adapters::RedisStore.new(@redis)
+  end
+
+  def example_hash
+    {'1' => '1', '2' => '2'}
   end
 
-  test "report data" do
+  test 'report data' do
     Coverband.configure do |config|
-      config.redis             = @fake_redis
+      config.redis             = @redis
       config.reporter          = 'std_out'
+      config.store             = @store
     end
-
-    Coverband::Reporters::ConsoleReport.expects(:current_root).returns('/tmp/root_dir')
-    @fake_redis.expects(:smembers).with(BASE_KEY).returns(fake_coverband_members)
-    
-    fake_coverband_members.each do |key|
-      File.expects(:exists?).with(key).returns(true)
-      File.expects(:foreach).with(key).returns(Array.new(4){'LOC'})
-      @fake_redis.expects(:smembers).with("#{BASE_KEY}.#{key}").returns(["1", "3"])
-    end
-    
     Coverband.configuration.logger.stubs('info')
+    Coverband::Reporters::ConsoleReport.expects(:current_root).returns('./test/unit')
 
-    report = Coverband::Reporters::ConsoleReport.report(@store)
-    expected = {"/Users/danmayer/projects/hearno/app/controllers/application_controller.rb"=>
-                  [1, nil, 1, nil],
-                "/Users/danmayer/projects/hearno/app/models/account.rb"=>[1, nil, 1, nil],
-                "/Users/danmayer/projects/hearno/script/tester.rb"=>[1, nil, 1, nil]}
+    @redis.sadd(BASE_KEY, 'test/unit/dog.rb')
+    @store.send(:store_map, "#{BASE_KEY}.test/unit/dog.rb", example_hash)
 
+    report = Coverband::Reporters::ConsoleReport.report(@store)
+    expected = {"test/unit/dog.rb"=>[1, 2, nil, nil, nil, nil, nil]}
     assert_equal(expected, report)
   end
-
-end
+end

data/test/unit/reports_simple_cov_test.rb

@@ -1,61 +1,59 @@
+# frozen_string_literal: true
+
 require File.expand_path('../test_helper', File.dirname(__FILE__))
 
 class ReportsSimpleCovTest < Test::Unit::TestCase
   BASE_KEY = Coverband::Adapters::RedisStore::BASE_KEY
 
   def setup
-    @fake_redis = fake_redis
-    @store = Coverband::Adapters::RedisStore.new(@fake_redis, array: true)
+    @redis = Redis.new
+    @redis.flushdb
+    @store = Coverband::Adapters::RedisStore.new(@redis)
+  end
+
+  def example_hash
+    {'1' => '1', '2' => '2'}
   end
 
-  test "generate scov report" do
+  test 'generate scov report' do
     Coverband.configure do |config|
-      config.redis             = @fake_redis
+      config.redis             = @redis
       config.reporter          = 'scov'
       config.s3_bucket         = nil
-      config.ignore            = ["notsomething.rb"]
+      config.store             = @store
+      config.ignore            = ['notsomething.rb']
     end
+    Coverband.configuration.logger.stubs('info')
 
-    Coverband::Reporters::SimpleCovReport.expects(:current_root).at_least_once.returns('/tmp/root_dir')
-    @fake_redis.expects(:smembers).with(BASE_KEY).returns(fake_coverband_members)
+    @redis.sadd(BASE_KEY, 'test/unit/dog.rb')
+    @store.send(:store_map, "#{BASE_KEY}.test/unit/dog.rb", example_hash)
 
     SimpleCov.expects(:track_files)
     SimpleCov.expects(:add_not_loaded_files).returns({})
     SimpleCov::Result.any_instance.expects(:format!)
     SimpleCov.stubs(:root)
 
-    fake_coverband_members.each do |key|
-      File.expects(:exists?).with(key).returns(true)
-      File.expects(:foreach).with(key).returns(Array.new(60){'LOC'})
-      @fake_redis.expects(:smembers).with("#{BASE_KEY}.#{key}").returns(["54", "55"])
-    end
-    
-    Coverband.configuration.logger.stubs('info')
-
     Coverband::Reporters::SimpleCovReport.report(@store, open_report: false)
   end
 
-  test "generate scov report with additional data" do
+  test 'generate scov report with additional data' do
     Coverband.configure do |config|
-      config.redis             = @fake_redis
+      config.redis             = @redis
       config.reporter          = 'scov'
       config.s3_bucket         = nil
-      config.ignore            = ["notsomething.rb"]
+      config.store             = @store
+      config.ignore            = ['notsomething.rb']
     end
 
     Coverband::Reporters::SimpleCovReport.expects(:current_root).at_least_once.returns('/tmp/root_dir')
-    @fake_redis.expects(:smembers).with(BASE_KEY).returns(fake_coverband_members)
 
+    @redis.sadd(BASE_KEY, 'test/unit/dog.rb')
+    @store.send(:store_map, "#{BASE_KEY}.test/unit/dog.rb", example_hash)
     SimpleCov.expects(:track_files)
-    SimpleCov.expects(:add_not_loaded_files).returns({"fake_file.rb" => [1]})
+    SimpleCov.expects(:add_not_loaded_files).returns('fake_file.rb' => [1])
     SimpleCov::Result.any_instance.expects(:format!)
     SimpleCov.stubs(:root)
 
-    fake_coverband_members.each do |key|
-      File.expects(:exists?).with(key).returns(true)
-      File.expects(:foreach).with(key).returns(['a','b','c'])
-      @fake_redis.expects(:smembers).with("#{BASE_KEY}.#{key}").returns(["54", "55"])
-    end
 
     Coverband.configuration.logger.stubs('info')
     additional_data = [
@@ -64,5 +62,4 @@ class ReportsSimpleCovTest < Test::Unit::TestCase
 
     Coverband::Reporters::SimpleCovReport.report(@store, open_report: false, additional_scov_data: additional_data)
   end
-
 end

data/test/unit/s3_report_writer_test.rb

@@ -1,16 +1,16 @@
+# frozen_string_literal: true
+
 require File.expand_path('../test_helper', File.dirname(__FILE__))
 require 'aws-sdk'
 
 module Coverband
-
   class S3ReportWriterTest < Test::Unit::TestCase
-
     def html_version
-      "#{Gem::Specification.find_by_name('simplecov-html').version.version}"
-    rescue
-      "0.10.1"
+      Gem::Specification.find_by_name('simplecov-html').version.version.to_s
+    rescue StandardError
+      '0.10.1'
     end
-    
+
     test 'it writes the coverage report to s3' do
       s3 = mock('s3_resource')
       bucket = mock('bucket')
@@ -22,7 +22,5 @@ module Coverband
       Aws::S3::Resource.expects(:new).returns(s3)
       S3ReportWriter.new('coverage-bucket').persist!
     end
-
   end
-
 end

data/test/unit/s3_web_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path('../test_helper', File.dirname(__FILE__))
 require File.expand_path('../../lib/coverband/s3_web', File.dirname(__FILE__))
 require 'rack/test'
@@ -6,7 +8,6 @@ ENV['RACK_ENV'] = 'test'
 
 module Coverband
   class S3WebTest < Test::Unit::TestCase
-
     include Rack::Test::Methods
 
     def app

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: coverband
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 2.0.0.alpha
 platform: ruby
 authors:
 - Dan Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-14 00:00:00.000000000 Z
+date: 2018-04-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -25,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: classifier-reborn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: classifier-reborn
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,47 +137,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.1
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -200,8 +214,10 @@ files:
 - lib/coverband/adapters/file_store.rb
 - lib/coverband/adapters/memory_cache_store.rb
 - lib/coverband/adapters/redis_store.rb
-- lib/coverband/base.rb
 - lib/coverband/baseline.rb
+- lib/coverband/collectors/base.rb
+- lib/coverband/collectors/coverage.rb
+- lib/coverband/collectors/trace.rb
 - lib/coverband/configuration.rb
 - lib/coverband/middleware.rb
 - lib/coverband/reporters/base.rb
@@ -219,8 +235,10 @@ files:
 - test/unit/adapters_file_store_test.rb
 - test/unit/adapters_memory_cache_store_test.rb
 - test/unit/adapters_redis_store_test.rb
-- test/unit/base_test.rb
 - test/unit/baseline_test.rb
+- test/unit/collectors_base_test.rb
+- test/unit/collectors_coverage_test.rb
+- test/unit/collectors_trace_test.rb
 - test/unit/configuration_test.rb
 - test/unit/dog.rb
 - test/unit/middleware_test.rb
@@ -244,9 +262,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1
@@ -262,8 +280,10 @@ test_files:
 - test/unit/adapters_file_store_test.rb
 - test/unit/adapters_memory_cache_store_test.rb
 - test/unit/adapters_redis_store_test.rb
-- test/unit/base_test.rb
 - test/unit/baseline_test.rb
+- test/unit/collectors_base_test.rb
+- test/unit/collectors_coverage_test.rb
+- test/unit/collectors_trace_test.rb
 - test/unit/configuration_test.rb
 - test/unit/dog.rb
 - test/unit/middleware_test.rb

data/lib/coverband/base.rb

@@ -1,210 +0,0 @@
-require 'singleton'
-require 'set'
-
-module Coverband
-  class Base
-
-    def self.instance
-      Thread.current[:coverband_instance] ||= Coverband::Base.new
-    end
-
-    def start
-      @enabled = true
-      record_coverage
-    end
-
-    def stop
-      @enabled = false
-      unset_tracer
-    end
-
-    def sample
-      configure_sampling
-      record_coverage
-      result = yield
-      report_coverage
-      result
-    end
-
-    def save
-      @enabled = true
-      report_coverage
-      @enabled = false
-    end
-
-    def extended?
-      false
-    end
-
-    def reset_instance
-      @project_directory = File.expand_path(Coverband.configuration.root)
-      @enabled = false
-      @disable_on_failure_for = Coverband.configuration.disable_on_failure_for
-      @tracer_set = false
-      @file_line_usage = {}
-      @ignored_files = Set.new
-      @startup_delay = Coverband.configuration.startup_delay
-      @ignore_patterns = Coverband.configuration.ignore + ['internal:prelude', 'schema.rb'] 
-      @ignore_patterns += ['gems'] unless Coverband.configuration.include_gems
-      @sample_percentage = Coverband.configuration.percentage
-      @store = Coverband.configuration.store
-      @store = Coverband::Adapters::MemoryCacheStore.new(@store) if Coverband.configuration.memory_caching
-      @stats    = Coverband.configuration.stats
-      @verbose  = Coverband.configuration.verbose
-      @logger   = Coverband.configuration.logger
-      @current_thread = Thread.current
-      @trace = create_trace_point
-      self
-    end
-
-    def configure_sampling
-      if @startup_delay!=0 || (rand * 100.0) > @sample_percentage
-        @startup_delay -= 1 if @startup_delay > 0
-        @enabled = false
-      else
-        @enabled = true
-      end
-    end
-
-    def record_coverage
-      if @enabled && !failed_recently?
-        set_tracer
-      else
-        unset_tracer
-      end
-      @stats.increment "coverband.request.recorded.#{@enabled}" if @stats
-    rescue RuntimeError => err
-      failed!
-      if @verbose
-        @logger.info "error stating recording coverage"
-        @logger.info "error: #{err.inspect} #{err.message}"
-      end
-    end
-
-    def report_coverage
-      unless @enabled
-        @logger.info "coverage disabled" if @verbose
-        return
-      end
-
-      unset_tracer
-
-      if failed_recently?
-        @logger.info "coverage reporting sanding-by because of recent failure" if @verbose
-        return
-      end
-
-      if @verbose
-        @logger.info "coverband file usage: #{file_usage.inspect}"
-        if @verbose=="debug"
-          output_file_line_usage
-        end
-      end
-
-      if @store
-        if @stats
-          @before_time = Time.now
-          @stats.count "coverband.files.recorded_files", @file_line_usage.length
-        end
-        @store.save_report(@file_line_usage)
-        if @stats
-          @time_spent = Time.now - @before_time
-          @stats.timing "coverband.files.recorded_time", @time_spent
-        end
-        @file_line_usage.clear
-      elsif @verbose
-        @logger.info "coverage report: "
-        @logger.info @file_line_usage.inspect
-      end
-    rescue RuntimeError => err
-      failed!
-      if @verbose
-        @logger.info "coverage missing"
-        @logger.info "error: #{err.inspect} #{err.message}"
-      end
-    end
-
-    protected
-
-    def track_file? file
-      !@ignore_patterns.any?{ |pattern| file.include?(pattern) } && file.start_with?(@project_directory)
-    end
-
-    def set_tracer
-      unless @tracer_set
-        @trace.enable
-        @tracer_set = true
-      end
-    end
-
-    def unset_tracer
-      @trace.disable
-      @tracer_set = false
-    end
-
-    def output_file_line_usage
-      @logger.info "coverband debug coverband file:line usage:"
-      @file_line_usage.sort_by {|_key, value| value.length}.each do |pair|
-                                                             file = pair.first
-                                                             lines = pair.last
-                                                             @logger.info "file: #{file} => #{lines.sort_by {|_key, value| value}}"
-                                                           end
-    end
-
-    private
-
-    def failed_at_thread_key
-      "__#{self.class.name}__failed_at"
-    end
-
-    def failed_at
-      Thread.current[failed_at_thread_key]
-    end
-
-    def failed_at=(time)
-      Thread.current[failed_at_thread_key] = time
-    end
-
-    def failed!
-      self.failed_at = Time.now
-    end
-
-    def failed_recently?
-      return false unless @disable_on_failure_for && failed_at
-      failed_at + @disable_on_failure_for > Time.now
-    end
-
-    def file_usage
-      hash = {}
-      @file_line_usage.each do |file, lines|
-        hash[file] = lines.values.inject(0, :+)
-      end
-      hash.sort_by {|_key, value| value}
-    end
-
-    def add_file(file, line)
-      @file_line_usage[file] = Hash.new(0) unless @file_line_usage.include?(file)
-      @file_line_usage[file][line] += 1
-    end
-
-    def create_trace_point
-      TracePoint.new(*Coverband.configuration.trace_point_events) do |tp|
-        if Thread.current == @current_thread
-          file = tp.path
-          if !@ignored_files.include?(file)
-            if track_file?(file)
-              add_file(file, tp.lineno)
-            else
-              @ignored_files << file
-            end
-          end
-        end
-      end
-    end
-
-    def initialize
-      reset_instance
-    end
-
-  end
-end