coverband 4.2.4.rc.3 → 4.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13e53266c2fa52796b86da93197611c290f7a0c40e304ef5b75d24c45eed9db3
-  data.tar.gz: 95b685919c1edd7156f1f940d30f05381a1ac6684863557843001f8edf923125
+  metadata.gz: 1c094b4a6ef2b76f771cb96aa1fbdc246dc8beea74033ffca4cb466ef96c0a08
+  data.tar.gz: 1162d9244c0e1a1b28c0fa051d7cd53d29b6a4fdfc50c1fadb7d6793229aaf8b
 SHA512:
-  metadata.gz: 2e12f0556877efd6435887c447ef3278ab89c0c3ca6740b7ba0de33f9757e17038eb29a74297e9fb29707a8c4d9c999b1138117d3bb64607e0f4da82ca64e0c4
-  data.tar.gz: 27cfd67015140d2461fb2a9217d06c9782823433c8cbdad3be67e6cc05ea26125dab778656ff0b2023e5e806a277dd1c9028976ddd5dedcc8b90e3505d94598f
+  metadata.gz: d9eba70b91d87992d1e450490f7fd4545cccb5092bf093c424c51b964cb4b31ad5c8a1d49d1cc774ce6470c6466b7d3b7a7a1df92ecbc4e574a203467f621b55
+  data.tar.gz: 815c462d38f7a27b26f5d209044c53b2e0058c4ea2534db3f6663a267ad0cc435bd6c895128c5ea8f85c0aec61e4e31d9f61c426526b71423e24c941852f74be

data/.rubocop.yml

@@ -7,12 +7,12 @@ AllCops:
     - test/rails5_dummy/**/*
     - test/fixtures/**/*
     # Get the code passing first then we will enable for tests
-    - test/**/*
+    - test/**/*    
 Documentation:
   Enabled: false
 Metrics/MethodLength:
   Enabled: false
-Metrics/LineLength:
+Layout/LineLength:
   Max: 160
 Metrics/BlockNesting:
   Max: 5
@@ -62,10 +62,6 @@ Style/SymbolProc:
   Enabled: false
 Style/RegexpLiteral:
   Enabled: false
-Performance/Casecmp:
-  Enabled: false
-Performance/RegexpMatch:
-  Enabled: false
 Layout/MultilineMethodCallIndentation:
   Enabled: true
 Layout/MultilineOperationIndentation:

data/README.md

@@ -385,6 +385,7 @@ If you submit a change please make sure the tests and benchmarks are passing.
 - **total fail** on front end code, for line for line coverage, 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. The default configuration excludes these files
   - **NOTE:** We now have file level coverage for view files, but don't support line level detail
+  - The view file detection doesn't workf or mailers at the moment only for web related views / JSON templates. This is due to how Rails active mailer notifications work. 
 
 ### Debugging Redis Store
 

data/changes.md

@@ -76,6 +76,12 @@ Feature Ideas:
 
 # Alpha / Beta / Release Candidates
 
+### Coverband 4.2.5
+
+- ?
+
+# Released
+
 ### Coverband 4.2.4
 
 - fixes related to startup without Redis, skipping Coverband on common rake tasks (assets:precompile), etc
@@ -87,8 +93,8 @@ Feature Ideas:
 - added support to download coverage and view data in JSON format
 - documentation about working with environment variables
 - add cache wiggle to avoid Redis CPU spikes (cache stampede on Redis server)
-
-# Released
+- make the nocov consistant on the data download and html view
+- small performance improvements
 
 ### Coverband 4.2.3
 

data/coverband.gemspec

@@ -35,6 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'resque'
   spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop-performance'
 
   spec.add_development_dependency 'coveralls'
   # add when debugging

data/lib/coverband/adapters/hash_redis_store.rb

@@ -22,6 +22,7 @@ module Coverband
       def initialize(redis, opts = {})
         super()
         @redis_namespace = opts[:redis_namespace]
