coverband 4.2.0.beta → 4.2.0.rc1

data/test/{unit/reports_console_test.rb → coverband/reporters/console_test.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.expand_path('../test_helper', File.dirname(__FILE__))
+require File.expand_path('../../test_helper', File.dirname(__FILE__))
 
 class HTMLReportTest < Minitest::Test
   REDIS_STORAGE_FORMAT_VERSION = Coverband::Adapters::RedisStore::REDIS_STORAGE_FORMAT_VERSION
@@ -20,13 +20,14 @@ class HTMLReportTest < Minitest::Test
     end
     Coverband.configuration.logger.stubs('info')
     mock_file_hash
-    Coverband::Reporters::ConsoleReport
-      .expects(:current_root)
-      .returns('app_path')
+    Coverband.configuration
+             .expects(:current_root)
+             .at_least_once
+             .returns('app_path')
     @store.send(:save_report, basic_coverage)
 
     report = Coverband::Reporters::ConsoleReport.report(@store)
-    expected = { 'app_path/dog.rb' => [0, 1, 2] }
+    expected = { './dog.rb' => [0, 1, 2] }
     assert_equal(expected.keys, report.keys)
   end
 end

data/test/{unit/reports_html_test.rb → coverband/reporters/html_test.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.expand_path('../test_helper', File.dirname(__FILE__))
+require File.expand_path('../../test_helper', File.dirname(__FILE__))
 
 class ReportHTMLTest < Minitest::Test
   REDIS_STORAGE_FORMAT_VERSION = Coverband::Adapters::RedisStore::REDIS_STORAGE_FORMAT_VERSION

data/test/{unit/reports_web_test.rb → coverband/reporters/web_test.rb}

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require File.expand_path('../test_helper', File.dirname(__FILE__))
+require File.expand_path('../../test_helper', File.dirname(__FILE__))
 require 'aws-sdk-s3'
-require File.expand_path('../../lib/coverband/reporters/web', File.dirname(__FILE__))
+require File.expand_path('../../../lib/coverband/reporters/web', File.dirname(__FILE__))
 require 'rack/test'
 
 ENV['RACK_ENV'] = 'test'

data/test/{unit → integration}/full_stack_test.rb

@@ -6,6 +6,7 @@ require 'rack'
 class FullStackTest < Minitest::Test
   REDIS_STORAGE_FORMAT_VERSION = Coverband::Adapters::RedisStore::REDIS_STORAGE_FORMAT_VERSION
   TEST_RACK_APP = '../fake_app/basic_rack.rb'
+  RELATIVE_FILE = './fake_app/basic_rack.rb'
 
   def setup
     super
@@ -15,6 +16,7 @@ class FullStackTest < Minitest::Test
       config.store = Coverband::Adapters::RedisStore.new(Redis.new)
       config.s3_bucket = nil
       config.background_reporting_enabled = false
+      config.root_paths = ["#{File.expand_path('../', File.dirname(__FILE__))}/"]
     end
     Coverband.configuration.store.clear!
     Coverband.start
@@ -29,13 +31,13 @@ class FullStackTest < Minitest::Test
     assert_equal 'Hello Rack!', results.last
     sleep(0.1)
     expected = [nil, nil, 1, nil, 1, 1, 1, nil, nil]
-    assert_equal expected, Coverband.configuration.store.coverage[@rack_file]['data']
+    assert_equal expected, Coverband.configuration.store.coverage[RELATIVE_FILE]['data']
 
     # additional calls increase count by 1
     middleware.call(request)
     sleep(0.1)
     expected = [nil, nil, 1, nil, 1, 1, 2, nil, nil]
-    assert_equal expected, Coverband.configuration.store.coverage[@rack_file]['data']
+    assert_equal expected, Coverband.configuration.store.coverage[RELATIVE_FILE]['data']
   end
 
   test 'call app with gem tracking' do

data/test/{unit → integration}/rails_full_stack_test.rb

@@ -10,6 +10,7 @@ class RailsFullStackTest < Minitest::Test
     super
     # The normal relative directory lookup of coverband won't work for our dummy rails project
     Coverband.configure("./test/rails#{Rails::VERSION::MAJOR}_dummy/config/coverband.rb")
+    Coverband.configuration.background_reporting_enabled = false
     Coverband.start
   end
 
@@ -21,8 +22,8 @@ class RailsFullStackTest < Minitest::Test
 
   test 'this is how we do it' do
     visit '/dummy/show'
+    Coverband.report_coverage(true)
     assert_content('I am no dummy')
-    sleep 0.2
     visit '/coverage'
     within page.find('a', text: /dummy_controller.rb/).find(:xpath, '../..') do
       assert_selector('td', text: '100.0 %')
@@ -46,7 +47,7 @@ class RailsFullStackTest < Minitest::Test
       3.times do
         visit '/dummy/show'
         assert_content('I am no dummy')
-        Coverband::Collectors::Coverage.instance.report_coverage(true)
+        Coverband.report_coverage(true)
       end
 
       previous_out = $stdout
@@ -57,7 +58,7 @@ class RailsFullStackTest < Minitest::Test
         15.times do
           visit '/dummy/show'
           assert_content('I am no dummy')
-          Coverband::Collectors::Coverage.instance.report_coverage(true)
+          Coverband.report_coverage(true)
           # this is expected to retain memory across requests
           # clear it to remove the false positive from test
           Coverband::Collectors::Coverage.instance.send(:add_previous_results, nil)

data/test/{unit → integration}/rails_gems_full_stack_test.rb

@@ -12,6 +12,7 @@ class RailsGemsFullStackTest < Minitest::Test
     Coverband.configure("./test/rails#{Rails::VERSION::MAJOR}_dummy/config/coverband.rb")
     Coverband.configuration.track_gems = true
     Coverband.configuration.gem_details = true
+    Coverband.configuration.background_reporting_enabled = false
     Coverband.start
     require 'rainbow'
     Rainbow('this text is red').red
@@ -26,7 +27,7 @@ class RailsGemsFullStackTest < Minitest::Test
   test 'this is how gem it' do
     visit '/dummy/show'
     assert_content('I am no dummy')
-    sleep 0.2
+    Coverband.report_coverage(true)
     visit '/coverage'
     assert_content('Coverband Admin')
     assert_content('Gems')

data/views/layout.erb

@@ -16,7 +16,7 @@
     <div id="wrapper" style="display:none;">
       <div id="header">
         <a href='<%= base_path %>'>Coverband Admin</a> &nbsp;
-        <a href='<%= base_path %>settings'>Settings</a> &nbsp;
+        <a href='<%= base_path %>settings'>Info</a> &nbsp;
         <%= button("#{base_path}collect_coverage", 'force coverage collection') %> &nbsp;
         <%= button("#{base_path}reload_files", 'reload Coverband files') %> &nbsp;
         <% if Coverband.configuration.web_enable_clear %>

data/views/settings.erb

@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html xmlns='http://www.w3.org/1999/xhtml'>
+  <head>
+    <title>Coverband Info: <%= Coverband::VERSION %></title>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+    <script src='<%= assets_path('application.js') %>' type='text/javascript'></script>
+    <link href='<%= assets_path('application.css') %>' media='screen, projection, print' rel='stylesheet' type='text/css'>
+    <link rel="icon" type="image/png" href="<%= assets_path('favicon.png') %>" />
+  </head>
+
+  <body>
+    <div id="wrapper" style="">
+      <div id="header">
+        <a href='<%= base_path %>'>Coverband Admin</a> &nbsp;
+        <a href='<%= base_path %>settings'>Info</a> &nbsp;
+      </div>
+      <div id="content">
+        <dl>
+        <% Coverband.configuration.to_h.each_pair do |key,value| %>
+          <dt><%= key %></dt>
+          <dd><%= value %></dd>
+        <% end %>
+
+        <dt>Size (in bytes)</dt>
+        <dd><%= Coverband.configuration.store.size %></dd>
+        <dt>Size (in MiB)</dt>
+        <dd><%= Coverband.configuration.store.size_in_mib %></dd>
+        </dl>
+      </div>
+      <div id="footer">
+        Generated by <a href="http://github.com/danmayer/coverband">Coverband</a> v<%= Coverband::VERSION %>
+      </div>
+    </div>
+  </body>
+</html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coverband
 version: !ruby/object:Gem::Version
-  version: 4.2.0.beta
+  version: 4.2.0.rc1
 platform: ruby
 authors:
 - Dan Mayer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-09 00:00:00.000000000 Z
+date: 2019-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -207,6 +207,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-profile
+  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
@@ -257,6 +271,7 @@ files:
 - lib/coverband/reporters/web.rb
 - lib/coverband/utils/file_groups.rb
 - lib/coverband/utils/file_list.rb
+- lib/coverband/utils/file_path_helper.rb
 - lib/coverband/utils/gem_list.rb
 - lib/coverband/utils/html_formatter.rb
 - lib/coverband/utils/lines_classifier.rb
@@ -292,8 +307,34 @@ files:
 - public/magnify.png
 - test/benchmarks/.gitignore
 - test/benchmarks/benchmark.rake
+- test/benchmarks/coverage_fork.sh
 - test/benchmarks/dog.rb
 - test/benchmarks/graph_bench.sh
+- test/coverband/adapters/base_test.rb
+- test/coverband/adapters/file_store_test.rb
+- test/coverband/adapters/redis_store_test.rb
+- test/coverband/at_exit_test.rb
+- test/coverband/collectors/coverage_test.rb
+- test/coverband/configuration_test.rb
+- test/coverband/coverband_test.rb
+- test/coverband/integrations/background_test.rb
+- test/coverband/integrations/middleware_test.rb
+- test/coverband/integrations/rack_server_check_test.rb
+- test/coverband/integrations/resque_worker_test.rb
+- test/coverband/integrations/test_resque_job.rb
+- test/coverband/reporters/base_test.rb
+- test/coverband/reporters/console_test.rb
+- test/coverband/reporters/html_test.rb
+- test/coverband/reporters/web_test.rb
+- test/coverband/utils/file_groups_test.rb
+- test/coverband/utils/file_list_test.rb
+- test/coverband/utils/gem_list_test.rb
+- test/coverband/utils/lines_classifier_test.rb
+- test/coverband/utils/result_test.rb
+- test/coverband/utils/s3_report_test.rb
+- test/coverband/utils/source_file_line_test.rb
+- test/coverband/utils/source_file_test.rb
+- test/dog.rb
 - test/fake_app/basic_rack.rb
 - test/fixtures/app/controllers/sample_controller.rb
 - test/fixtures/app/models/user.rb
@@ -302,6 +343,9 @@ files:
 - test/fixtures/skipped.rb
 - test/fixtures/skipped_and_executed.rb
 - test/fixtures/utf-8.rb
+- test/integration/full_stack_test.rb
+- test/integration/rails_full_stack_test.rb
+- test/integration/rails_gems_full_stack_test.rb
 - test/rails4_dummy/app/controllers/dummy_controller.rb
 - test/rails4_dummy/config.ru
 - test/rails4_dummy/config/application.rb
@@ -318,37 +362,10 @@ files:
 - test/rails5_dummy/config/routes.rb
 - test/rails_test_helper.rb
 - test/test_helper.rb
-- test/unit/adapters_base_test.rb
-- test/unit/adapters_file_store_test.rb
-- test/unit/adapters_redis_store_test.rb
-- test/unit/at_exit_test.rb
-- test/unit/background_test.rb
-- test/unit/collectors_coverage_test.rb
-- test/unit/configuration_test.rb
-- test/unit/coverband_test.rb
-- test/unit/dog.rb
-- test/unit/full_stack_test.rb
-- test/unit/middleware_test.rb
-- test/unit/rack_server_checkout_test.rb
-- test/unit/rails_full_stack_test.rb
-- test/unit/rails_gems_full_stack_test.rb
-- test/unit/reports_base_test.rb
-- test/unit/reports_console_test.rb
-- test/unit/reports_html_test.rb
-- test/unit/reports_web_test.rb
-- test/unit/resque_worker_test.rb
-- test/unit/test_resque_job.rb
-- test/unit/utils/file_groups_test.rb
-- test/unit/utils/file_list_test.rb
-- test/unit/utils/gem_list_test.rb
-- test/unit/utils/lines_classifier_test.rb
-- test/unit/utils/result_test.rb
-- test/unit/utils/s3_report_test.rb
-- test/unit/utils/source_file_line_test.rb
-- test/unit/utils/source_file_test.rb
 - views/file_list.erb
 - views/gem_list.erb
 - views/layout.erb
+- views/settings.erb
 - views/source_file.erb
 homepage: https://github.com/danmayer/coverband
 licenses:
@@ -369,15 +386,42 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.2
+rubyforge_project: 
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Rack middleware to help measure production code usage (LOC runtime usage)
 test_files:
 - test/benchmarks/.gitignore
 - test/benchmarks/benchmark.rake
+- test/benchmarks/coverage_fork.sh
 - test/benchmarks/dog.rb
 - test/benchmarks/graph_bench.sh
+- test/coverband/adapters/base_test.rb
+- test/coverband/adapters/file_store_test.rb
+- test/coverband/adapters/redis_store_test.rb
+- test/coverband/at_exit_test.rb
+- test/coverband/collectors/coverage_test.rb
+- test/coverband/configuration_test.rb
+- test/coverband/coverband_test.rb
+- test/coverband/integrations/background_test.rb
+- test/coverband/integrations/middleware_test.rb
+- test/coverband/integrations/rack_server_check_test.rb
+- test/coverband/integrations/resque_worker_test.rb
+- test/coverband/integrations/test_resque_job.rb
+- test/coverband/reporters/base_test.rb
+- test/coverband/reporters/console_test.rb
+- test/coverband/reporters/html_test.rb
+- test/coverband/reporters/web_test.rb
+- test/coverband/utils/file_groups_test.rb
+- test/coverband/utils/file_list_test.rb
+- test/coverband/utils/gem_list_test.rb
+- test/coverband/utils/lines_classifier_test.rb
+- test/coverband/utils/result_test.rb
+- test/coverband/utils/s3_report_test.rb
+- test/coverband/utils/source_file_line_test.rb
+- test/coverband/utils/source_file_test.rb
+- test/dog.rb
 - test/fake_app/basic_rack.rb
 - test/fixtures/app/controllers/sample_controller.rb
 - test/fixtures/app/models/user.rb
@@ -386,6 +430,9 @@ test_files:
 - test/fixtures/skipped.rb
 - test/fixtures/skipped_and_executed.rb
 - test/fixtures/utf-8.rb
+- test/integration/full_stack_test.rb
+- test/integration/rails_full_stack_test.rb
+- test/integration/rails_gems_full_stack_test.rb
 - test/rails4_dummy/app/controllers/dummy_controller.rb
 - test/rails4_dummy/config.ru
 - test/rails4_dummy/config/application.rb
@@ -402,31 +449,3 @@ test_files:
 - test/rails5_dummy/config/routes.rb
 - test/rails_test_helper.rb
 - test/test_helper.rb
-- test/unit/adapters_base_test.rb
-- test/unit/adapters_file_store_test.rb
-- test/unit/adapters_redis_store_test.rb
-- test/unit/at_exit_test.rb
-- test/unit/background_test.rb
-- test/unit/collectors_coverage_test.rb
-- test/unit/configuration_test.rb
-- test/unit/coverband_test.rb
-- test/unit/dog.rb
-- test/unit/full_stack_test.rb
-- test/unit/middleware_test.rb
-- test/unit/rack_server_checkout_test.rb
-- test/unit/rails_full_stack_test.rb
-- test/unit/rails_gems_full_stack_test.rb
-- test/unit/reports_base_test.rb
-- test/unit/reports_console_test.rb
-- test/unit/reports_html_test.rb
-- test/unit/reports_web_test.rb
-- test/unit/resque_worker_test.rb
-- test/unit/test_resque_job.rb
-- test/unit/utils/file_groups_test.rb
-- test/unit/utils/file_list_test.rb
-- test/unit/utils/gem_list_test.rb
-- test/unit/utils/lines_classifier_test.rb
-- test/unit/utils/result_test.rb
-- test/unit/utils/s3_report_test.rb
-- test/unit/utils/source_file_line_test.rb
-- test/unit/utils/source_file_test.rb

data/test/unit/reports_base_test.rb

@@ -1,117 +0,0 @@
-# frozen_string_literal: true
-
-require File.expand_path('../test_helper', File.dirname(__FILE__))
-
-class ReportsBaseTest < Minitest::Test
-  test 'filename_from_key fix filename from a key with a swappable path' do
-    Coverband.configure do |config|
-      config.reporter          = 'std_out'
-      config.root              = '/full/remote_app/path'
-    end
-
-    key = '/app/is/a/path.rb'
-    # the code takes config.root expands and adds a '/' for the final path in roots
-    roots = ['/app/', '/full/remote_app/path/']
-
-    expected_path = '/full/remote_app/path/is/a/path.rb'
-    File.expects(:exist?).with(key).returns(false)
-    File.expects(:exist?).with(expected_path).returns(true)
-    assert_equal expected_path, Coverband::Reporters::Base.send(:filename_from_key, key, roots)
-  end
-
-  test 'filename_from_key fix filename a changing deploy path with double quotes' do
-    Coverband.configure do |config|
-      config.reporter          = 'std_out'
-      config.root              = '/full/remote_app/path'
-    end
-
-    key = '/box/apps/app_name/releases/20140725203539/app/models/user.rb'
-    # the code takes config.root expands and adds a '/' for the final path in roots
-    # note to get regex to work for changing deploy directories
-    # it must be double escaped in double quotes or use single qoutes
-    roots = ['/box/apps/app_name/releases/\\d+/', '/full/remote_app/path/']
-
-    expected_path = '/full/remote_app/path/app/models/user.rb'
-    File.expects(:exist?).with('/box/apps/app_name/releases/\\d+/app/models/user.rb').returns(false)
-    File.expects(:exist?).with(expected_path).returns(true)
-    assert_equal expected_path, Coverband::Reporters::Base.send(:filename_from_key, key, roots)
-  end
-
-  test 'filename_from_key fix filename a changing deploy path with single quotes' do
-    Coverband.configure do |config|
-      config.reporter          = 'std_out'
-      config.root              = '/full/remote_app/path'
-    end
-
-    key = '/box/apps/app_name/releases/20140725203539/app/models/user.rb'
-    # the code takes config.root expands and adds a '/' for the final path in roots
-    # note to get regex to work for changing deploy directories
-    # it must be double escaped in double quotes or use single qoutes
-    roots = ['/box/apps/app_name/releases/\d+/', '/full/remote_app/path/']
-
-    expected_path = '/full/remote_app/path/app/models/user.rb'
-    File.expects(:exist?).with('/box/apps/app_name/releases/\\d+/app/models/user.rb').returns(false)
-    File.expects(:exist?).with(expected_path).returns(true)
-    assert_equal expected_path, Coverband::Reporters::Base.send(:filename_from_key, key, roots)
-  end
-
-  test 'filename_from_key leave filename from a key with a local path' do
-    Coverband.configure do |config|
-      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 '/' for the final path in roots
-    roots = ['/app/', '/full/remote_app/path/']
-
-    expected_path = '/full/remote_app/path/is/a/path.rb'
-    assert_equal expected_path, Coverband::Reporters::Base.send(:filename_from_key, 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]
-    expects = [0, 0, 2, 0, 1]
-
-    assert_equal expects, Coverband::Reporters::Base.send(:merge_arrays, first, second)
-  end
-
-  test '#merge_arrays basic merge preserves order and counts different lengths' do
-    first = [0, 0, 1, 0, 1]
-    second = [nil, 0, 1, 0, 0, 0, 0, 1]
-    expects = [0, 0, 2, 0, 1, 0, 0, 1]
-
-    assert_equal expects, Coverband::Reporters::Base.send(:merge_arrays, first, second)
-  end
-
-  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.send(:merge_arrays, first, second)
-  end
-
-  test "#get_current_scov_data_imp doesn't ignore folders with default ignore keys" do
-    @redis = Redis.new
-    store = Coverband::Adapters::RedisStore.new(@redis)
-    store.clear!
-
-    Coverband.configure do |config|
-      config.reporter          = 'std_out'
-      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(:coverage).returns(key => lines_hit)
-    expected = { key => [1, 3, 6] }
-
-    assert_equal expected, Coverband::Reporters::Base.send(:get_current_scov_data_imp, store, roots)
-  end
-end