coverband 2.0.2.alpha → 2.0.2.alpha2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d86abf13125588b12cb567afcf59f8289cb4bd1c
-  data.tar.gz: bda957a57268f3d5a74ea6ffe8502146edf2c4bb
+  metadata.gz: 02246eb05ef94f9b83510eba25d096e582f2d2ed
+  data.tar.gz: a8af15031477e50a6e395b54b9a4cc726f31ef31
 SHA512:
-  metadata.gz: 599dbb24f2292684fe9418352e1564ffa13cebcb5c3ff5831f90d0ad86496b00ec4f1e16c33f1f38c2f96a098553422bb2e44af263bd4c7379ab4ecee045dcd0
-  data.tar.gz: 013454ba197354052f8fa8ce933a7a669761b685299e7e3657895b370201b166837961dc92c81fb4068c2dc5333abad89625e080fbf6454001621992ee05e9ed
+  metadata.gz: d28669d70bc0b5786c08d8a612f8f7d1d0aaf69e75c258e544cc6f3aa8862833bde6cb38ba42b6a97c78ff77c865928f4889507aeb50c46c6c89df2c369251b5
+  data.tar.gz: 49a1bd4d91fbb131d673277a7c7f2d1fd4590282e13f9c5099b31564f5f698805c9be97370ed8f3df7f3be0dbe9c10689f7e44d0b486beeed65bfe1518fa40c2

data/README.md

@@ -9,7 +9,8 @@ Build Status: [![Build Status](https://travis-ci.org/danmayer/coverband.svg?bran
   <a href="#installation">Installation</a> •
   <a href="#configuration">Configuration</a> •
   <a href="#usage">Usage</a> •
-  <a href="#license">License</a>
+  <a href="#license">License</a> •
+  <a href="/changes.md">Change Log / Roadmap</a>
 </p>
 
 A gem to measure production code usage, showing each line of code that is executed. Coverband allows easy configuration to collect and report on production code usage. It can be used as Rack middleware, wrapping a block with sampling, or manually configured to meet any need (like usage during background jobs).
@@ -631,8 +632,7 @@ Similar format to redis store, but array with integer values
 
 ### Todo
 
-* rackup / how to run webapp via rake
-  * move off sinatra to pure rack 
+* add articles / podcasts like prontos readme https://github.com/prontolabs/pronto
 * 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)

data/lib/coverband/adapters/memory_cache_store.rb

@@ -9,16 +9,18 @@ module Coverband
     class MemoryCacheStore < Base
       attr_accessor :store
 
+      @@files_cache = {}
+
       def initialize(store)
         @store = store
       end
 
-      def self.reset!
-        files_cache.clear
+      def self.clear!
+        @@files_cache.clear
       end
 
       def clear!
-        self.class.reset!
+        self.class.clear!
       end
 
       def save_report(files)
@@ -26,28 +28,26 @@ module Coverband
         store.save_report(filtered_files) if filtered_files.any?
       end
 
-      # rubocop:disable Lint/IneffectiveAccessModifier
       private
 
-      def self.files_cache
-        @files_cache ||= {}
-      end
-
       def files_cache
-        self.class.files_cache
+        @@files_cache
       end
 
       def filter(files)
-        files.each_with_object({}) do |(file, lines), filtered_file_hash|
-          # first time we see a file, we pre-init the in memory cache to whatever is in store(redis)
-          line_cache = files_cache[file] ||= Set.new(store.covered_lines_for_file(file))
-          lines.reject! do |line|
-            line_cache.include?(line) ? true : (line_cache << line && false)
+        files.each_with_object({}) do |(file, covered_lines), filtered_file_hash|
+          if covered_lines != cached_file(file)
+            files_cache[file] = covered_lines
+            filtered_file_hash[file] = covered_lines
           end
-          filtered_file_hash[file] = lines if lines.any?
         end
       end
-      # rubocop:enable Lint/IneffectiveAccessModifier
+
+      def cached_file(file)
+        files_cache[file]  ||= store.covered_lines_for_file(file).each_with_object({}) do |(line_number, value), hash|
+          hash[line_number.to_i] = value.to_i
+        end
+      end
     end
   end
 end

data/lib/coverband/configuration.rb

@@ -71,7 +71,7 @@ module Coverband
         @store = Coverband::Adapters::RedisStore.new(redis, ttl: Coverband.configuration.redis_ttl,
                                                             redis_namespace: Coverband.configuration.redis_namespace)
       elsif store.is_a?(String)
-        @store = Coverband::Adapters::FileStore.new(coverage_file)
+        @store = Coverband::Adapters::FileStore.new(store)
       end
     end
   end

data/lib/coverband/reporters/web.rb

@@ -20,6 +20,8 @@ module Coverband
 
         if request.post?
           case request.path_info
+          when /\/collect_update_and_view/
+            collect_update_and_view
           when /\/clear/
             clear
           when /\/update_report/
@@ -51,6 +53,7 @@ module Coverband
         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>#{button("#{base_path}collect_update_and_view",'collect data, update report, & view')}</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>"
@@ -74,6 +77,12 @@ module Coverband
         html
       end
 
+      def collect_update_and_view
+        collect_coverage
+        update_report
+        [301, { 'Location' => "#{base_path}show" }, []]
+      end
+
       def update_report
         Coverband::Reporters::SimpleCovReport.report(Coverband.configuration.store, open_report: false)
         notice = 'coverband coverage updated'

data/lib/coverband/version.rb

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

data/test/unit/adapters_memory_cache_store_test.rb

@@ -5,52 +5,62 @@ require File.expand_path('../test_helper', File.dirname(__FILE__))
 module Coverband
   class MemoryCacheStoreTest < Test::Unit::TestCase
     def setup
-      Adapters::MemoryCacheStore.reset!
-      @store = mock('store')
+      Adapters::MemoryCacheStore.clear!
+      @redis = Redis.new
+      @store = Coverband::Adapters::RedisStore.new(@redis)
+      @store.clear!
       @memory_store = Adapters::MemoryCacheStore.new(@store)
     end
 
-    def data
-      {
-        'file1' => { 3 => 1, 5 => 2 },
-        'file2' => { 1 => 1, 2 => 1 }
-      }
-    end
-
     test 'it passes data into store' do
+      data = {
+        'file1' => { 1 => 0, 2 => 1, 3 => 0 },
+        'file2' => { 1 => 5, 2 => 2 }
+      }
       @store.expects(:save_report).with data
-      @store.expects(:covered_lines_for_file).with('file1').returns []
-      @store.expects(:covered_lines_for_file).with('file2').returns []
       @memory_store.save_report data
     end
 
-    test 'it passes data into store only once' do
+
+    test 'it filters coverage with same exact data' do
+      data = {
+        'file1' => { 1 => 0, 2 => 1, 3 => 0 },
+        'file2' => { 1 => 5, 2 => 2 }
+      }
       @store.expects(:save_report).once.with data
-      @store.expects(:covered_lines_for_file).with('file1').returns []
-      @store.expects(:covered_lines_for_file).with('file2').returns []
       2.times { @memory_store.save_report data }
     end
+    
+    test 'it filters coverage for files with same exact data' do
+ 
+      report_first_request = {
+        'file1' => { 1 => 0, 2 => 1, 3 => 0 },
+        'file2' => { 1 => 5, 2 => 2 }
+      }
 
-    test 'it only passes files and lines we have not hit yet' do
-      second_data = {
-        'file1' => { 3 => 1, 5 => 1, 10 => 1 },
-        'file2' => { 1 => 1, 2 => 1 }
+      report_second_request = {
+        'file1' => { 1 => 0, 2 => 1, 3 => 0 },
+        'file2' => { 1 => 5, 2 => 3 }
       }
-      @store.expects(:covered_lines_for_file).with('file1').returns []
-      @store.expects(:covered_lines_for_file).with('file2').returns []
-      @store.expects(:save_report).once.with data
-      @store.expects(:save_report).once.with(
-        'file1' => { 10 => 1 }
-      )
-      @memory_store.save_report data
-      @memory_store.save_report second_data
+      @store.expects(:save_report).with({
+        'file1' => { 1 => 0, 2 => 1, 3 => 0 },
+        'file2' => { 1 => 5, 2 => 2 }
+      })
+      @store.expects(:save_report).with({
+        'file2' => { 1 => 5, 2 => 3 }
+      })
+      @memory_store.save_report(report_first_request)
+      @memory_store.save_report(report_second_request)
     end
 
     test 'it initializes cache with what is in store' do
-      @store.expects(:covered_lines_for_file).with('file1').returns [3, 5]
-      @store.expects(:covered_lines_for_file).with('file2').returns [2]
-      @store.expects(:save_report).with('file2' => { 1 => 1 })
-      @memory_store.save_report data
+      data = {
+        'file1' => { 1 => 0, 2 => 1, 3 => 0 },
+        'file2' => { 1 => 5, 2 => 2 }
+      }
+      Coverband::Adapters::RedisStore.new(@redis).save_report(data)
+      @store.expects(:save_report).never
+      @memory_store.save_report(data)
     end
   end
 end

data/test/unit/reports_web_test.rb

@@ -7,29 +7,31 @@ require 'rack/test'
 
 ENV['RACK_ENV'] = 'test'
 
-module Coverband
-  class S3WebTest < Test::Unit::TestCase
-    include Rack::Test::Methods
+if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.2.0')
+  module Coverband
+    class S3WebTest < Test::Unit::TestCase
+      include Rack::Test::Methods
 
-    def app
-      Coverband::Reporters::Web.new
-    end
+      def app
+        Coverband::Reporters::Web.new
+      end
 
-    # 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
+      # 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 '/show'
-      assert last_response.ok?
-      assert_equal 'content', last_response.body
+      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 '/show'
+        assert last_response.ok?
+        assert_equal 'content', last_response.body
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coverband
 version: !ruby/object:Gem::Version
-  version: 2.0.2.alpha
+  version: 2.0.2.alpha2
 platform: ruby
 authors:
 - Dan Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-05 00:00:00.000000000 Z
+date: 2018-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk