coverband 2.0.3 → 3.0.0.alpha

data/test/unit/middleware_test.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require File.expand_path('../test_helper', File.dirname(__FILE__))
-require File.expand_path('../fake_app/basic_rack', File.dirname(__FILE__))
 require 'rack'
 
 class MiddlewareTest < Test::Unit::TestCase
@@ -9,62 +8,51 @@ class MiddlewareTest < Test::Unit::TestCase
 
   def setup
     Coverband.configure do |config|
-      config.redis             = nil
-      config.store             = nil
-      config.collector         = 'trace'
-      config.store             = Coverband::Adapters::RedisStore.new(Redis.new)
+      config.store = Coverband::Adapters::RedisStore.new(Redis.new)
     end
   end
 
   test 'call app' do
     request = Rack::MockRequest.env_for('/anything.json')
-    Coverband::Collectors::Base.instance.reset_instance
+    Coverband::Collectors::Coverage.instance.reset_instance
     middleware = Coverband::Middleware.new(fake_app)
     results = middleware.call(request)
     assert_equal '/anything.json', results.last
   end
 
   test 'pass all rack lint checks' do
-    Coverband::Collectors::Base.instance.reset_instance
+    Coverband::Collectors::Coverage.instance.reset_instance
     app = Rack::Lint.new(Coverband::Middleware.new(fake_app))
     env = Rack::MockRequest.env_for('/hello')
     app.call(env)
   end
 
-  test 'always be enabled with sample percentage of 100' do
-    request = Rack::MockRequest.env_for('/anything.json')
-    Coverband::Collectors::Base.instance.reset_instance
-    middleware = Coverband::Middleware.new(fake_app)
-    assert_equal false, Coverband::Collectors::Base.instance.instance_variable_get('@enabled')
-    Coverband::Collectors::Base.instance.instance_variable_set('@sample_percentage', 100.0)
-    middleware.call(request)
-    assert_equal true, Coverband::Collectors::Base.instance.instance_variable_get('@enabled')
-  end
-
-  test 'never be enabled with sample percentage of 0' do
+  test 'never be report coverage with reporting_frequency of 0' do
     request = Rack::MockRequest.env_for('/anything.json')
-    Coverband::Collectors::Base.instance.reset_instance
+    Coverband::Collectors::Coverage.instance.reset_instance
+    collector = Coverband::Collectors::Coverage.instance
+    collector.instance_variable_set('@reporting_frequency', 0.0)
     middleware = Coverband::Middleware.new(fake_app)
-    assert_equal false, Coverband::Collectors::Base.instance.instance_variable_get('@enabled')
-    Coverband::Collectors::Base.instance.instance_variable_set('@sample_percentage', 0.0)
+    store = Coverband::Collectors::Coverage.instance.instance_variable_get('@store')
+    store.expects(:save_report).never
     middleware.call(request)
-    assert_equal false, Coverband::Collectors::Base.instance.instance_variable_get('@enabled')
   end
 
-  test 'always record coverage, set trace func, and add_files when sampling' do
+  test 'always be enabled with sample percentage of 100' do
     request = Rack::MockRequest.env_for('/anything.json')
-    Coverband::Collectors::Base.instance.reset_instance
+    Coverband::Collectors::Coverage.instance.reset_instance
+    collector = Coverband::Collectors::Coverage.instance
+    collector.instance_variable_set('@reporting_frequency', 100.0)
     middleware = Coverband::Middleware.new(fake_app)
-    assert_equal false, Coverband::Collectors::Base.instance.instance_variable_get('@enabled')
-    Coverband::Collectors::Base.instance.instance_variable_set('@sample_percentage', 100.0)
+    store = Coverband::Collectors::Coverage.instance.instance_variable_get('@store')
+    store.expects(:save_report).once
     middleware.call(request)
-    assert_equal true, Coverband::Collectors::Base.instance.instance_variable_get('@enabled')
   end
 
   test 'reports coverage when an error is raised' do
     request = Rack::MockRequest.env_for('/anything.json')
-    Coverband::Collectors::Base.instance.reset_instance
-    Coverband::Collectors::Base.instance.expects(:report_coverage).once
+    Coverband::Collectors::Coverage.instance.reset_instance
+    Coverband::Collectors::Coverage.instance.expects(:report_coverage).once
     middleware = Coverband::Middleware.new(fake_app_raise_error)
     begin
       middleware.call(request)
@@ -73,39 +61,15 @@ class MiddlewareTest < Test::Unit::TestCase
     end
   end
 
-  test 'always report coverage when sampling' do
-    request = Rack::MockRequest.env_for('/anything.json')
-    Coverband::Collectors::Base.instance.reset_instance
-    middleware = Coverband::Middleware.new(fake_app_with_lines)
-    assert_equal false, Coverband::Collectors::Base.instance.instance_variable_get('@enabled')
-    Coverband::Collectors::Base.instance.instance_variable_set('@sample_percentage', 100.0)
-    fake_redis = Redis.new
-    redis_store = Coverband::Adapters::RedisStore.new(fake_redis)
-    redis_store.clear!
-    Coverband::Collectors::Base.instance.reset_instance
-    Coverband::Collectors::Base.instance.instance_variable_set('@store', redis_store)
-    fake_redis.expects(:sadd).at_least_once
-    fake_redis.expects(:mapped_hmset).at_least_once
-    fake_redis.expects(:mapped_hmset).at_least_once.with("#{BASE_KEY}.#{basic_rack_ruby_file}", '7' => 1)
-    middleware.call(request)
-    assert_equal true, Coverband::Collectors::Base.instance.instance_variable_get('@enabled')
-  end
-
   private
 
   def fake_app
-    @fake_app ||= ->(env) { [200, { 'Content-Type' => 'text/plain' }, env['PATH_INFO']] }
+    @fake_app ||= lambda do |env|
+      [200, { 'Content-Type' => 'text/plain' }, env['PATH_INFO']]
+    end
   end
 
   def fake_app_raise_error
-    @fake_app_raise_error ||= -> { raise 'sh** happens' }
-  end
-
-  def fake_app_with_lines
-    @fake_app_with_lines ||= ::HelloWorld.new
-  end
-
-  def basic_rack_ruby_file
-    File.expand_path('../fake_app/basic_rack.rb', File.dirname(__FILE__))
+    @fake_app_raise_error ||= -> { raise 'hell' }
   end
 end

data/test/unit/reports_base_test.rb

@@ -57,54 +57,6 @@ class ReportsBaseTest < Test::Unit::TestCase
     assert_equal '/full/remote_app/path/is/a/path.rb', Coverband::Reporters::Base.filename_from_key(key, roots)
   end
 
-  test 'line_hash gets correct hash entry for a line key' do
-    @fake_redis = fake_redis
-    store = Coverband::Adapters::RedisStore.new(@fake_redis)
-
-    Coverband.configure do |config|
-      config.redis             = @fake_redis
-      config.reporter          = 'std_out'
-      config.root              = '/full/remote_app/path'
-    end
-
-    key = '/full/remote_app/path/is/a/path.rb'
-    # the code takes config.root expands and adds a '/'
-    roots = ['/app/', '/full/remote_app/path/']
-
-    lines_hit = [1, 3, 6]
-    store.stubs(:covered_lines_for_file).returns(lines_hit)
-    # expects to show hit counts on 1,3,6
-    expected = { '/full/remote_app/path/is/a/path.rb' => [1, nil, 1, nil, nil, 1] }
-    File.stubs(:exist?).returns(true)
-    File.stubs(:foreach).returns(['line 1', 'line2', 'line3', 'line4', 'line5', 'line6'])
-
-    assert_equal expected, Coverband::Reporters::Base.line_hash(store, key, roots)
-  end
-
-  test 'line_hash adjusts relative paths' do
-    @fake_redis = fake_redis
-    store = Coverband::Adapters::RedisStore.new(@fake_redis)
-
-    Coverband.configure do |config|
-      config.redis             = @fake_redis
-      config.reporter          = 'std_out'
-      config.root              = '/full/remote_app/path'
-    end
-
-    key = './is/a/path.rb'
-    # the code takes config.root expands and adds a '/'
-    roots = ['/app/', '/full/remote_app/path/']
-
-    lines_hit = [1, 3, 6]
-    store.stubs(:covered_lines_for_file).returns(lines_hit)
-    # expects to show hit counts on 1,3,6
-    expected = { '/full/remote_app/path/is/a/path.rb' => [1, nil, 1, nil, nil, 1] }
-    File.stubs(:exist?).returns(true)
-    File.stubs(:foreach).returns(['line 1', 'line2', 'line3', 'line4', 'line5', 'line6'])
-
-    assert_equal expected, Coverband::Reporters::Base.line_hash(store, key, roots)
-  end
-
   test '#merge_arrays basic merge preserves order and counts' do
     first = [0, 0, 1, 0, 1]
     second = [nil, 0, 1, 0, 0]
@@ -121,46 +73,35 @@ class ReportsBaseTest < Test::Unit::TestCase
     assert_equal expects, Coverband::Reporters::Base.merge_arrays(first, second)
   end
 
-  test '#merge_existing_coverage basic merge preserves order and counts different lengths' do
-    first = { 'file.rb' => [0, 1, 2, nil, nil, nil] }
-    second = { 'file.rb' => [0, 1, 2, nil, 0, 1, 2] }
-    expects = { 'file.rb' => [0, 2, 4, nil, 0, 1, 2] }
+  test '#merge_arrays basic merge preserves nils' do
+    first = [0, 1, 2, nil, nil, nil]
+    second = [0, 1, 2, nil, 0, 1, 2]
+    expects = [0, 2, 4, nil, 0, 1, 2]
 
-    assert_equal expects, Coverband::Reporters::Base.merge_existing_coverage(first, second)
-  end
-
-  test '#merge_existing_coverage mismatched' do
-    first = { 'file.rb' => [0, 1, 2, nil, nil, nil] }
-    second = { 'diff.rb' => [0, 1, 2, nil, 0, 1, 2] }
-    expects = { 'file.rb' => [0, 1, 2, nil, nil, nil],
-                'diff.rb' => [0, 1, 2, nil, 0, 1, 2] }
-
-    assert_equal expects, Coverband::Reporters::Base.merge_existing_coverage(first, second)
+    assert_equal expects, Coverband::Reporters::Base.merge_arrays(first, second)
   end
 
   test "#get_current_scov_data_imp doesn't ignore folders with default ignore keys" do
-    @fake_redis = fake_redis
-    store = Coverband::Adapters::RedisStore.new(@fake_redis)
+    @redis = Redis.new
+    store = Coverband::Adapters::RedisStore.new(@redis)
+    store.clear!
 
     Coverband.configure do |config|
-      config.redis             = @fake_redis
       config.reporter          = 'std_out'
-      config.ignore            = %w[vendor .erb$ .slim$]
+      config.ignore            = %w(vendor .erb$ .slim$)
       config.root              = '/full/remote_app/path'
+      config.store             = store
     end
 
     key = '/a_path/that_has_erb_in/thepath.rb'
     roots = ['/app/', '/full/remote_app/path/']
 
     lines_hit = [1, 3, 6]
-    store.stubs(:covered_lines_for_file).returns(lines_hit)
-    # expects to show hit counts on 1,3,6
-    expected = { '/a_path/that_has_erb_in/thepath.rb' => [1, nil, 1, nil, nil, 1] }
+    store.stubs(:coverage).returns(key => lines_hit)
+    expected = { key => [1, 3, 6] }
     File.stubs(:exist?).returns(true)
     File.stubs(:foreach).returns(['line 1', 'line2', 'line3', 'line4', 'line5', 'line6'])
 
-    # assert_equal expected, Coverband::Reporters::Base.line_hash(store, key, roots)
-    store.expects(:covered_files).returns([key])
     assert_equal expected, Coverband::Reporters::Base.get_current_scov_data_imp(store, roots)
   end
 end

data/test/unit/reports_console_test.rb

@@ -7,37 +7,24 @@ class SimpleCovReportTest < Test::Unit::TestCase
 
   def setup
     @redis = Redis.new
-    @redis.flushdb
     @store = Coverband::Adapters::RedisStore.new(@redis)
-  end
-
-  def example_hash
-    {'1' => '1', '2' => '2'}
-  end
-
-  def combined_report
-    {
-      "#{BASE_KEY}.test/unit/dog.rb" => {
-        new: example_hash,
-        existing: {}
-      }
-    }
+    @store.clear!
   end
 
   test 'report data' do
     Coverband.configure do |config|
-      config.redis             = @redis
-      config.reporter          = 'std_out'
-      config.store             = @store
+      config.reporter            = 'std_out'
+      config.store               = @store
+      config.reporting_frequency = 100.0
     end
     Coverband.configuration.logger.stubs('info')
-    Coverband::Reporters::ConsoleReport.expects(:current_root).returns('./test/unit')
-
-    @redis.sadd(BASE_KEY, 'test/unit/dog.rb')
-    @store.send(:pipelined_save, combined_report)
+    Coverband::Reporters::ConsoleReport
+      .expects(:current_root)
+      .returns('app_path')
+    @store.send(:save_report, basic_coverage)
 
     report = Coverband::Reporters::ConsoleReport.report(@store)
-    expected = {"test/unit/dog.rb"=>[1, 2, nil, nil, nil, nil, nil]}
+    expected = { 'app_path/dog.rb' => [0, 1, 2] }
     assert_equal(expected, report)
   end
 end

data/test/unit/reports_simple_cov_test.rb

@@ -7,12 +7,8 @@ class ReportsSimpleCovTest < Test::Unit::TestCase
 
   def setup
     @redis = Redis.new
-    @redis.flushdb
     @store = Coverband::Adapters::RedisStore.new(@redis)
-  end
-
-  def example_hash
-    {'1' => '1', '2' => '2'}
+    @store.clear!
   end
 
   def combined_report
@@ -26,16 +22,13 @@ class ReportsSimpleCovTest < Test::Unit::TestCase
 
   test 'generate scov report' do
     Coverband.configure do |config|
-      config.redis             = @redis
       config.reporter          = 'scov'
-      config.s3_bucket         = nil
       config.store             = @store
+      config.s3_bucket         = nil
       config.ignore            = ['notsomething.rb']
     end
     Coverband.configuration.logger.stubs('info')
-
-    @redis.sadd(BASE_KEY, 'test/unit/dog.rb')
-    @store.send(:pipelined_save, combined_report)
+    @store.send(:save_report, basic_coverage)
 
     SimpleCov.expects(:track_files)
     SimpleCov.expects(:add_not_loaded_files).returns({})
@@ -44,31 +37,4 @@ class ReportsSimpleCovTest < Test::Unit::TestCase
 
     Coverband::Reporters::SimpleCovReport.report(@store, open_report: false)
   end
