coverband 4.0.1.alpha → 4.0.1.beta

data/lib/coverband/utils/result.rb

@@ -43,6 +43,7 @@ module Coverband
       end
 
       # Returns a Hash of groups for this result. Define groups using SimpleCov.add_group 'Models', 'app/models'
+      # Coverband doesn't currently support groups
       def groups
         @groups ||= [] # SimpleCov.grouped(files)
       end

data/lib/coverband/utils/s3_report.rb

@@ -24,7 +24,7 @@ module Coverband
         @access_key_id = options[:access_key_id]
         @secret_access_key = options[:secret_access_key]
         begin
-          require 'aws-sdk'
+          require 'aws-sdk-s3'
         rescue StandardError
           err_msg = 'coverband requires aws-sdk in order use S3Report.'
           Coverband.configuration.logger.error err_msg

data/lib/coverband/utils/source_file.rb

@@ -186,7 +186,7 @@ module Coverband
         skipping = false
 
         lines.each do |line|
-          if false # SimpleCov::LinesClassifier.no_cov_line?(line.src)
+          if Coverband::Utils::LinesClassifier.no_cov_line?(line.src)
             skipping = !skipping
             line.skipped!
           elsif skipping

data/lib/coverband/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Coverband
-  VERSION = '4.0.1.alpha'
+  VERSION = '4.0.1.beta'
 end

data/public/application.css

@@ -748,6 +748,43 @@ td {
     text-align: center;
     border-radius: 6px; }
 
+#header {
+  color: #FFF;
+  font-size: 12px;
+  font-weight: bold;
+  margin-bottom: 12px;
+  text-align: left; }
+  #header a {
+    color: #FFF;
+    text-decoration: underline; }
+    #header a:hover {
+      color: white;
+      text-decoration: none; }
+    #header a:hover {
+      color: white;
+      text-decoration: none; }
+
+.coveraband-button-improve {
+  background-color: #4CAF50; /* Green */
+  border: none;
+  color: white;
+  padding: 15px 32px;
+  text-align: center;
+  text-decoration: none;
+  display: inline-block;
+  font-size: 16px;
+}
+
+.coverband-admin-form {
+  display: inline-block;
+}
+
+.notice {
+  color: #856404;
+  background-color: #fff3cd;
+  border-color: #ffeeba;
+}
+
 #footer {
   color: #dddddd;
   font-size: 12px;
@@ -794,6 +831,3 @@ td {
   background-color: #fbf0c0; }
 .source_table .skipped:nth-child(even) {
   background-color: #fbffcf; }
-
-
-

data/public/application.js

@@ -1114,14 +1114,14 @@ var hljs=new function(){function l(o){return o.replace(/&/gm,"&amp;").replace(/<
  * Version:     1.7.0
  * Author:      Allan Jardine (www.sprymedia.co.uk)
  * Info:        www.datatables.net
- * 
+ *
  * Copyright 2008-2010 Allan Jardine, all rights reserved.
  *
  * This source file is free software, under either the GPL v2 license or a
  * BSD style license, as supplied with this software.
- * 
- * This source file is distributed in the hope that it will be useful, but 
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 
+ *
+ * This source file is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
  * or FITNESS FOR A PARTICULAR PURPOSE. See the license files for details.
  */
 
@@ -1411,40 +1411,40 @@ jQuery.fn.dataTableExt.oSort['percent-desc'] = function(a,b) {
 jQuery.url = function()
 {
 	var segments = {};
-	
+
 	var parsed = {};
-	
+
 	/**
     * Options object. Only the URI and strictMode values can be changed via the setters below.
     */
   	var options = {
-	
+
 		url : window.location, // default URI is the page in which the script is running
-		
+
 		strictMode: false, // 'loose' parsing by default
-	
-		key: ["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"], // keys available to query 
-		
+
+		key: ["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"], // keys available to query
+
 		q: {
 			name: "queryKey",
 			parser: /(?:^|&)([^&=]*)=?([^&]*)/g
 		},
-		
+
 		parser: {
 			strict: /^(?:([^:\/?#]+):)?(?:\/\/((?:(([^:@]*):?([^:@]*))?@)?([^:\/?#]*)(?::(\d*))?))?((((?:[^?#\/]*\/)*)([^?#]*))(?:\?([^#]*))?(?:#(.*))?)/,  //less intuitive, more accurate to the specs
 			loose:  /^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*):?([^:@]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/ // more intuitive, fails on relative paths and deviates from specs
 		}
-		
+
 	};
-	
+
     /**
      * Deals with the parsing of the URI according to the regex above.
  	 * Written by Steven Levithan - see credits at top.
-     */		
+     */
 	var parseUri = function()
 	{
 		str = decodeURI( options.url );
-		
+
 		var m = options.parser[ options.strictMode ? "strict" : "loose" ].exec( str );
 		var uri = {};
 		var i = 14;
@@ -1465,55 +1465,55 @@ jQuery.url = function()
 
     /**
      * Returns the value of the passed in key from the parsed URI.
-  	 * 
+  	 *
 	 * @param string key The key whose value is required
-     */		
+     */
 	var key = function( key )
 	{
 		if ( ! parsed.length )
 		{
-			setUp(); // if the URI has not been parsed yet then do this first...	
-		} 
+			setUp(); // if the URI has not been parsed yet then do this first...
+		}
 		if ( key == "base" )
 		{
 			if ( parsed.port !== null && parsed.port !== "" )
 			{
-				return parsed.protocol+"://"+parsed.host+":"+parsed.port+"/";	
+				return parsed.protocol+"://"+parsed.host+":"+parsed.port+"/";
 			}
 			else
 			{
 				return parsed.protocol+"://"+parsed.host+"/";
 			}
 		}
-	
+
 		return ( parsed[key] === "" ) ? null : parsed[key];
 	};
-	
+
 	/**
      * Returns the value of the required query string parameter.
-  	 * 
+  	 *
 	 * @param string item The parameter whose value is required
-     */		
+     */
 	var param = function( item )
 	{
 		if ( ! parsed.length )
 		{
-			setUp(); // if the URI has not been parsed yet then do this first...	
+			setUp(); // if the URI has not been parsed yet then do this first...
 		}
 		return ( parsed.queryKey[item] === null ) ? null : parsed.queryKey[item];
 	};
 
     /**
      * 'Constructor' (not really!) function.
-     *  Called whenever the URI changes to kick off re-parsing of the URI and splitting it up into segments. 
-     */	
+     *  Called whenever the URI changes to kick off re-parsing of the URI and splitting it up into segments.
+     */
 	var setUp = function()
 	{
 		parsed = parseUri();
-		
-		getSegments();	
+
+		getSegments();
 	};
-	
+
     /**
      * Splits up the body of the URI into segments (i.e. sections delimited by '/')
      */
@@ -1523,9 +1523,9 @@ jQuery.url = function()
 		segments = []; // clear out segments array
 		segments = parsed.path.length == 1 ? {} : ( p.charAt( p.length - 1 ) == "/" ? p.substring( 1, p.length - 1 ) : path = p.substring( 1 ) ).split("/");
 	};
-	
+
 	return {
-		
+
 	    /**
 	     * Sets the parsing mode - either strict or loose. Set to loose by default.
 	     *
@@ -1536,20 +1536,20 @@ jQuery.url = function()
 			strictMode = mode == "strict" ? true : false;
 			return this;
 		},
-		
+
 		/**
 	     * Sets URI to parse if you don't want to to parse the current page's URI.
 		 * Calling the function with no value for newUri resets it to the current page's URI.
 	     *
 	     * @param string newUri The URI to parse.
-	     */		
+	     */
 		setUrl : function( newUri )
 		{
 			options.url = newUri === undefined ? window.location : newUri;
 			setUp();
 			return this;
-		},		
-		
+		},
+
 		/**
 	     * Returns the value of the specified URI segment. Segments are numbered from 1 to the number of segments.
 		 * For example the URI http://test.com/about/company/ segment(1) would return 'about'.
@@ -1557,32 +1557,38 @@ jQuery.url = function()
 		 * If no integer is passed into the function it returns the number of segments in the URI.
 	     *
 	     * @param int pos The position of the segment to return. Can be empty.
-	     */	
+	     */
 		segment : function( pos )
 		{
 			if ( ! parsed.length )
 			{
-				setUp(); // if the URI has not been parsed yet then do this first...	
-			} 
+				setUp(); // if the URI has not been parsed yet then do this first...
+			}
 			if ( pos === undefined )
 			{
 				return segments.length;
 			}
 			return ( segments[pos] === "" || segments[pos] === undefined ) ? null : segments[pos];
 		},
-		
+
 		attr : key, // provides public access to private 'key' function - see above
-		
+
 		param : param // provides public access to private 'param' function - see above
-		
+
 	};
-	
+
 }();
 
 
 
 
 $(document).ready(function() {
+  $(".del").click(function(){
+    if (!confirm("Do you want to delete")){
+      return false;
+    }
+  });
+
   // Configuration for fancy sortable tables for source file groups
   $('.file_list').dataTable({
     "aaSorting": [[ 1, "asc" ]],

data/test/fixtures/app/controllers/sample_controller.rb

@@ -0,0 +1,10 @@
+# Foo class
+class Foo
+  def initialize
+    @foo = 'baz'
+  end
+
+  def bar
+    @foo
+  end
+end

data/test/fixtures/app/models/user.rb

@@ -0,0 +1,10 @@
+# Foo class
+class Foo
+  def initialize
+    @foo = 'baz'
+  end
+
+  def bar
+    @foo
+  end
+end

data/test/fixtures/never.rb

@@ -0,0 +1,2 @@
+# This class is purely some
+# comments

data/test/fixtures/sample.rb

@@ -0,0 +1,16 @@
+# Foo class
+class Foo
+  def initialize
+    @foo = 'baz'
+  end
+
+  def bar
+    @foo
+  end
+
+  #:nocov:
+  def skipped
+    @foo * 2
+  end
+  #:nocov:
+end

data/test/fixtures/skipped.rb

@@ -0,0 +1,4 @@
+# Not relevant
+# :nocov:
+# Hash.new
+# :nocov:

data/test/fixtures/skipped_and_executed.rb

@@ -0,0 +1,8 @@
+# So much skippping
+# :nocov:
+class Foo
+  def bar
+    0
+  end
+end
+#:nocov:

data/test/fixtures/utf-8.rb

@@ -0,0 +1,3 @@
+# encoding: utf-8
+
+puts "135°C"

data/test/rails4_dummy/config/coverband.rb

@@ -3,6 +3,6 @@ Coverband.configure do |config|
   config.store             = Coverband::Adapters::RedisStore.new(Redis.new(url: ENV['REDIS_URL'])) if defined? Redis
   config.ignore            = %w[vendor .erb$ .slim$]
   config.root_paths        = []
-  config.reporting_frequency = 100.0
   config.logger              = Rails.logger
+  config.background_reporting_sleep_seconds = 0.1
 end

data/test/rails4_dummy/config/routes.rb

@@ -1,3 +1,4 @@
 Rails.application.routes.draw do
   get 'dummy/show'
+  mount Coverband::Reporters::Web.new, at: '/coverage'
 end

data/test/rails5_dummy/config/coverband.rb

@@ -3,6 +3,7 @@ Coverband.configure do |config|
   config.store             = Coverband::Adapters::RedisStore.new(Redis.new(url: ENV['REDIS_URL'])) if defined? Redis
   config.ignore            = %w[vendor .erb$ .slim$]
   config.root_paths        = []
-  config.reporting_frequency = 100.0
-  config.logger              = Rails.logger
+  config.logger            = Rails.logger
+  config.verbose           = true
+  config.background_reporting_sleep_seconds = 0.1
 end

data/test/rails5_dummy/config/routes.rb

@@ -1,3 +1,4 @@
 Rails.application.routes.draw do
   get 'dummy/show'
+  mount Coverband::Reporters::Web.new, at: '/coverage'
 end

data/test/rails_test_helper.rb

@@ -2,10 +2,10 @@
 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/minitest'
 
-if Rails::VERSION::MAJOR >= 5
-  require_relative "../test/rails5_dummy/config/environment"
-else
-  require_relative "../test/rails4_dummy/config/environment"
-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

@@ -1,13 +1,23 @@
 # frozen_string_literal: true
 
+# This lets us ignore warnings from our test dependencies when loaded
+# We do this because of aws-sdk-s3
+# aws-sdk-s3 is written in such a way to cause dozens of warnings
+original_verbosity = $VERBOSE
+$VERBOSE = nil
 require 'rubygems'
+require 'aws-sdk-s3'
+require 'coveralls'
 require 'simplecov'
-require 'test/unit'
-require 'mocha/setup'
+require 'minitest/autorun'
+require 'mocha/minitest'
 require 'ostruct'
 require 'json'
 require 'redis'
 require 'pry-byebug'
+$VERBOSE = original_verbosity
+
+Coveralls.wear!
 
 SimpleCov.start do
   add_filter 'specs/ruby/1.9.1/gems/'
@@ -15,6 +25,26 @@ SimpleCov.start do
   add_filter '/config/'
 end
 
+module Coverband
+  module Test
+    def self.reset
+      Coverband.configuration.store.clear!
+      Coverband.configuration.reset
+      Coverband::Collectors::Coverage.instance.reset_instance
+      Coverband::Background.stop
+    end
+
+    def setup
+      super
+      Coverband::Test.reset
+    end
+  end
+end
+
+Minitest::Test.class_eval do
+  prepend Coverband::Test
+end
+
 TEST_COVERAGE_FILE = '/tmp/fake_file.json'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -66,6 +96,24 @@ def fake_coverage_report
   { 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
+
+# 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
+  # an in-memory IO object so we can return the string value. You can assign any
+  # IO object here.
+  previous_stderr = $stderr
+  $stderr = StringIO.new
+  yield
+  $stderr.string
+ensure
+  # Restore the previous value of stderr (typically equal to STDERR).
+  $stderr = previous_stderr
+end
+
 require 'coverband'
 
 Coverband::Configuration.class_eval do