+        @save_report_batch_size = opts[:save_report_batch_size] || 100
         @format_version = REDIS_STORAGE_FORMAT_VERSION
         @redis = redis
         raise 'HashRedisStore requires redis >= 2.6.0' unless supported?
@@ -58,31 +59,38 @@ module Coverband
         report_time = Time.now.to_i
         updated_time = type == Coverband::EAGER_TYPE ? nil : report_time
         keys = []
-        files_data = report.map do |file, data|
-          relative_file = @relative_file_converter.convert(file)
-          file_hash = file_hash(relative_file)
-          key = key(relative_file, file_hash: file_hash)
-          keys << key
-          script_input(
-            key: key,
-            file: relative_file,
-            file_hash: file_hash,
-            data: data,
-            report_time: report_time,
-            updated_time: updated_time
-          )
+        report.each_slice(@save_report_batch_size) do |slice|
+          files_data = slice.map do |(file, data)|
+            relative_file = @relative_file_converter.convert(file)
+            file_hash = file_hash(relative_file)
+            key = key(relative_file, file_hash: file_hash)
+            keys << key
+            script_input(
+              key: key,
+              file: relative_file,
+              file_hash: file_hash,
+              data: data,
+              report_time: report_time,
+              updated_time: updated_time
+            )
+          end
+          next unless files_data.any?
+
+          arguments_key = [@redis_namespace, SecureRandom.uuid].compact.join('.')
+          @redis.set(arguments_key, { ttl: @ttl, files_data: files_data }.to_json, ex: JSON_PAYLOAD_EXPIRATION)
+          @redis.evalsha(hash_incr_script, [arguments_key])
         end
-        return unless keys.any?
-
-        arguments_key = [@redis_namespace, SecureRandom.uuid].compact.join('.')
-        @redis.set(arguments_key, { ttl: @ttl, files_data: files_data }.to_json, ex: JSON_PAYLOAD_EXPIRATION)
-        @redis.evalsha(hash_incr_script, [arguments_key])
-        @redis.sadd(files_key, keys)
+        @redis.sadd(files_key, keys) if keys.any?
       end
 
       def coverage(local_type = nil)
-        files_set(local_type).each_with_object({}) do |key, hash|
-          add_coverage_for_file(key, hash)
+        files_set = files_set(local_type)
+        @redis.pipelined do
+          files_set.map do |key|
+            @redis.hgetall(key)
+          end
+        end.each_with_object({}) do |data_from_redis, hash|
+          add_coverage_for_file(data_from_redis, hash)
         end
       end
 
@@ -100,9 +108,7 @@ module Coverband
 
       private
 
-      def add_coverage_for_file(key, hash)
-        data_from_redis = @redis.hgetall(key)
-
+      def add_coverage_for_file(data_from_redis, hash)
         return if data_from_redis.empty?
 
         file = data_from_redis[FILE_KEY]
@@ -133,7 +139,7 @@ module Coverband
           file_length: data.length,
           hash_key: key
         }
-        meta.merge!(last_updated_at: updated_time) if updated_time
+        meta[:last_updated_at] = updated_time if updated_time
         {
           hash_key: key,
           meta: meta,

data/lib/coverband/reporters/html_report.rb

@@ -32,6 +32,10 @@ module Coverband
         end
       end
 
+      def report_data
+        report_dynamic_data
+      end
+
       private
 
       def static?
@@ -54,6 +58,12 @@ module Coverband
                                             base_path: base_path,
                                             notice: notice).format_dynamic_html!
       end
+
+      def report_dynamic_data
+        Coverband::Utils::HTMLFormatter.new(filtered_report_files,
+                                            base_path: base_path,
+                                            notice: notice).format_dynamic_data!
+      end
     end
   end
 end

data/lib/coverband/reporters/web.rb

@@ -55,6 +55,8 @@ module Coverband
             [200, { 'Content-Type' => 'text/json' }, [view_tracker_data]]
           when %r{\/view_tracker}
             [200, { 'Content-Type' => 'text/html' }, [view_tracker]]