-
-  test 'generate scov report with additional data' do
-    Coverband.configure do |config|
-      config.redis             = @redis
-      config.reporter          = 'scov'
-      config.s3_bucket         = nil
-      config.store             = @store
-      config.ignore            = ['notsomething.rb']
-    end
-
-    Coverband::Reporters::SimpleCovReport.expects(:current_root).at_least_once.returns('/tmp/root_dir')
-
-    @redis.sadd(BASE_KEY, 'test/unit/dog.rb')
-    @store.send(:pipelined_save, combined_report)
-    SimpleCov.expects(:track_files)
-    SimpleCov.expects(:add_not_loaded_files).returns('fake_file.rb' => [1])
-    SimpleCov::Result.any_instance.expects(:format!)
-    SimpleCov.stubs(:root)
-
-
-    Coverband.configuration.logger.stubs('info')
-    additional_data = [
-      fake_coverage_report
-    ]
-
-    Coverband::Reporters::SimpleCovReport.report(@store, open_report: false, additional_scov_data: additional_data)
-  end
 end

data/test/unit/reports_web_test.rb

@@ -16,6 +16,10 @@ if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.2.0')
         Coverband::Reporters::Web.new
       end
 
+      def teardown
+        Coverband.configuration.s3_bucket = nil
+      end
+
       # TODO add tests for all endpoints
       test 'renders index content' do
         get '/'

data/test/unit/{s3_report_writer_test.rb → utils_s3_report_writer_test.rb}

@@ -24,7 +24,7 @@ module Coverband
         access_key_id: '',
         secret_access_key: ''
       }
-      S3ReportWriter.new('coverage-bucket', s3_writer_options).persist!
+      Coverband::Utils::S3ReportWriter.new('coverage-bucket', s3_writer_options).persist!
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coverband
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 3.0.0.alpha
 platform: ruby
 authors:
 - Dan Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-11 00:00:00.000000000 Z
+date: 2018-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  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: json
   requirement: !ruby/object:Gem::Requirement
@@ -186,6 +200,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE
@@ -198,39 +213,36 @@ files:
 - lib/coverband.rb
 - lib/coverband/adapters/base.rb
 - lib/coverband/adapters/file_store.rb
-- lib/coverband/adapters/memory_cache_store.rb
 - lib/coverband/adapters/redis_store.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/integrations/background.rb
+- lib/coverband/integrations/middleware.rb
 - lib/coverband/reporters/base.rb
 - lib/coverband/reporters/console_report.rb
 - lib/coverband/reporters/simple_cov_report.rb
 - lib/coverband/reporters/web.rb
-- lib/coverband/s3_report_writer.rb
-- lib/coverband/tasks.rb
+- lib/coverband/utils/s3_report_writer.rb
+- lib/coverband/utils/tasks.rb
 - lib/coverband/version.rb
 - test/benchmarks/.gitignore
 - test/benchmarks/benchmark.rake
 - test/benchmarks/dog.rb
 - test/fake_app/basic_rack.rb
 - test/test_helper.rb
+- test/unit/adapters_base_test.rb
 - test/unit/adapters_file_store_test.rb
-- test/unit/adapters_memory_cache_store_test.rb
 - test/unit/adapters_redis_store_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/full_stack_test.rb
 - test/unit/middleware_test.rb
 - test/unit/reports_base_test.rb
 - test/unit/reports_console_test.rb
 - test/unit/reports_simple_cov_test.rb
 - test/unit/reports_web_test.rb
-- test/unit/s3_report_writer_test.rb
+- test/unit/utils_s3_report_writer_test.rb
 homepage: https://github.com/danmayer/coverband
 licenses:
 - MIT
@@ -246,9 +258,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
@@ -261,17 +273,16 @@ test_files:
 - test/benchmarks/dog.rb
 - test/fake_app/basic_rack.rb
 - test/test_helper.rb
+- test/unit/adapters_base_test.rb
 - test/unit/adapters_file_store_test.rb
-- test/unit/adapters_memory_cache_store_test.rb
 - test/unit/adapters_redis_store_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/full_stack_test.rb
 - test/unit/middleware_test.rb
 - test/unit/reports_base_test.rb
 - test/unit/reports_console_test.rb
 - test/unit/reports_simple_cov_test.rb
 - test/unit/reports_web_test.rb
-- test/unit/s3_report_writer_test.rb
+- test/unit/utils_s3_report_writer_test.rb