coverband 4.2.0.rc1 → 4.2.0.rc2

data/test/rails4_dummy/config/application.rb

@@ -10,6 +10,6 @@ module Rails4Dummy
     config.before_initialize do
       Coverband.start
     end
-    config.eager_load = false
+    config.eager_load = true
   end
 end

data/test/rails4_dummy/config/coverband.rb

@@ -4,5 +4,8 @@ Coverband.configure do |config|
   config.ignore            = %w[vendor .erb$ .slim$]
   config.root_paths        = []
   config.logger              = Rails.logger
-  config.background_reporting_sleep_seconds = 0.1
+  config.verbose           = true
+  config.background_reporting_enabled = false
+  config.track_gems = true
+  config.gem_details = true
 end

data/test/rails5_dummy/config/application.rb

@@ -10,7 +10,7 @@ module Dummy
     config.before_initialize do
       Coverband.start
     end
-    config.eager_load = false
+    config.eager_load = true
   end
 end
 

data/test/rails5_dummy/config/coverband.rb

@@ -5,5 +5,7 @@ Coverband.configure do |config|
   config.root_paths        = []
   config.logger            = Rails.logger
   config.verbose           = true
-  config.background_reporting_sleep_seconds = 0.1
+  config.background_reporting_enabled = false
+  config.track_gems = true
+  config.gem_details = true
 end

data/test/rails_test_helper.rb

@@ -1,11 +1,16 @@
-# Configure Rails Environment
-ENV["RAILS_ENV"] = "test"
-require 'rails'
 require File.expand_path('./test_helper', File.dirname(__FILE__))
-require_relative "../test/rails#{Rails::VERSION::MAJOR}_dummy/config/environment"
-require 'capybara/rails'
+require 'capybara'
 require 'capybara/minitest'
+def rails_setup
+  ENV["RAILS_ENV"] = "test"
+  require '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
+  Capybara.ignore_hidden_elements = false
+  require 'mocha/minitest'
+end
 
-#Our coverage report is wrapped in display:none as of now
-Capybara.ignore_hidden_elements = false
-require 'mocha/minitest'

data/test/test_helper.rb

@@ -16,6 +16,7 @@ require 'json'
 require 'redis'
 require 'resque'
 require 'pry-byebug'
+require_relative 'unique_files'
 $VERBOSE = original_verbosity
 
 Coveralls.wear!
@@ -23,7 +24,10 @@ Coveralls.wear!
 module Coverband
   module Test
     def self.reset
-      Coverband.configuration.store.clear!
+      [: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::Background.stop
@@ -79,18 +83,6 @@ def basic_coverage
   { 'app_path/dog.rb' => example_line }
 end
 
-def fake_redis
-  @redis ||= begin
-    redis = OpenStruct.new
-    redis
-  end
-end
-
-def fake_coverage_report
-  file_name = '/Users/danmayer/projects/hearno/script/tester.rb'
-  { file_name => [1, nil, 1, 1, nil, nil, nil] }
-end
-
 def source_fixture(filename)
   File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', filename))
 end
@@ -99,6 +91,10 @@ def test_root
   File.expand_path(File.join(File.dirname(__FILE__)))
 end
 
+def store
+  Coverband.configuration.store
+end
+
 # Taken from http://stackoverflow.com/questions/4459330/how-do-i-temporarily-redirect-stderr-in-ruby
 def capture_stderr
   # The output stream must be an IO-like object. In this case we capture it in

data/test/unique_files.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'securerandom'
+require 'fileutils'
+
+UNIQUE_FILES_DIR = "./test/unique_files"
+
+def require_unique_file(file = 'dog.rb')
+  dir = "#{UNIQUE_FILES_DIR}/#{SecureRandom.uuid}"
+  FileUtils.mkdir_p(dir)
+  temp_file = "#{dir}/#{file}"
+  File.open(temp_file, 'w'){ |w| w.write(File.read("./test/#{file}")) }
+  require temp_file
+  temp_file
+end
+
+def remove_unique_files
+  FileUtils.rm_r(UNIQUE_FILES_DIR) if File.exist?(UNIQUE_FILES_DIR)
+end
+
+Minitest.after_run do
+  remove_unique_files
+end

data/views/file_list.erb

@@ -23,9 +23,11 @@
       <tr>
         <th>File</th>
         <th>% covered</th>
+        <th>% runtime</th>
         <th>Lines</th>
         <th>Relevant Lines</th>
         <th>Lines covered</th>
+        <th>Lines runtime</th>
         <th>Lines missed</th>
         <th>Avg. Hits / Line</th>
       </tr>
@@ -37,9 +39,16 @@
             <%= 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) %>
+          <td class="<%= "#{coverage_css_class(runtime_percentage)}" %> strong">
+            <%= "#{runtime_percentage || '0'} %" %>
+          </td>
           <td><%= source_file.lines.count %></td>
           <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 %>
+          </td>
           <td><%= source_file.missed_lines.count %></td>
           <td><%= source_file.covered_strength %></td>
         </tr>

data/views/gem_list.erb

@@ -49,6 +49,6 @@
 
 <% if gem_details? %>
   <% source_files.each do |gem_files| %>
-    <%= formatted_file_list(gem_files.first.gem_name, gem_files, skip_nav: true) %>
+    <%= formatted_file_list(gem_files.first.gem_name, result, gem_files, skip_nav: true) %>
   <% end %>
 <% end %>

data/views/layout.erb

@@ -3,6 +3,7 @@
   <head>
     <title>Coverband: <%= Coverband::VERSION %></title>
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+    <script src='<%= assets_path('dependencies.js') %>' type='text/javascript'></script>
     <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="shortcut icon" type="image/png" href="<%= assets_path("favicon_#{coverage_css_class(result.source_files.covered_percent)}.png") %>" />
@@ -33,10 +34,10 @@
       <ul class="group_tabs"></ul>
 
       <div id="content">
-        <%= formatted_file_list("All Files", result.source_files) unless view_gems? %>
+        <%= formatted_file_list("All Files", result, result.source_files) unless view_gems? %>
 
         <% result.groups.each do |name, files| %>
-          <%= formatted_file_list(name, files) %>
+          <%= formatted_file_list(name, result, files) %>
         <% end %>
       </div>
 
@@ -47,7 +48,7 @@
       <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(source_file) %>
+          <%= formatted_source_file_loader(result, source_file) %>
         <% end %>
       <% end %>
       </div>

data/views/source_file.erb

@@ -1,23 +1,35 @@
 <div class="source_table" id="<%= id source_file %>">
   <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</h4>
+    <h4>
+      <span class="<%= coverage_css_class(source_file.covered_percent) %>"><%= source_file.covered_percent.round(2).to_s %> %</span>
+       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.
       <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>
     <div>
-      Coverage first seen: <%= source_file.first_updated_at %>, last activity recorded: 
+      Coverage first seen: <%= source_file.first_updated_at %>, last activity recorded:
       <%= source_file.last_updated_at %>
     </div>
   </div>
 
   <pre>
     <ol>
-      <% source_file.lines.each do |line| %>
+      <% source_file.lines.each_with_index do |line, index| %>
         <li class="<%= line.status %>" data-hits="<%= line.coverage ? line.coverage : '' %>" data-linenumber="<%= line.number %>">
-          <% if line.covered? %><span class="hits"><%= line.coverage %></span><% end %>
+          <% if line.covered? %><span class="hits">
+            load:
+            <%= result.file_with_type(source_file, Coverband::EAGER_TYPE).try(:lines).try(:[], index).try(:coverage) || 0 %>,
+            runtime:
+            <%= result.file_with_type(source_file, Coverband::RUNTIME_TYPE).try(:lines).try(:[], index).try(:coverage) || 0 %>
+            all: <%= line.coverage %>
+          </span><% end %>
           <% if line.skipped? %><span class="hits">skipped</span><% end %>
           <code class="ruby"><%= CGI.escapeHTML(line.src.chomp) %></code>
         </li>

data/views/source_file_loader.erb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coverband
 version: !ruby/object:Gem::Version
-  version: 4.2.0.rc1
+  version: 4.2.0.rc2
 platform: ruby
 authors:
 - Dan Mayer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-13 00:00:00.000000000 Z
+date: 2019-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -165,6 +165,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  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: classifier-reborn
   requirement: !ruby/object:Gem::Requirement
@@ -260,6 +274,7 @@ files:
 - lib/coverband/adapters/redis_store.rb
 - lib/coverband/at_exit.rb
 - lib/coverband/collectors/coverage.rb
+- lib/coverband/collectors/delta.rb
 - lib/coverband/configuration.rb
 - lib/coverband/integrations/background.rb
 - lib/coverband/integrations/middleware.rb
@@ -277,6 +292,7 @@ files:
 - lib/coverband/utils/lines_classifier.rb
 - lib/coverband/utils/railtie.rb
 - lib/coverband/utils/result.rb
+- lib/coverband/utils/results.rb
 - lib/coverband/utils/s3_report.rb
 - lib/coverband/utils/source_file.rb
 - lib/coverband/utils/tasks.rb
@@ -287,6 +303,8 @@ files:
 - public/colorbox/controls.png
 - public/colorbox/loading.gif
 - public/colorbox/loading_background.png
+- public/dependencies.js
+- public/favicon.png
 - public/favicon_green.png
 - public/favicon_red.png
 - public/favicon_yellow.png
@@ -315,6 +333,7 @@ files:
 - test/coverband/adapters/redis_store_test.rb
 - test/coverband/at_exit_test.rb
 - test/coverband/collectors/coverage_test.rb
+- test/coverband/collectors/delta_test.rb
 - test/coverband/configuration_test.rb
 - test/coverband/coverband_test.rb
 - test/coverband/integrations/background_test.rb
@@ -345,7 +364,6 @@ files:
 - 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
@@ -354,19 +372,23 @@ files:
 - test/rails4_dummy/config/environment.rb
 - test/rails4_dummy/config/routes.rb
 - test/rails4_dummy/config/secrets.yml
+- test/rails4_dummy/tmp/.keep
 - test/rails5_dummy/app/controllers/dummy_controller.rb
 - test/rails5_dummy/config.ru
 - test/rails5_dummy/config/application.rb
 - test/rails5_dummy/config/coverband.rb
 - test/rails5_dummy/config/environment.rb
 - test/rails5_dummy/config/routes.rb
+- test/rails5_dummy/tmp/.keep
 - test/rails_test_helper.rb
 - test/test_helper.rb
+- test/unique_files.rb
 - views/file_list.erb
 - views/gem_list.erb
 - views/layout.erb
 - views/settings.erb
 - views/source_file.erb
+- views/source_file_loader.erb
 homepage: https://github.com/danmayer/coverband
 licenses:
 - MIT
@@ -402,6 +424,7 @@ test_files:
 - test/coverband/adapters/redis_store_test.rb
 - test/coverband/at_exit_test.rb
 - test/coverband/collectors/coverage_test.rb
+- test/coverband/collectors/delta_test.rb
 - test/coverband/configuration_test.rb
 - test/coverband/coverband_test.rb
 - test/coverband/integrations/background_test.rb
@@ -432,7 +455,6 @@ test_files:
 - 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
@@ -441,11 +463,14 @@ test_files:
 - test/rails4_dummy/config/environment.rb
 - test/rails4_dummy/config/routes.rb
 - test/rails4_dummy/config/secrets.yml
+- test/rails4_dummy/tmp/.keep
 - test/rails5_dummy/app/controllers/dummy_controller.rb
 - test/rails5_dummy/config.ru
 - test/rails5_dummy/config/application.rb
 - test/rails5_dummy/config/coverband.rb
 - test/rails5_dummy/config/environment.rb
 - test/rails5_dummy/config/routes.rb
+- test/rails5_dummy/tmp/.keep
 - test/rails_test_helper.rb
 - test/test_helper.rb
+- test/unique_files.rb

data/test/integration/rails_gems_full_stack_test.rb

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-require File.expand_path('../rails_test_helper', File.dirname(__FILE__))
-
-class RailsGemsFullStackTest < Minitest::Test
-  include Capybara::DSL
-  include Capybara::Minitest::Assertions
-
-  def setup
-    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.track_gems = true
-    Coverband.configuration.gem_details = true
-    Coverband.configuration.background_reporting_enabled = false
-    Coverband.start
-    require 'rainbow'
-    Rainbow('this text is red').red
-  end
-
-  def teardown
-    super
-    Capybara.reset_sessions!
-    Capybara.use_default_driver
-  end
-
-  test 'this is how gem it' do
-    visit '/dummy/show'
-    assert_content('I am no dummy')
-    Coverband.report_coverage(true)
-    visit '/coverage'
-    assert_content('Coverband Admin')
-    assert_content('Gems')
-    assert page.html.match('rainbow/wrapper.rb')
-  end
-end