coverband 4.0.0 → 4.0.1.alpha

data/test/unit/full_stack_test.rb

@@ -34,9 +34,9 @@ class FullStackTest < Test::Unit::TestCase
     expected = [nil, nil, 1, nil, 1, 1, 2, nil, nil]
     assert_equal expected, Coverband.configuration.store.coverage[@rack_file]
 
-    expected = nil
+    # expected = nil
     # TODO: read the html to test it matches expectations? or return data as a hash?
-    # actual = Coverband::Reporters::SimpleCovReport.report(Coverband.configuration.store, open_report: false)
+    # actual = Coverband::Reporters::HTMLReport.report(Coverband.configuration.store, open_report: false)
     # assert_equal expected, actual
   end
 

data/test/unit/reports_console_test.rb

@@ -2,7 +2,7 @@
 
 require File.expand_path('../test_helper', File.dirname(__FILE__))
 
-class SimpleCovReportTest < Test::Unit::TestCase
+class HTMLReportTest < Test::Unit::TestCase
   BASE_KEY = Coverband::Adapters::RedisStore::BASE_KEY
 
   def setup

data/test/unit/{reports_simple_cov_test.rb → reports_html_test.rb}

@@ -2,7 +2,7 @@
 
 require File.expand_path('../test_helper', File.dirname(__FILE__))
 
-class ReportsSimpleCovTest < Test::Unit::TestCase
+class ReportHTMLTest < Test::Unit::TestCase
   BASE_KEY = Coverband::Adapters::RedisStore::BASE_KEY
 
   def setup
@@ -18,14 +18,11 @@ class ReportsSimpleCovTest < Test::Unit::TestCase
       config.s3_bucket         = nil
       config.ignore            = ['notsomething.rb']
     end
-    Coverband.configuration.logger.stubs('info')
     mock_file_hash
     @store.send(:save_report, basic_coverage)
 
-    SimpleCov.expects(:track_files)
-    SimpleCov.expects(:add_not_loaded_files).returns({})
-    SimpleCov::Result.any_instance.expects(:format!)
-    SimpleCov.stubs(:root)
-    Coverband::Reporters::SimpleCovReport.report(@store, open_report: false)
+    html = Coverband::Reporters::HTMLReport.report(@store,
+                                                       html: true, open_report: false)
+    assert_match 'Generated by', html
   end
 end

data/test/unit/reports_web_test.rb

@@ -9,7 +9,7 @@ ENV['RACK_ENV'] = 'test'
 
 if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.2.0')
   module Coverband
-    class S3WebTest < Test::Unit::TestCase
+    class WebTest < Test::Unit::TestCase
       include Rack::Test::Methods
 
       def app
@@ -20,7 +20,7 @@ if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.2.0')
         Coverband.configuration.s3_bucket = nil
       end
 
-      # TODO add tests for all endpoints
+      # TODO: add tests for all endpoints
       test 'renders index content' do
         get '/'
         assert last_response.ok?
@@ -28,8 +28,7 @@ if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.2.0')
       end
 
       test 'renders show content' do
-        Coverband.configuration.s3_bucket = 'coverage-bucket'
-        Coverband::Utils::S3Report.any_instance.expects(:retrieve).returns('content')
+        Coverband::Reporters::HTMLReport.expects(:report).returns('content')
         get '/show'
         assert last_response.ok?
         assert_equal 'content', last_response.body

data/test/unit/utils_s3_report_test.rb

@@ -4,9 +4,7 @@ require 'aws-sdk'
 module Coverband
   class S3ReportTest < Test::Unit::TestCase
     def html_version
-      Gem::Specification.find_by_name('simplecov-html').version.version.to_s
-    rescue StandardError
-      '0.10.1'
+      Coverband::VERSION
     end
 
     test 'it writes the coverage report to s3' do

data/views/file_list.erb

@@ -0,0 +1,45 @@
+<div class="file_list_container" id="<%= title_id %>">
+  <h2>
+    <span class="group_name"><%= title %></span>
+    (<span class="covered_percent"><span class="<%= coverage_css_class(source_files.covered_percent) %>"><%= source_files.covered_percent.round(2) %>%</span></span>
+     covered at
+     <span class="covered_strength">
+       <span class="<%= strength_css_class(source_files.covered_strength) %>">
+         <%= source_files.covered_strength.round(2) %>
+       </span>
+    </span> hits/line)
+  </h2>
+  <a name="<%= title_id %>"></a>
+  <div>
+    <b><%= source_files.length %></b> files in total.
+    <b><%= source_files.lines_of_code %></b> relevant lines. 
+    <span class="green"><b><%= source_files.covered_lines %></b> lines covered</span> and
+    <span class="red"><b><%= source_files.missed_lines %></b> lines missed </span>
+  </div>
+  <table class="file_list">
+    <thead>
+      <tr>
+        <th>File</th>
+        <th>% covered</th>
+        <th>Lines</th>
+        <th>Relevant Lines</th>
+        <th>Lines covered</th>
+        <th>Lines missed</th>
+        <th>Avg. Hits / Line</th>
+      </tr>
+    </thead>
+    <tbody>
+      <% source_files.each do |source_file| %>
+      <tr>
+        <td class="strong"><%= 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>
+        <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><%= source_file.missed_lines.count %></td>
+        <td><%= source_file.covered_strength %></td>
+      </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>

data/views/layout.erb

@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html xmlns='http://www.w3.org/1999/xhtml'>
+  <head>
+    <title>Code coverage for <%= 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="shortcut icon" type="image/png" href="<%= assets_path("favicon_#{coverage_css_class(result.source_files.covered_percent)}.png") %>" />
+    <link rel="icon" type="image/png" href="<%= assets_path('favicon.png') %>" />
+  </head>
+
+  <body>
+    <div id="loading">
+      <img src="<%= assets_path('loading.gif') %>" alt="loading"/>
+    </div>
+    <div id="wrapper" style="display:none;">
+      <div class="timestamp">Generated <%= timeago(Time.now) %></div>
+      <ul class="group_tabs"></ul>
+
+      <div id="content">
+        <%= formatted_file_list("All Files", result.source_files) %>
+
+        <% result.groups.each do |name, files| %>
+          <%= formatted_file_list(name, files) %>
+        <% end %>
+      </div>
+
+      <div id="footer">
+        Generated by <a href="http://github.com/danmayer/coverband">Coverband</a> v<%= Coverband::VERSION %>
+      </div>
+
+      <div class="source_files">
+      <% result.source_files.each do |source_file| %>
+        <%= formatted_source_file(source_file) %>
+      <% end %>
+      </div>
+    </div>
+  </body>
+</html>

data/views/source_file.erb

@@ -0,0 +1,23 @@
+<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>
+    <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>
+  
+  <pre>
+    <ol>
+      <% source_file.lines.each do |line| %>
+        <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.skipped? %><span class="hits">skipped</span><% end %>
+          <code class="ruby"><%= CGI.escapeHTML(line.src.chomp) %></code>
+        </li>
+      <% end %>
+    </ol>
+  </pre>
+</div>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coverband
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1.alpha
 platform: ruby
 authors:
 - Dan Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-05 00:00:00.000000000 Z
+date: 2018-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: classifier-reborn
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: classifier-reborn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,13 +179,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -193,19 +193,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: redis
   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'
 description: Rack middleware to help measure production code usage (LOC runtime usage)
 email:
 - dan@mayerdan.com
@@ -237,12 +237,41 @@ files:
 - lib/coverband/integrations/rack_server_check.rb
 - lib/coverband/reporters/base.rb
 - lib/coverband/reporters/console_report.rb
-- lib/coverband/reporters/simple_cov_report.rb
+- lib/coverband/reporters/html_report.rb
 - lib/coverband/reporters/web.rb
+- lib/coverband/utils/file_list.rb
+- lib/coverband/utils/html_formatter.rb
+- lib/coverband/utils/lines_classifier.rb
 - lib/coverband/utils/railtie.rb
+- lib/coverband/utils/result.rb
 - lib/coverband/utils/s3_report.rb
+- lib/coverband/utils/source_file.rb
 - lib/coverband/utils/tasks.rb
 - lib/coverband/version.rb
+- public/application.css
+- public/application.js
+- public/colorbox/border.png
+- public/colorbox/controls.png
+- public/colorbox/loading.gif
+- public/colorbox/loading_background.png
+- public/favicon_green.png
+- public/favicon_red.png
+- public/favicon_yellow.png
+- public/images/ui-bg_flat_0_aaaaaa_40x100.png
+- public/images/ui-bg_flat_75_ffffff_40x100.png
+- public/images/ui-bg_glass_55_fbf9ee_1x400.png
+- public/images/ui-bg_glass_65_ffffff_1x400.png
+- public/images/ui-bg_glass_75_dadada_1x400.png
+- public/images/ui-bg_glass_75_e6e6e6_1x400.png
+- public/images/ui-bg_glass_95_fef1ec_1x400.png
+- public/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+- public/images/ui-icons_222222_256x240.png
+- public/images/ui-icons_2e83ff_256x240.png
+- public/images/ui-icons_454545_256x240.png
+- public/images/ui-icons_888888_256x240.png
+- public/images/ui-icons_cd0a0a_256x240.png
+- public/loading.gif
+- public/magnify.png
 - test/benchmarks/.gitignore
 - test/benchmarks/benchmark.rake
 - test/benchmarks/dog.rb
@@ -278,9 +307,12 @@ files:
 - test/unit/rails_full_stack_test.rb
 - test/unit/reports_base_test.rb
 - test/unit/reports_console_test.rb
-- test/unit/reports_simple_cov_test.rb
+- test/unit/reports_html_test.rb
 - test/unit/reports_web_test.rb
 - test/unit/utils_s3_report_test.rb
+- views/file_list.erb
+- views/layout.erb
+- views/source_file.erb
 homepage: https://github.com/danmayer/coverband
 licenses:
 - MIT
@@ -296,9 +328,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.3
@@ -341,6 +373,6 @@ test_files:
 - test/unit/rails_full_stack_test.rb
 - test/unit/reports_base_test.rb
 - test/unit/reports_console_test.rb
-- test/unit/reports_simple_cov_test.rb
+- test/unit/reports_html_test.rb
 - test/unit/reports_web_test.rb
 - test/unit/utils_s3_report_test.rb

data/lib/coverband/reporters/simple_cov_report.rb

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-module Coverband
-  module Reporters
-    class SimpleCovReport < Base
-      def self.report(store, options = {})
-        begin
-          require 'simplecov'
-        rescue StandardError
-          msg = 'coverband requires simplecov to generate a report, when config.reporter=scov'
-          Coverband.configuration.logger.error msg
-          return
-        end
-
-        scov_style_report = super(store, options)
-        open_report = options.fetch(:open_report) { true }
-
-        # set root to show files if user has simplecov profiles
-        # https://github.com/danmayer/coverband/issues/59
-        SimpleCov.root(current_root)
-
-        # add in files never hit in coverband
-        SimpleCov.track_files "#{current_root}/{app,lib,config}/**/*.{rb,haml,erb,slim}"
-
-        # still apply coverband filters
-        report_files = SimpleCov.add_not_loaded_files(scov_style_report)
-        filtered_report_files = {}
-        report_files.each_pair do |file, data|
-          next if Coverband.configuration.ignore.any? { |i| file.match(i) }
-          filtered_report_files[file] = data
-        end
-
-        SimpleCov::Result.new(filtered_report_files).format!
-
-        if open_report
-          `open #{SimpleCov.coverage_dir}/index.html`
-        else
-          Coverband.configuration.logger.info "report is ready and viewable: open #{SimpleCov.coverage_dir}/index.html"
-        end
-
-        Coverband::Utils::S3Report.instance.persist! if Coverband.configuration.s3_bucket
-      end
-    end
-  end
-end