+          when %r{\/enriched_debug_data}
+            [200, { 'Content-Type' => 'text/json' }, [enriched_debug_data]]
           when %r{\/debug_data}
             [200, { 'Content-Type' => 'text/json' }, [debug_data]]
           when %r{\/load_file_details}
@@ -97,6 +99,14 @@ module Coverband
         Coverband.configuration.store.get_coverage_report.to_json
       end
 
+      def enriched_debug_data
+        Coverband::Reporters::HTMLReport.new(Coverband.configuration.store,
+                                             static: false,
+                                             base_path: base_path,
+                                             notice: '',
+                                             open_report: false).report_data
+      end
+
       def load_file_details
         filename = request.params['filename']
         Coverband::Reporters::HTMLReport.new(Coverband.configuration.store,

data/lib/coverband/utils/html_formatter.rb

@@ -29,6 +29,10 @@ module Coverband
         format_html(@coverage_result)
       end
 
+      def format_dynamic_data!
+        format_data(@coverage_result)
+      end
+
       def format_settings!
         format_settings
       end
@@ -71,6 +75,10 @@ module Coverband
         template('layout').result(binding)
       end
 
+      def format_data(result)
+        template('data').result(binding)
+      end
+
       # Returns the an erb instance for the template of given name
       def template(name)
         ERB.new(File.read(File.join(File.dirname(__FILE__), '../../../views/', "#{name}.erb")))

data/lib/coverband/utils/s3_report.rb

@@ -28,7 +28,6 @@ module Coverband
         rescue StandardError
           err_msg = 'Coverband requires aws-sdk in order use S3Report.'
           Coverband.configuration.logger&.error err_msg
-          return
         end
       end
 

data/lib/coverband/version.rb

@@ -5,5 +5,5 @@
 # use format '4.2.1.rc.1' ~> 4.2.1.rc to prerelease versions like v4.2.1.rc.2 and v4.2.1.rc.3
 ###
 module Coverband
-  VERSION = '4.2.4.rc.3'
+  VERSION = '4.2.4'
 end

data/lua/install.sh

@@ -1,16 +1,13 @@
 #!/bin/bash
 
 LUA_DIR="$HOME/lua51"
-BUSTED="$LUA_DIR/bin/busted"
+LUA="$LUA_DIR/bin/lua"
 
-if [ -f "$BUSTED" ]
-then
-  echo "$BUSTED already exists"
-  exit 0
+if [ ! -f $LUA ]; then
+  echo "Installing lua"
+  pip install hererocks
+  hererocks $LUA_DIR -l5.1 -rlatest
 fi
-
-pip install hererocks
-hererocks $LUA_DIR -l5.1 -rlatest
 source $LUA_DIR/bin/activate
 lua -v
 for i in luacov busted redis-lua inspect lua-cjson; do 

data/views/data.erb

@@ -0,0 +1 @@
+<%= result.source_files.to_json %>

data/views/nav.erb

@@ -6,7 +6,8 @@
     <%= button("#{base_path}clear", 'clear coverage report', delete: true) %>
   <% end %>
   <% if Coverband.configuration.web_debug %>
-    <a href='<%= base_path %>debug_data'>Coverage Data</a> &nbsp;
+    <a href='<%= base_path %>debug_data'>Debug Data</a> &nbsp;
+    <a href='<%= base_path %>enriched_debug_data'>Coverage Data</a> &nbsp;
   <% end %>
 </div>
 <% if notice.to_s.length > 0 %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coverband
 version: !ruby/object:Gem::Version
-  version: 4.2.4.rc.3
+  version: 4.2.4
 platform: ruby
 authors:
 - Dan Mayer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-28 00:00:00.000000000 Z
+date: 2019-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -193,6 +193,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  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: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -411,6 +425,7 @@ files:
 - test/rails_test_helper.rb
 - test/test_helper.rb
 - test/unique_files.rb
+- views/data.erb
 - views/file_list.erb
 - views/gem_list.erb
 - views/layout.erb
@@ -434,9 +449,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: