coverband 2.0.1 → 2.0.2.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3885791f4771973082ff809237d3a15a7f397ed
-  data.tar.gz: 158d669d609287e94b50b12d71811ca3252d80ee
+  metadata.gz: d86abf13125588b12cb567afcf59f8289cb4bd1c
+  data.tar.gz: bda957a57268f3d5a74ea6ffe8502146edf2c4bb
 SHA512:
-  metadata.gz: c252116c4add56d46c26662dbebf90d03ba40de023dbb67250f69c92a72037f7a8c0d3e2a4a075f365f2f6c4be5306d1fe0a2328e03d684be615d3d2a922272c
-  data.tar.gz: 51988a04b8b22d8181beeaf209bf320c9bdfd042e427de59b9caa8902f3f9792569451454489961c290105a67e2e0e40efcc2684d10aabaea6114c3e41ae8215
+  metadata.gz: 599dbb24f2292684fe9418352e1564ffa13cebcb5c3ff5831f90d0ad86496b00ec4f1e16c33f1f38c2f96a098553422bb2e44af263bd4c7379ab4ecee045dcd0
+  data.tar.gz: 013454ba197354052f8fa8ce933a7a669761b685299e7e3657895b370201b166837961dc92c81fb4068c2dc5333abad89625e080fbf6454001621992ee05e9ed

data/.gitignore

@@ -18,4 +18,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-.byebug_history
+.byebug_history
+.env

data/README.md

