coverband 4.2.0 → 4.2.1.rc1

data/test/rails4_dummy/Rakefile

@@ -0,0 +1,6 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require_relative 'config/application'
+
+Rails.application.load_tasks

data/test/rails4_dummy/config/application.rb

@@ -1,15 +1,14 @@
-require File.expand_path('../boot', __FILE__)
+# frozen_string_literal: true
+
+require File.expand_path('boot', __dir__)
+
+require 'rails'
+require 'action_controller/railtie'
+require 'coverband'
+Bundler.require(*Rails.groups)
 
-require "rails"
-require "action_controller/railtie"
 module Rails4Dummy
   class Application < Rails::Application
-    # Coverband needs to be setup before any of the initializers to capture usage of them
-    Coverband.configure(File.open("#{Rails.root}/config/coverband.rb"))
-    config.middleware.use Coverband::Middleware
-    config.before_initialize do
-      Coverband.start
-    end
     config.eager_load = true
   end
 end

data/test/rails4_dummy/config/coverband.rb

@@ -1,11 +1,11 @@
 Coverband.configure do |config|
   config.root              = Dir.pwd
-  config.store             = Coverband::Adapters::RedisStore.new(Redis.new(url: ENV['REDIS_URL'])) if defined? Redis
+  config.store             = Coverband::Adapters::RedisStore.new(Redis.new(url: ENV['REDIS_URL']), redis_namespace: 'coverband_test') if defined? Redis
   config.ignore            = %w[vendor .erb$ .slim$]
   config.root_paths        = []
-  config.logger              = Rails.logger
+  config.logger            = Rails.logger
   config.verbose           = true
-  config.background_reporting_enabled = false
+  config.background_reporting_enabled = true
   config.track_gems = true
   config.gem_details = true
 end

data/test/rails5_dummy/Rakefile

@@ -0,0 +1,6 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require_relative 'config/application'
+
+Rails.application.load_tasks

data/test/rails5_dummy/config/application.rb

@@ -1,16 +1,12 @@
-require "rails"
-require "action_controller/railtie"
+# frozen_string_literal: true
+
+require 'rails'
+require 'action_controller/railtie'
 require 'coverband'
+Bundler.require(*Rails.groups)
 
-module Dummy
+module Rails5Dummy
   class Application < Rails::Application
-    # Coverband needs to be setup before any of the initializers to capture usage of them
-    Coverband.configure(File.open("#{Rails.root}/config/coverband.rb"))
-    config.middleware.use Coverband::Middleware
-    config.before_initialize do
-      Coverband.start
-    end
     config.eager_load = true
   end
 end
-

data/test/rails5_dummy/config/coverband.rb

@@ -1,11 +1,11 @@
 Coverband.configure do |config|
   config.root              = Dir.pwd
-  config.store             = Coverband::Adapters::RedisStore.new(Redis.new(url: ENV['REDIS_URL'])) if defined? Redis
+  config.store             = Coverband::Adapters::RedisStore.new(Redis.new(url: ENV['REDIS_URL']), redis_namespace: 'coverband_test') if defined? Redis
   config.ignore            = %w[vendor .erb$ .slim$]
   config.root_paths        = []
   config.logger            = Rails.logger
   config.verbose           = true
-  config.background_reporting_enabled = false
+  config.background_reporting_enabled = true
   config.track_gems = true
   config.gem_details = true
 end

data/test/rails_test_helper.rb

@@ -1,16 +1,35 @@
+# frozen_string_literal: true
+
+require 'selenium-webdriver'
+require 'webdrivers'
+require 'minitest'
+require 'minitest/fork_executor'
+
+# Forked executor includes autorun which does not work with qrush/m
+# https://github.com/qrush/m/issues/26
+# https://github.com/seattlerb/minitest/blob/master/lib/minitest/autorun.rb
+if defined?(M)
+  Minitest.class_eval do
+    def self.autorun
+      puts 'No autorunning'
+    end
+  end
+end
+
+Minitest.parallel_executor = Minitest::ForkExecutor.new
 require File.expand_path('./test_helper', File.dirname(__FILE__))
 require 'capybara'
 require 'capybara/minitest'
 def rails_setup
-  ENV["RAILS_ENV"] = "test"
+  ENV['RAILS_ENV'] = 'test'
   require 'rails'
-  #coverband must be required after rails
+  # coverband must be required after rails
   load 'coverband/utils/railtie.rb'
   Coverband.configure("./test/rails#{Rails::VERSION::MAJOR}_dummy/config/coverband.rb")
   require_relative "../test/rails#{Rails::VERSION::MAJOR}_dummy/config/environment"
   require 'capybara/rails'
-  #Our coverage report is wrapped in display:none as of now
+  # Our coverage report is wrapped in display:none as of now
   Capybara.ignore_hidden_elements = false
   require 'mocha/minitest'
+  Capybara.server = :webrick
 end
-

data/test/test_helper.rb

@@ -7,8 +7,8 @@ original_verbosity = $VERBOSE
 $VERBOSE = nil
 require 'rubygems'
 require 'aws-sdk-s3'
-require 'coveralls'
 require 'simplecov'
+require 'coveralls'
 require 'minitest/autorun'
 require 'mocha/minitest'
 require 'ostruct'
@@ -19,17 +19,25 @@ require 'pry-byebug'
 require_relative 'unique_files'
 $VERBOSE = original_verbosity
 
+SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+SimpleCov.start do
+  add_filter 'test/forked'
+end
+
 Coveralls.wear!
 
 module Coverband
   module Test
     def self.reset
+      Coverband.configuration.redis_namespace = 'coverband_test'
+      Coverband.configuration.store.instance_variable_set(:@redis_namespace, 'coverband_test')
       [:eager_loading, nil].each do |type|
         Coverband.configuration.store.type = type
         Coverband.configuration.store.clear!
       end
       Coverband.configuration.reset
       Coverband::Collectors::Coverage.instance.reset_instance
+      Coverband.configuration.redis_namespace = 'coverband_test'
       Coverband::Background.stop
     end
 
@@ -60,6 +68,7 @@ def test(name, &block)
               false
             end
   raise "#{test_name} is already defined in #{self}" if defined
+
   if block_given?
     define_method(test_name, &block)
   else
@@ -83,10 +92,26 @@ def basic_coverage
   { 'app_path/dog.rb' => example_line }
 end
 
+def basic_coverage_full_path
+  { basic_coverage_file_full_path => example_line }
+end
+
+def basic_source_fixture_coverage
+  { source_fixture('sample.rb') => example_line }
+end
+
+def basic_coverage_file_full_path
+  "#{test_root}/dog.rb"
+end
+
 def source_fixture(filename)
   File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', filename))
 end
 
+def fixtures_root
+  File.expand_path(File.join(File.dirname(__FILE__), 'fixtures'))
+end
+
 def test_root
   File.expand_path(File.join(File.dirname(__FILE__)))
 end

data/test/unique_files.rb

@@ -3,15 +3,16 @@
 require 'securerandom'
 require 'fileutils'
 
-UNIQUE_FILES_DIR = "./test/unique_files"
+UNIQUE_FILES_DIR = './test/unique_files'
 
 def require_unique_file(file = 'dog.rb')
-  dir = "#{UNIQUE_FILES_DIR}/#{SecureRandom.uuid}"
-  FileUtils.mkdir_p(dir)
+  uuid = SecureRandom.uuid
+  dir = "#{UNIQUE_FILES_DIR}/#{uuid}"
   temp_file = "#{dir}/#{file}"
-  File.open(temp_file, 'w'){ |w| w.write(File.read("./test/#{file}")) }
+  FileUtils.mkdir_p(Pathname.new(temp_file).dirname.to_s)
+  File.open(temp_file, 'w') { |w| w.write(File.read("./test/#{file}")) }
   require temp_file
-  temp_file
+  Coverband::Utils::FilePathHelper.full_path_to_relative(File.expand_path(temp_file))
 end
 
 def remove_unique_files

data/views/file_list.erb

@@ -39,7 +39,7 @@
             <%= link_to_source_file(source_file) %>
           </td>
           <td class="<%= coverage_css_class(source_file.covered_percent) %> strong"><%= source_file.covered_percent.round(2).to_s %> %</td>
-          <% runtime_percentage = result.file_with_type(source_file, Coverband::RUNTIME_TYPE).try(:covered_percent).try(:round, 2) %>
+          <% runtime_percentage = result.runtime_relevant_coverage(source_file) %>
           <td class="<%= "#{coverage_css_class(runtime_percentage)}" %> strong">
             <%= "#{runtime_percentage || '0'} %" %>
           </td>
@@ -47,7 +47,7 @@
           <td><%= source_file.covered_lines.count + source_file.missed_lines.count %></td>
           <td><%= source_file.covered_lines.count %></td>
           <td>
-            <%= result.file_with_type(source_file, Coverband::RUNTIME_TYPE).try(:covered_lines).try(:count) || 0 %>
+            <%= result.file_with_type(source_file, Coverband::RUNTIME_TYPE)&.covered_lines_count || 0 %>
           </td>
           <td><%= source_file.missed_lines.count %></td>
           <td><%= source_file.covered_strength %></td>

data/views/gem_list.erb

@@ -20,8 +20,10 @@
       <tr>
         <th>Gem</th>
         <th>% covered</th>
+        <th>% runtime</th>
         <th>Relevant Lines</th>
         <th>Lines covered</th>
+        <th>Lines runtime</th>
         <th>Lines missed</th>
         <th>Avg. Hits / Line</th>
       </tr>
@@ -37,10 +39,17 @@
             <% end %>
           </td>
           <td class="<%= coverage_css_class(source_file.covered_percent) %> strong"><%= source_file.covered_percent.round(2).to_s %> %</td>
+          <% runtime_percentage = result.group_file_list_with_type(title, source_file, Coverband::RUNTIME_TYPE)&.formatted_covered_percent %>
+          <td class="<%= "#{coverage_css_class(runtime_percentage)}" %> strong">
+            <%= "#{runtime_percentage || '0'} %" %>
+          </td>
           <td><%= source_file.covered_lines + source_file.missed_lines %></td>
           <td><%= source_file.covered_lines %></td>
+          <td>
+            <%= result.group_file_list_with_type(title, source_file, Coverband::RUNTIME_TYPE)&.covered_lines || 0 %>
+          </td>
           <td><%= source_file.missed_lines %></td>
-          <td><%= source_file.covered_strength %></td>
+          <td><%= source_file.covered_strength.round(1) %></td>
         </tr>
       <% end %>
     </tbody>

data/views/layout.erb

@@ -18,8 +18,6 @@
       <div id="header">
         <a href='<%= base_path %>'>Coverband Admin</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 %>
           <%= button("#{base_path}clear", 'clear coverage report', delete: true) %>
         <% end %>
@@ -31,6 +29,11 @@
       <div class="notice"><%= notice %></div>
       <% end %>
       <div class="timestamp">Generated <%= timeago(Time.now) %></div>
+      <br/>
+      <div class="timestamp">
+        Coverage Recording Started: <%= timeago(result.source_files.first_seen_at) %>
+      </div>
+
       <ul class="group_tabs"></ul>
 
       <div id="content">
@@ -48,7 +51,11 @@
       <div class="source_files">
       <% result.source_files.each do |source_file| %>
         <% if (!source_file.gem? || (view_gems? && gem_details? && source_file.gem? )) %>
-          <%= formatted_source_file_loader(result, source_file) %>
+          <% if static_html? %>
+            <%= formatted_source_file(result, source_file) %>
+          <% else %>
+            <%= formatted_source_file_loader(result, source_file) %>
+          <% end %>
         <% end %>
       <% end %>
       </div>

data/views/source_file.erb

@@ -2,14 +2,23 @@
   <div class="header">
     <h3><%= shortened_filename source_file %></h3>
     <h4>
-      <span class="<%= coverage_css_class(source_file.covered_percent) %>"><%= source_file.covered_percent.round(2).to_s %> %</span>
-       covered
+      <span class="<%= coverage_css_class(source_file.covered_percent) %>">
+        <%= source_file.covered_percent.round(2).to_s %> %
+      </span>
+      covered,
+
+      <span class="<%= coverage_css_class(source_file.covered_percent) %>">
+        <%= result.runtime_relevant_coverage(source_file) %> %
+      </span>
+      runtime covered
+
       <% if Coverband.configuration.web_enable_clear %>
         <%= button("#{base_path}clear_file?filename=#{source_file.relative_path}", 'clear file coverage') %> &nbsp;
       <% end %>
     </h4>
     <div>
       <b><%= source_file.lines_of_code %></b> relevant lines.
+      <b><%= result.runtime_relavent_lines(source_file) %></b> runtime relevant lines.
       <span class="green"><b><%= source_file.covered_lines.count %></b> lines covered</span> and
       <span class="red"><b><%= source_file.missed_lines.count %></b> lines missed.</span>
     </div>
@@ -25,9 +34,9 @@
         <li class="<%= line.status %>" data-hits="<%= line.coverage ? line.coverage : '' %>" data-linenumber="<%= line.number %>">
           <% if line.covered? %><span class="hits">
             load:
-            <%= result.file_with_type(source_file, Coverband::EAGER_TYPE).try(:lines).try(:[], index).try(:coverage) || 0 %>,
+            <%= result.file_with_type(source_file, Coverband::EAGER_TYPE)&.line_coverage(index) || 0 %>,
             runtime:
-            <%= result.file_with_type(source_file, Coverband::RUNTIME_TYPE).try(:lines).try(:[], index).try(:coverage) || 0 %>
+            <%= result.file_with_type(source_file, Coverband::RUNTIME_TYPE)&.line_coverage(index) || 0 %>
             all: <%= line.coverage %>
           </span><% end %>
           <% if line.skipped? %><span class="hits">skipped</span><% end %>

data/views/source_file_loader.erb

@@ -1,6 +1,6 @@
 <div class="source_table" id="<%= id source_file %>" data-loader-url="<%= base_path %>load_file_details?filename=<%= source_file.filename %>">
   <div class='loader'>
-    loading...
+    loading source data...
     <br/>
     <img src="<%= assets_path('loading.gif') %>" alt="loading"/>
   </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coverband
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1.rc1
 platform: ruby
 authors:
 - Dan Mayer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-24 00:00:00.000000000 Z
+date: 2019-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -95,6 +95,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-fork_executor
+  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: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -165,6 +179,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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: selenium-webdriver
+  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: webdrivers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
@@ -277,8 +333,10 @@ files:
 - lib/coverband/collectors/delta.rb
 - lib/coverband/configuration.rb
 - lib/coverband/integrations/background.rb
-- lib/coverband/integrations/middleware.rb
+- lib/coverband/integrations/background_middleware.rb
+- lib/coverband/integrations/bundler.rb
 - lib/coverband/integrations/rack_server_check.rb
+- lib/coverband/integrations/report_middleware.rb
 - lib/coverband/integrations/resque.rb
 - lib/coverband/reporters/base.rb
 - lib/coverband/reporters/console_report.rb
@@ -336,9 +394,10 @@ files:
 - test/coverband/collectors/delta_test.rb
 - test/coverband/configuration_test.rb
 - test/coverband/coverband_test.rb
+- test/coverband/integrations/background_middleware_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/report_middleware_test.rb
 - test/coverband/integrations/resque_worker_test.rb
 - test/coverband/integrations/test_resque_job.rb
 - test/coverband/reporters/base_test.rb
@@ -348,8 +407,10 @@ files:
 - test/coverband/utils/file_groups_test.rb
 - test/coverband/utils/file_list_test.rb
 - test/coverband/utils/gem_list_test.rb
+- test/coverband/utils/html_formatter_test.rb
 - test/coverband/utils/lines_classifier_test.rb
 - test/coverband/utils/result_test.rb
+- test/coverband/utils/results_test.rb
 - test/coverband/utils/s3_report_test.rb
 - test/coverband/utils/source_file_line_test.rb
 - test/coverband/utils/source_file_test.rb
@@ -362,8 +423,10 @@ files:
 - test/fixtures/skipped.rb
 - test/fixtures/skipped_and_executed.rb
 - test/fixtures/utf-8.rb
+- test/forked/rails_full_stack_test.rb
+- test/forked/rails_rake_full_stack_test.rb
 - test/integration/full_stack_test.rb
-- test/integration/rails_full_stack_test.rb
+- test/rails4_dummy/Rakefile
 - test/rails4_dummy/app/controllers/dummy_controller.rb
 - test/rails4_dummy/config.ru
 - test/rails4_dummy/config/application.rb
@@ -373,6 +436,7 @@ files:
 - test/rails4_dummy/config/routes.rb
 - test/rails4_dummy/config/secrets.yml
 - test/rails4_dummy/tmp/.keep
+- test/rails5_dummy/Rakefile
 - test/rails5_dummy/app/controllers/dummy_controller.rb
 - test/rails5_dummy/config.ru
 - test/rails5_dummy/config/application.rb
@@ -404,9 +468,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.7.8
@@ -427,9 +491,10 @@ test_files:
 - test/coverband/collectors/delta_test.rb
 - test/coverband/configuration_test.rb
 - test/coverband/coverband_test.rb
+- test/coverband/integrations/background_middleware_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/report_middleware_test.rb
 - test/coverband/integrations/resque_worker_test.rb
 - test/coverband/integrations/test_resque_job.rb
 - test/coverband/reporters/base_test.rb
@@ -439,8 +504,10 @@ test_files:
 - test/coverband/utils/file_groups_test.rb
 - test/coverband/utils/file_list_test.rb
 - test/coverband/utils/gem_list_test.rb
+- test/coverband/utils/html_formatter_test.rb
 - test/coverband/utils/lines_classifier_test.rb
 - test/coverband/utils/result_test.rb
+- test/coverband/utils/results_test.rb
 - test/coverband/utils/s3_report_test.rb
 - test/coverband/utils/source_file_line_test.rb
 - test/coverband/utils/source_file_test.rb
@@ -453,8 +520,10 @@ test_files:
 - test/fixtures/skipped.rb
 - test/fixtures/skipped_and_executed.rb
 - test/fixtures/utf-8.rb
+- test/forked/rails_full_stack_test.rb
+- test/forked/rails_rake_full_stack_test.rb
 - test/integration/full_stack_test.rb
-- test/integration/rails_full_stack_test.rb
+- test/rails4_dummy/Rakefile
 - test/rails4_dummy/app/controllers/dummy_controller.rb
 - test/rails4_dummy/config.ru
 - test/rails4_dummy/config/application.rb
@@ -464,6 +533,7 @@ test_files:
 - test/rails4_dummy/config/routes.rb
 - test/rails4_dummy/config/secrets.yml
 - test/rails4_dummy/tmp/.keep
+- test/rails5_dummy/Rakefile
 - test/rails5_dummy/app/controllers/dummy_controller.rb
 - test/rails5_dummy/config.ru
 - test/rails5_dummy/config/application.rb