@@ -4,6 +4,7 @@ Build Status: [![Build Status](https://travis-ci.org/danmayer/coverband.svg?bran
 
 <p align="center">
   <a href="#key-features">Key Features</a> •
+  <a href="#coverband-demo">Coverband Demo</a> •
   <a href="#how-to-use">How To Use</a> •
   <a href="#installation">Installation</a> •
   <a href="#configuration">Configuration</a> •
@@ -17,24 +18,31 @@ Note: Coverband is not intended for test code coverage, for that just check out
 
 ## Key Features
 
-* Allows sampling to avoid the performance overhead on every request.
+The primary goal of Coverband is giving deep insight into your production runtime usage of your application code, while having the least impact on performance possible.
+
+* Low performance overhead
+* Various controls from sampling, data collection rate, etc to further control performance
 * Ignore directories to avoid overhead data collection on vendor, lib, etc.
-* Take a baseline to get initial app execution during app initialization. (the baseline is important because some code is executed during app load, but might not be invoked during any requests, think prefetching, initial cache builds, setting constants, etc...)
-* Development mode for additional code usage details (number of LOC execution during single request, etc).
+* Development mode, offers deep insight of code usage details (number of LOC execution during single request, etc) during development.
+* Easy setup for any Ruby Rack based web framework (Rails, Sinatra, etc)
+* Allows for integration with any other Ruby application flows (background jobs, crons, scripts)
+
+## Coverband Demo
+
+Take Coverband for a spin on the live Heroku deployed [Coverband Demo](https://coverband-demo.herokuapp.com/). The [full source code for the demo](https://github.com/danmayer/coverband_demo) is available to help with configuration and understanding of basic usage.
 
 # How To Use
 
 Below is my Coverband workflow, which hopefully will help other best use this library.
 
-* install coverband.
-* take baseline measurment: `rake coverband:baseline` (__note: never run baseline on production__)
-* validate baseline with  `rake coverband:coverage`
+* install coverband
+* start your app and hit a few endpoints
+* validate data collection and code coverage with  `rake coverband:coverage`
 * test setup in development (hit endpoints and generate new report)
 * deploy to staging and verify functionality
 * deploy to production and verify functionality
-* every 2 weeks or with major releases
+* every 2 weeks or so, with major releases
    * clear old coverage: `rake coverband:clear`
-   * take new baseline: `rake coverband:baseline`
    * deploy and verify coverage is matching expectations
 * __COVERAGE DRIFT__
    * if you never clear you have lines of code drift from when they were recorded
@@ -138,8 +146,7 @@ require 'coverband/tasks'
 This should give you access to a number of Coverband tasks
 
 ```bash
-bundle exec rake -T coverband
-rake coverband:baseline      # record coverband coverage baseline
+rake -T coverband
 rake coverband:clear         # reset coverband coverage data
 rake coverband:coverage      # report runtime coverband code coverage
 ```
@@ -194,10 +201,10 @@ run ActionController::Dispatcher.new
 
 # Verify Correct Installation
 
-* Gather baseline metrics: run `bundle exec rake coverband:baseline` (__note: never run baseline on production__)
-* run `bundle exec rake coverband:coverage` this will show app initialization coverage
+* boot up your application
+* run `rake coverband:coverage` this will show app initialization coverage
 * run app and hit a controller (hit at least +1 time over your `config.startup_delay` setting default is 0)
-* run `bundle exec rake coverband:coverage` and you should see coverage increasing for the endpoints you hit.
+* run `rake coverband:coverage` and you should see coverage increasing for the endpoints you hit.
 
 ## Installation Script
 
@@ -220,7 +227,7 @@ bundle install
 
 # Make some code so we can look at the coverage
 rails generate scaffold blogs
-bundle exec rake db:migrate
+rake db:migrate
 
 # open Rakefile, add lines
 require 'coverband'
@@ -233,10 +240,9 @@ rake -T coverband
 # configure config/application.rb
 # copy lines from readme
 
-
-rake coverband:baseline
+# start up your app
 rake coverband:coverage
-# view baseline coverage
+# view boot up coverage
 
 rails s
 
@@ -256,68 +262,14 @@ rake coverband:coverage
 - [Sinatra app](https://github.com/danmayer/churn-site)
 - [Non Rack Ruby app](https://github.com/danmayer/coverband_examples)
 
-### Coverband Baseline
-
-__TLDR:__ Baseline is app initialization coverage, not captured during runtime.
-
-Before starting a service verify your baseline by running `rake coverband:baseline` followed by `rake coverband:coverage` to view what your baseline coverage looks like before any runtime traffic has been recorded.
-
-The baseline seems to cause some confusion. Basically, when Coverband records code usage, it will not request initial startup code like method definition, it covers what it hit during run time. This would produce a fairly odd view of code usage. To cover things like defining routes, dynamic methods, and the like Coverband records a baseline. The baseline should capture coverage of app initialization and boot up, we don't want to do this on deploy as it can be slow. So we take a recording of boot up as a one time baseline Rake task `bundle exec rake coverband:baseline`.
-
-1. Start your server with `rails s` or `rackup config.ru`.
-2. Hit your development server exercising the endpoints you want to verify Coverband is recording (you should see debug outputs in your server console)
-3. Run `rake coverband:coverage` again, previously it should have only shown the baseline data of your app initializing. After using it in development it should show increased coverage from the actions you have exercised.
-
-Note: if you use `rails s` and data isn't recorded, make sure it is using your `config.ru`.
-
-### Baseline Missing data
-
-The default Coverband baseline task will try to detect your app as either Rack or Rails environment. It will load the app to take a baseline reading. The baseline coverage is important because some code is executed during app load, but might not be invoked during any requests, think prefetching, initial cache builds, setting constants, etc. If the baseline task doesn't load your app well you can override the default baseline to create a better baseline yourself. Below for example is how I take a baseline on a pretty simple Sinatra app.
-
-```ruby
-namespace :coverband do
-  desc "get coverage baseline"
-  task :baseline_app do
-    Coverband::Reporter.baseline {
-      require 'sinatra'
-      require './app.rb'
-    }
-  end
-end
-```
-
 ### View Coverage
 
 You can view the report different ways, but the easiest is the Rake task which opens the SimpleCov formatted HTML.
 
-`bundle exec rake coverband:coverage`
+`rake coverband:coverage`
 
 This should auto-open in your browser, but if it doesn't the output file should be in `coverage/index.html`
 
-### Conflicting .Simplecov: Issue with Missing or 0% Coverage Report
-
-If you use SimpleCov to generate code coverage for your tests. You might have setup a `.simplecov` file to help control and focus it's output. Often the settings you want for your test's code coverage report are different than what you want Coverband to be reporting on. Since Coverband uses the SimpleCov HTML formatter to prepare it's report.
-
-So if you had something like this in a `.simplecov` file in the root of your project, as reported in [issue 83](https://github.com/danmayer/coverband/issues/83)
-
-```
-require 'simplecov'
-
-SimpleCov.start do
-  add_filter 'app/admin'
-  add_filter '/spec/'
-  add_filter '/config/'
-  add_filter '/vendor/'
-  add_filter 'userevents'
-end
-```
-
-You could see some confusing results... To avoid this issue Coverband has a Rake task that will ignore all Simplecov filters.
-
-`rake coverband:coverage_no_filters`
-
-This will build the report after disabling any `.simplecov` applied settings.
-
 ### Clear Coverage
 
 If your code has changed and your coverage line data doesn't seem to match run time. You probably need to clear your old line data... You will need to run this in the environment you wish to clear the data from.
@@ -525,7 +477,7 @@ Beyond writing to S3 you can host the S3 file with a build in Sintatra app in Co
 ```
 Rails.application.routes.draw do
   # ... lots of routes
-  mount Coverband::S3Web, at: '/coverage'
+  mount Coverband::Reporters::Web.new, at: '/coverage'
 end
 ```
 
@@ -554,11 +506,35 @@ end
 Rails.application.routes.draw do
   # ... lots of routes
   constraints basic_constraint do
-    mount Coverband::S3Web, at: '/coverage'
+    mount Coverband::Reporters::Web.new, at: '/coverage'
   end
 end
 ```
 
+### Conflicting .Simplecov: Issue with Missing or 0% Coverage Report
+
+If you use SimpleCov to generate code coverage for your tests. You might have setup a `.simplecov` file to help control and focus it's output. Often the settings you want for your test's code coverage report are different than what you want Coverband to be reporting on. Since Coverband uses the SimpleCov HTML formatter to prepare it's report.
+
+So if you had something like this in a `.simplecov` file in the root of your project, as reported in [issue 83](https://github.com/danmayer/coverband/issues/83)
+
+```
+require 'simplecov'
+
+SimpleCov.start do
+  add_filter 'app/admin'
+  add_filter '/spec/'
+  add_filter '/config/'
+  add_filter '/vendor/'
+  add_filter 'userevents'
+end
+```
+
+You could see some confusing results... To avoid this issue Coverband has a Rake task that will ignore all Simplecov filters.
+
+`rake coverband:coverage_no_filters`
+
+This will build the report after disabling any `.simplecov` applied settings.
+
 # Contributing To Coverband
 
 If you are working on adding features, PRs, or bugfixes to Coverband this section should help get you going.
@@ -567,24 +543,24 @@ If you are working on adding features, PRs, or bugfixes to Coverband this sectio
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
-5. Make sure all tests are passing (run `bundle install`, make sure Redis is running, and then execute `bundle exec rake test`)
+5. Make sure all tests are passing (run `bundle install`, make sure Redis is running, and then execute `rake test`)
 6. Create new Pull Request
 
 ### Tests & Benchmarks
 
 If you submit a change please make sure the tests and benchmarks are passing.
 
-* run tests: `bundle exec rake`
+* run tests: `rake`
 * view test coverage: `open coverage/index.html`
 * run the benchmarks before and after your change to see impact
-   * `bundle exec rake benchmarks` 
+   * `rake benchmarks` 
 
 ### Known Issues
 
 * __total fail__ on front end code, because of the precompiled template step basically coverage doesn't work well for `erb`, `slim`, and the like.
   * related it will try to report something, but the line numbers reported for `ERB` files are often off and aren't considered useful. I recommend filtering out .erb using the `config.ignore` option. 
 * If you have SimpleCov filters, you need to clear them prior to generating your coverage report. As the filters will be applied to Coverband as well and can often filter out everything we are recording.
-* coverage doesn't show for Rails `config/application.rb` or `config/boot.rb` as they get loaded when loading the Rake environment prior to starting to record the baseline.
+* coverage doesn't show for Rails `config/application.rb` or `config/boot.rb` as they get loaded when loading the Rake environment prior to starting the `Coverage` library.
 
 ### Debugging Redis Store
 
@@ -655,20 +631,20 @@ Similar format to redis store, but array with integer values
 
 ### Todo
 
-* Sinatra App with admin controls
+* rackup / how to run webapp via rake
+  * move off sinatra to pure rack 
 * graphite adapters (it would allow passing in date ranges on usage)
 * perf test for array vs hash
 * redis pipeline around hash (or batch get then push)
-* pass in namespace to redis (coverage vs baseline)
-* what about having baseline a onetime recording into redis no merge later
 * move to SimpleCov console out, or make similar console tabular output
-* Fix network performance by logging to files that purge later (like NR) (far more time lost in TracePoint than sending files, hence not a high priority, but would be cool)
+* Improve network performance by logging to files that purge later (like NR) (far more time lost in TracePoint than sending files, hence not a high priority, but would be cool)
 * Add support for [zadd](http://redis.io/topics/data-types-intro) so one could determine single call versus multiple calls on a line, letting us determine the most executed code in production.
 * Possibly add ability to record code run for a given route
+* integrate recording with deploy tag or deploy timestamp
+   *  diff code usage across deployed versions 
 * Improve client code api, around manual usage of sampling (like event usage)
 * ability to change the Coverband config at runtime by changing the config pushed to the Redis hash. In memory cache around the changes to only make that call periodically.
 * Opposed to just showing code usage on a route allow 'tagging' events which would record line coverage for that tag (this would allow tagging all code that modified an ActiveRecord model for example
-* mountable rack app to view coverage similar to flipper-ui
 * support runner, active job, etc without needed extra config (improved railtie integration)
 
 # Resources

data/Rakefile

@@ -19,3 +19,10 @@ desc 'load irb with this gem'
 task :console do
   exec 'irb -I lib -r coverband'
 end
+
+# This is really just for testing and development because without configuration
+# Coverband can't do much
+desc 'start webserver'
+task :server do
+  exec 'rackup -I lib'
+end

data/changes.md

@@ -14,6 +14,18 @@ Will be the fully modern release that drops maintenance legacy support in favor
    * built in support for activejob, sidekiq, and other common frameworks
 * code route tracing (entry point to all code executed for example /some_path -> code coverage of that path)
 
+# Alpha 
+
+### 2.0.2
+
+* fix possible nil error on files that changed since initial recording @viktor-silakov
+* add improve error logging in verbose mode (stacktrace) @viktor-silakov 
+* improved logging level support @viktor-silakov 
+* launch Coverband demo and integrate into Readme / Documentation
+* fix on baseline to show an issue by @viktor-silakov
+* remove all coverband:baseline related features and documentation
+* dropped Sinatra requirement for web mountable page
+
 # Released
 
 ### 2.0.1

data/config.ru

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+require ::File.expand_path('../lib/coverband', __FILE__)
+run Coverband::Reporters::Web.new

data/coverband.gemspec

@@ -26,7 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rack'
   spec.add_development_dependency 'rack-test'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'sinatra'
   spec.add_development_dependency 'test-unit'
   spec.add_development_dependency 'redis'
   spec.add_development_dependency 'benchmark-ips'

data/lib/coverband.rb

@@ -12,10 +12,10 @@ require 'coverband/adapters/file_store'
 require 'coverband/collectors/base'
 require 'coverband/collectors/trace'
 require 'coverband/collectors/coverage'
-require 'coverband/baseline'
 require 'coverband/reporters/base'
 require 'coverband/reporters/simple_cov_report'
 require 'coverband/reporters/console_report'
+require 'coverband/reporters/web'
 require 'coverband/middleware'
 require 'coverband/s3_report_writer'
 

data/lib/coverband/collectors/base.rb

@@ -87,7 +87,7 @@ module Coverband
       end
 
       def output_file_line_usage
-        @logger.info 'coverband debug coverband file:line usage:'
+        @logger.debug 'coverband debug coverband file:line usage:'
         @file_line_usage.sort_by { |_key, value| value.length }.each do |pair|
           file = pair.first
           lines = pair.last

data/lib/coverband/collectors/coverage.rb

@@ -18,7 +18,7 @@ module Coverband
         end
 
         if failed_recently?
-          @logger.info 'coverage reporting standing-by because of recent failure' if @verbose
+          @logger.error 'coverage reporting standing-by because of recent failure' if @verbose
           return
         end
 
@@ -31,7 +31,7 @@ module Coverband
         end
 
         if @verbose
-          @logger.info "coverband file usage: #{file_usage.inspect}"
+          @logger.debug "coverband file usage: #{file_usage.inspect}"
           output_file_line_usage if @verbose == 'debug'
         end
 
@@ -39,8 +39,8 @@ module Coverband
           @store.save_report(@file_line_usage)
           @file_line_usage.clear
         elsif @verbose
-          @logger.info 'coverage report: '
-          @logger.info @file_line_usage.inspect
+          @logger.debug 'coverage report: '
+          @logger.debug @file_line_usage.inspect
         end
       # StandardError might be better option
       # coverband previously had RuntimeError here
@@ -49,15 +49,16 @@ module Coverband
       rescue StandardError => err
         failed!
         if @verbose
-          @logger.info 'coverage missing'
-          @logger.info "error: #{err.inspect} #{err.message}"
+          @logger.error 'coverage missing'
+          @logger.error "error: #{err.inspect} #{err.message}"
+          @logger.error err.backtrace
         end
       end
 
       private
 
       def array_diff(latest, original)
-        latest.map.with_index { |v, i| v ? v - original[i] : nil }
+        latest.map.with_index { |v, i| (v && original[i]) ? v - original[i] : nil }
       end
 
       def previous_results

data/lib/coverband/collectors/trace.rb

@@ -2,8 +2,16 @@
 
 module Coverband
   module Collectors
+    ###
+    # NOTE: While this still works it is slower than Coverage.
+    # I recommend using the Coverage adapter.
+    # As baseline is removed the Trace collector also doesn't have a good way
+    # to collect initial code usage during app boot up.
+    #
+    # I am leaving Trace around as I believe there are some interesting use cases
+    # also, it illustrates an alternative collector, and I have some others I would like to implement
+    ###
     class Trace < Base
-
       def reset_instance
         super
         @tracer_set = false
@@ -21,8 +29,9 @@ module Coverband
       rescue RuntimeError => err
         failed!
         if @verbose
-          @logger.info 'error stating recording coverage'
-          @logger.info "error: #{err.inspect} #{err.message}"
+          @logger.error 'error stating recording coverage'
+          @logger.error "error: #{err.inspect} #{err.message}"
+          @logger.error err.backtrace
         end
       end
 
@@ -39,12 +48,12 @@ module Coverband
         unset_tracer
 
         if failed_recently?
-          @logger.info 'coverage reporting standing-by because of recent failure' if @verbose
+          @logger.error 'coverage reporting standing-by because of recent failure' if @verbose
           return
         end
 
         if @verbose
-          @logger.info "coverband file usage: #{file_usage.inspect}"
+          @logger.debug "coverband file usage: #{file_usage.inspect}"
           output_file_line_usage if @verbose == 'debug'
         end
 
@@ -58,8 +67,9 @@ module Coverband
       rescue RuntimeError => err
         failed!
         if @verbose
-          @logger.info 'coverage missing'
-          @logger.info "error: #{err.inspect} #{err.message}"
+          @logger.error 'coverage missing'
+          @logger.error "error: #{err.inspect} #{err.message}"
+          @logger.error err.backtrace
         end
       end
 

data/lib/coverband/reporters/base.rb

@@ -9,13 +9,13 @@ module Coverband
 
         if Coverband.configuration.verbose
           Coverband.configuration.logger.info "fixing root: #{roots.join(', ')}"
-          Coverband.configuration.logger.info "additional data:\n #{additional_coverage_data}"
+          Coverband.configuration.logger.debug "additional data:\n #{additional_coverage_data}"
         end
 
         scov_style_report = report_scov_with_additional_data(store, additional_coverage_data, roots)
 
         if Coverband.configuration.verbose
-          Coverband.configuration.logger.info "report:\n #{scov_style_report.inspect}"
+          Coverband.configuration.logger.debug "report:\n #{scov_style_report.inspect}"
         end
         scov_style_report
       end

data/lib/coverband/reporters/web.rb

@@ -0,0 +1,143 @@
+# frozen_string_literal: true
+
+require 'rack'
+
+module Coverband
+  module Reporters
+    # TODO: move to reports and drop need for S3 allow reading from adapters?
+    class Web
+      attr_reader :request
+
+      def initialize
+        @static = Rack::Static.new(self,
+          root: File.expand_path('public', Gem::Specification.find_by_name('simplecov-html').full_gem_path),
+          urls: [/.*\.css/, /.*\.js/, /.*\.gif/, /.*\.png/]
+        )
+      end
+
+      def call(env)
+        @request = Rack::Request.new(env)
+
+        if request.post?
+          case request.path_info
+          when /\/clear/
+            clear
+          when /\/update_report/
+            update_report
+          when /\/collect_coverage/
+            collect_coverage
+          when /\/reload_files/
+            reload_files
+          else
+            [404, {'Content-Type' => 'text/html'}, ['404 error!']]
+          end
+        else
+          case request.path_info
+          when /.*\.(css|js|gif|png)/
+            @static.call(env)
+          when /\/show/
+            [200, {'Content-Type' => 'text/html'}, [show]]
+          when /\//
+            [200, {'Content-Type' => 'text/html'}, [index]]
+          else
+            [404, {'Content-Type' => 'text/html'}, ['404 error!']]
+          end
+        end
+      end
+
+      # todo move to file or template
+      def index
+        html = "<html>"
+        html += "<strong>Notice:</strong> #{Rack::Utils.escape_html(request.params['notice'])}<br/>" if request.params['notice']
+        html += "<ul>"
+        html += "<li><a href='#{base_path}'>Coverband Web Admin Index</a></li>"
+        html += "<li><a href='#{base_path}show'>view coverage report</a></li>"
+        html += "<li>#{button("#{base_path}collect_coverage",'update coverage data (collect coverage)')}</li>"
+        html += "<li>#{button("#{base_path}update_report",'update coverage report (rebuild report)')}</li>"
+        html += "<li>#{button("#{base_path}clear",'clear coverage report')}</li>"
+        html += "<li>#{button("#{base_path}reload_files",'reload Coverband files')}</li>"
+        html += "</ul>"
+        html += "<br/>"
+        html += "version: #{Coverband::VERSION}<br/>"
+        html += "<a href='https://github.com/danmayer/coverband'>Coverband</a>"
+        html += "</html>"
+        html
+      end
+
+      def show
+        html = s3.get_object(bucket: Coverband.configuration.s3_bucket, key: 'coverband/index.html').body.read
+        # hack the static HTML assets to link to the path where this was mounted
+        html = html.gsub("src='", "src='#{base_path}")
+        html = html.gsub("href='", "href='#{base_path}")
+        html = html.gsub("loading.gif", "#{base_path}loading.gif")
+        html = html.gsub("/images/", "#{base_path}images/")
+        html
+      end
+
+      def update_report
+        Coverband::Reporters::SimpleCovReport.report(Coverband.configuration.store, open_report: false)
+        notice = 'coverband coverage updated'
+        [301, { 'Location' => "#{base_path}?notice=#{notice}" }, []]
+      end
+
+      def collect_coverage
+        Coverband::Collectors::Base.instance.report_coverage
+        notice = 'coverband coverage collected'
+        [301, { 'Location' => "#{base_path}?notice=#{notice}" }, []]
+      end
+
+      def clear
+        Coverband.configuration.store.clear!
+        notice = 'coverband coverage cleared'
+        [301, { 'Location' => "#{base_path}?notice=#{notice}" }, []]
+      end
+
+      def reload_files
+        if Coverband.configuration.safe_reload_files
+          Coverband.configuration.safe_reload_files.each do |safe_file|
+            load safe_file
+          end
+        end
+        # force reload
+        Coverband.configure
+        notice = 'coverband files reloaded'
+        [301, { 'Location' => "#{base_path}?notice=#{notice}" }, []]
+      end
+
+      private
+
+      def button(url, title)
+        button = "<form action='#{url}' method='post'>"
+        button += "<button type='submit'>#{title}</button>"
+        button + '</form>'
+      end
+
+      # This method should get the root mounted endpoint
+      # for example if the app is mounted like so:
+      # mount Coverband::S3Web, at: '/coverage'
+      # "/coverage/collect_coverage?" become:
+      # /coverage/
+      def base_path
+        request.path.match("\/.*\/") ? request.path.match("\/.*\/")[0] : '/'
+      end
+
+      def s3
+        begin
+          require 'aws-sdk'
+        rescue StandardError
+          Coverband.configuration.logger.error "coverband requires 'aws-sdk' in order use S3ReportWriter."
+          return
+        end
+        @s3 ||= begin
+          client_options = {
+            region: Coverband.configuration.s3_region,
+            access_key_id: Coverband.configuration.s3_access_key_id,
+            secret_access_key: Coverband.configuration.s3_secret_access_key
+          }
+          client_options = {} if client_options.values.any?(&:nil?)
+          Aws::S3::Client.new(client_options)
+        end
+      end
+    end
+  end
+end

data/lib/coverband/s3_report_writer.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+# possibly move to / make an adapter or more likely a reporter
 class S3ReportWriter
   def initialize(bucket_name, options = {})
     @bucket_name = bucket_name

data/lib/coverband/tasks.rb

@@ -1,52 +1,6 @@
 # frozen_string_literal: true
 
 namespace :coverband do
-  def safely_import_files(files_to_cover)
-    if files_to_cover.any?
-      files = Coverband::Baseline.exclude_files(files_to_cover)
-      files.each do |file|
-        begin
-          require_dependency file
-        rescue Exception => err
-          if Coverband.configuration.verbose
-            Coverband.configuration.logger.info "error adding file to baseline: #{file}"
-            Coverband.configuration.logger.info "error: #{err}"
-          end
-        end
-      end
-    end
-  end
-
-  desc 'record coverband coverage baseline'
-  task :baseline do
-    Coverband::Baseline.record do
-      if Rake::Task.tasks.any? { |key| key.to_s.match(/environment$/) }
-        Coverband.configuration.logger.info 'invoking rake environment'
-        Rake::Task['environment'].invoke
-      elsif Rake::Task.tasks.any? { |key| key.to_s.match(/env$/) }
-        Coverband.configuration.logger.info 'invoking rake env'
-        Rake::Task['env'].invoke
-      end
-
-      baseline_files = [File.expand_path('./config/boot.rb', Dir.pwd),
-                        File.expand_path('./config/application.rb', Dir.pwd),
-                        File.expand_path('./config/environment.rb', Dir.pwd)]
-
-      baseline_files.each do |baseline_file|
-        require baseline_file if File.exist?(baseline_file)
-      end
-
-      safely_import_files(Coverband.configuration.additional_files.flatten)
-
-      if defined? Rails
-        safely_import_files(Dir.glob("#{Rails.root}/app/**/*.rb"))
-        if File.exist?("#{Rails.root}/lib")
-          safely_import_files(Dir.glob("#{Rails.root}/lib/**/*.rb"))
-        end
-      end
-    end
-  end
-
   ###
   # note: If your project has set many simplecov filters.
   # You might want to override them and clear the filters.

data/lib/coverband/version.rb

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

data/test/test_helper.rb

@@ -59,11 +59,6 @@ end
 
 require 'coverband'
 
-unless File.exist?('./tmp/coverband_baseline.json')
-  `mkdir -p ./tmp`
-  `touch ./tmp/coverband_baseline.json`
-end
-
 Coverband.configure do |config|
   config.root              = Dir.pwd
   config.root_paths        = ['/app/']

data/test/unit/collectors_base_test.rb

@@ -49,6 +49,7 @@ class CollectorsBaseTest < Test::Unit::TestCase
     coverband.instance_variable_set('@store', nil)
     assert_equal false, coverband.instance_variable_get('@enabled')
     logger.expects(:info).at_least_once
+    logger.stubs('debug')
     coverband.sample { 1 + 1 }
     assert_equal true, coverband.instance_variable_get('@enabled')
   end
@@ -62,8 +63,8 @@ class CollectorsBaseTest < Test::Unit::TestCase
     coverband.instance_variable_set('@store', nil)
     assert_equal false, coverband.instance_variable_get('@enabled')
     logger.expects(:info).at_least_once
+    logger.stubs('debug')
     coverband.start
-    logger.info(1 + 1)
     coverband.stop
     coverband.save
   end
@@ -74,6 +75,7 @@ class CollectorsBaseTest < Test::Unit::TestCase
     coverband.instance_variable_set('@sample_percentage', 100.0)
     coverband.instance_variable_set('@verbose', true)
     Coverband.configuration.logger.stubs('info')
+    Coverband.configuration.logger.stubs('debug')
     store = Coverband::Adapters::RedisStore.new(Redis.new)
     coverband.instance_variable_set('@store', store)
     store.expects(:save_report).once.with(has_entries(dog_file => {5 => 5}))

data/test/unit/collectors_coverage_test.rb

@@ -61,7 +61,8 @@ if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.3.0')
       coverband.instance_variable_set('@logger', logger)
       coverband.instance_variable_set('@store', nil)
       assert_equal false, coverband.instance_variable_get('@enabled')
-      logger.expects(:info).at_least_once
+      logger.stubs('info')
+      logger.expects(:debug).at_least_once
       coverband.sample { 1 + 1 }
       assert_equal true, coverband.instance_variable_get('@enabled')
     end
@@ -74,6 +75,7 @@ if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.3.0')
       coverband.instance_variable_set('@store', nil)
       assert_equal false, coverband.instance_variable_get('@enabled')
       logger.expects(:info).at_least_once
+      logger.stubs('debug')
       coverband.start
       logger.info(1 + 1)
       coverband.stop
@@ -83,8 +85,6 @@ if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.3.0')
     test 'allow reporting to redis start stop save' do
       dog_file = File.expand_path('./dog.rb', File.dirname(__FILE__))
       coverband.instance_variable_set('@sample_percentage', 100.0)
-      coverband.instance_variable_set('@verbose', true)
-      Coverband.configuration.logger.stubs('info')
       store = Coverband::Adapters::RedisStore.new(Redis.new)
       coverband.instance_variable_set('@store', store)
 

data/test/unit/collectors_trace_test.rb

@@ -50,6 +50,7 @@ class CollectorsTraceTest < Test::Unit::TestCase
     coverband.instance_variable_set('@store', nil)
     assert_equal false, coverband.instance_variable_get('@enabled')
     logger.expects(:info).at_least_once
+    logger.stubs('debug')
     coverband.sample { 1 + 1 }
     assert_equal true, coverband.instance_variable_get('@enabled')
   end
@@ -63,8 +64,8 @@ class CollectorsTraceTest < Test::Unit::TestCase
     coverband.instance_variable_set('@store', nil)
     assert_equal false, coverband.instance_variable_get('@enabled')
     logger.expects(:info).at_least_once
+    logger.stubs('debug')
     coverband.start
-    logger.info(1 + 1)
     coverband.stop
     coverband.save
   end
@@ -75,6 +76,7 @@ class CollectorsTraceTest < Test::Unit::TestCase
     coverband.instance_variable_set('@sample_percentage', 100.0)
     coverband.instance_variable_set('@verbose', true)
     Coverband.configuration.logger.stubs('info')
+    Coverband.configuration.logger.stubs('debug')
     store = Coverband::Adapters::RedisStore.new(Redis.new)
     coverband.instance_variable_set('@store', store)
     store.expects(:save_report).once.with(has_entries(dog_file => { 5 => 5 }))

data/test/unit/{s3_web_test.rb → reports_web_test.rb}

@@ -2,7 +2,7 @@
 
 require File.expand_path('../test_helper', File.dirname(__FILE__))
 require 'aws-sdk'
-require File.expand_path('../../lib/coverband/s3_web', File.dirname(__FILE__))
+require File.expand_path('../../lib/coverband/reporters/web', File.dirname(__FILE__))
 require 'rack/test'
 
 ENV['RACK_ENV'] = 'test'
@@ -12,15 +12,22 @@ module Coverband
     include Rack::Test::Methods
 
     def app
-      Coverband::S3Web
+      Coverband::Reporters::Web.new
     end
 
-    test 'renders content from the coverband/index.html object' do
+    # TODO add tests for all endpoints
+    test 'renders index content' do
+      get '/'
+      assert last_response.ok?
+      assert_match 'Coverband Web Admin Index', last_response.body
+    end
+
+    test 'renders show content' do
       Coverband.configuration.s3_bucket = 'coverage-bucket'
       s3 = mock('s3')
       Aws::S3::Client.expects(:new).returns(s3)
       s3.expects(:get_object).with(bucket: 'coverage-bucket', key: 'coverband/index.html').returns mock('response', body: mock('body', read: 'content'))
-      get '/'
+      get '/show'
       assert last_response.ok?
       assert_equal 'content', last_response.body
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coverband
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2.alpha
 platform: ruby
 authors:
 - Dan Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-08 00:00:00.000000000 Z
+date: 2018-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -108,20 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  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: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -207,6 +193,7 @@ files:
 - README.md
 - Rakefile
 - changes.md
+- config.ru
 - coverband.gemspec
 - docs/coverband-install-resize.gif
 - docs/coverband_details.png
@@ -217,7 +204,6 @@ files:
 - lib/coverband/adapters/file_store.rb
 - lib/coverband/adapters/memory_cache_store.rb
 - lib/coverband/adapters/redis_store.rb
-- lib/coverband/baseline.rb
 - lib/coverband/collectors/base.rb
 - lib/coverband/collectors/coverage.rb
 - lib/coverband/collectors/trace.rb
@@ -226,8 +212,8 @@ files:
 - lib/coverband/reporters/base.rb
 - lib/coverband/reporters/console_report.rb
 - lib/coverband/reporters/simple_cov_report.rb
+- lib/coverband/reporters/web.rb
 - lib/coverband/s3_report_writer.rb
-- lib/coverband/s3_web.rb
 - lib/coverband/tasks.rb
 - lib/coverband/version.rb
 - test/benchmarks/.gitignore
@@ -238,7 +224,6 @@ files:
 - test/unit/adapters_file_store_test.rb
 - test/unit/adapters_memory_cache_store_test.rb
 - test/unit/adapters_redis_store_test.rb
-- test/unit/baseline_test.rb
 - test/unit/collectors_base_test.rb
 - test/unit/collectors_coverage_test.rb
 - test/unit/collectors_trace_test.rb
@@ -248,8 +233,8 @@ files:
 - test/unit/reports_base_test.rb
 - test/unit/reports_console_test.rb
 - test/unit/reports_simple_cov_test.rb
+- test/unit/reports_web_test.rb
 - test/unit/s3_report_writer_test.rb
-- test/unit/s3_web_test.rb
 homepage: https://github.com/danmayer/coverband
 licenses:
 - MIT
@@ -265,9 +250,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.5.1
@@ -283,7 +268,6 @@ test_files:
 - test/unit/adapters_file_store_test.rb
 - test/unit/adapters_memory_cache_store_test.rb
 - test/unit/adapters_redis_store_test.rb
-- test/unit/baseline_test.rb
 - test/unit/collectors_base_test.rb
 - test/unit/collectors_coverage_test.rb
 - test/unit/collectors_trace_test.rb
@@ -293,5 +277,5 @@ test_files:
 - test/unit/reports_base_test.rb
 - test/unit/reports_console_test.rb
 - test/unit/reports_simple_cov_test.rb
+- test/unit/reports_web_test.rb
 - test/unit/s3_report_writer_test.rb
-- test/unit/s3_web_test.rb

data/lib/coverband/baseline.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-module Coverband
-  class Baseline
-    def self.record
-      require 'coverage'
-      Coverage.start
-      yield
-
-      project_directory = File.expand_path(Coverband.configuration.root)
-      results = Coverage.result
-      results = results.reject { |key, _val| !key.match(project_directory) || Coverband.configuration.ignore.any? { |pattern| key.match(/#{pattern}/) } }
-
-      Coverband.configuration.store.save_report(convert_coverage_format(results))
-    end
-
-    def self.parse_baseline(_back_compat = nil)
-      Coverband.configuration.store.coverage
-    end
-
-    def self.exclude_files(files)
-      Coverband.configuration.ignore.each do |ignore|
-        path = Coverband.configuration.root + "/#{ignore}"
-        excludes = File.directory?(path) ? Dir.glob("#{path}/**/*") : [path]
-        files -= excludes
-      end
-      files
-    end
-
-    private
-
-    def self.convert_coverage_format(results)
-      file_map = {}
-      results.each_pair do |file, data|
-        lines_map = {}
-        data.each_with_index do |hits, index|
-          lines_map[(index + 1)] = hits unless hits.nil?
-        end
-        file_map[file] = lines_map
-      end
-      file_map
-    end
-  end
-end

data/lib/coverband/s3_web.rb

@@ -1,62 +0,0 @@
-# frozen_string_literal: true
-
-require 'sinatra/base'
-
-module Coverband
-  class S3Web < Sinatra::Base
-    set :public_folder, proc(){ File.expand_path('public', Gem::Specification.find_by_name('simplecov-html').full_gem_path) }
-
-    get '/' do
-      html = s3.get_object(bucket: Coverband.configuration.s3_bucket, key: 'coverband/index.html').body.read
-      # hack the static HTML assets to account for where this was mounted
-      html = html.gsub("src='", "src='#{request.path}")
-      html = html.gsub("href='", "href='#{request.path}")
-      html = html.gsub("loading.gif", "#{request.path}loading.gif")
-      html = html.gsub("/images/", "#{request.path}/images/")
-      html
-    end
-
-    post '/update_report' do
-      Coverband::Reporters::SimpleCovReport.report(Coverband.configuration.store, open_report: false)
-      notice = "coverband coverage updated"
-      redirect "/?notice=#{notice}", 301
-    end
-
-    post '/clear' do
-      Coverband.configuration.store.clear!
-      notice = "coverband coverage cleared"
-      redirect "/?notice=#{notice}", 301
-    end
-
-    post '/reload_files' do
-      if Coverband.configuration.safe_reload_files
-        Coverband.configuration.safe_reload_files.each do |safe_file|
-          load safe_file
-        end
-      end
-      Coverband.configure
-      notice = "coverband files reloaded"
-      redirect "/?notice=#{notice}", 301
-    end
-
-    private
-
-    def s3
-      begin
-        require 'aws-sdk'
-      rescue StandardError
-        Coverband.configuration.logger.error "coverband requires 'aws-sdk' in order use S3ReportWriter."
-        return
-      end
-      @s3 ||= begin
-        client_options = {
-          region: Coverband.configuration.s3_region,
-          access_key_id: Coverband.configuration.s3_access_key_id,
-          secret_access_key: Coverband.configuration.s3_secret_access_key
-        }
-        client_options = {} if client_options.values.any?(&:nil?)
-        Aws::S3::Client.new(client_options)
-      end
-    end
-  end
-end

data/test/unit/baseline_test.rb

@@ -1,59 +0,0 @@
-# frozen_string_literal: true
-
-require File.expand_path('../test_helper', File.dirname(__FILE__))
-
-class ReporterTest < Test::Unit::TestCase
-
-  test 'record baseline' do
-    Coverband.configure do |config|
-      config.store             = Coverband::Adapters::FileStore.new(TEST_COVERAGE_FILE)
-    end
-    Coverage.expects(:start).returns(true).at_least_once
-    Coverage.expects(:result).returns('fake' => [0, 1]).at_least_once
-    File.expects(:open).once
-
-    File.expects(:exist?).at_least_once.returns(true)
-    expected = { 'filename.rb' => [0, nil, 1] }
-    fake_file_data = expected.to_json
-    File.expects(:read).at_least_once.returns(fake_file_data)
-
-    Coverband::Baseline.record do
-      # nothing
-    end
-  end
-
-  test 'parse baseline' do
-    Coverband.configure do |config|
-      config.redis             = nil
-      config.store             = nil
-      config.root              = '/full/remote_app/path'
-      config.store             = Coverband::Adapters::FileStore.new(TEST_COVERAGE_FILE)
-    end
-    File.expects(:exist?).at_least_once.returns(true)
-    expected = { 'filename.rb' => [0, nil, 1] }
-    fake_file_data = expected.to_json
-    File.expects(:read).at_least_once.returns(fake_file_data)
-    results = Coverband::Baseline.parse_baseline
-    assert_equal(results, 'filename.rb' => [0, nil, 1])
-  end
-
-  test 'exclude_files' do
-    Coverband.configure do |config|
-      config.redis             = nil
-      config.store             = nil
-      config.root              = '/full/remote_app/path'
-      config.store             = Coverband::Adapters::FileStore.new(TEST_COVERAGE_FILE)
-      config.ignore            = ['ignored_file.rb']
-    end
-    root = Coverband.configuration.root
-    files = [root + '/ignored_file.rb', root + '/fakefile.rb']
-    expected_files = [root + '/fakefile.rb']
-    assert_equal(expected_files, Coverband::Baseline.exclude_files(files))
-  end
-
-  test 'convert_coverage_format' do
-    results = { 'fake_file.rb' => [1, nil, 0, 2] }
-    expected = { 'fake_file.rb' => { 1 => 1, 3 => 0, 4 => 2 } }
-    assert_equal(expected, Coverband::Baseline.convert_coverage_format(results))
-  end
-end