coverband 4.2.5 → 5.0.0.rc.4

data/test/unique_files.rb

@@ -1,29 +1,29 @@
 # frozen_string_literal: true
 
-require 'securerandom'
-require 'fileutils'
-require 'erb'
-require 'ostruct'
+require "securerandom"
+require "fileutils"
+require "erb"
+require "ostruct"
 
-UNIQUE_FILES_DIR = './test/unique_files'
+UNIQUE_FILES_DIR = "./test/unique_files"
 
-def require_unique_file(file = 'dog.rb', variables = {})
+def require_unique_file(file = "dog.rb", variables = {})
   uuid = SecureRandom.uuid
   dir = "#{UNIQUE_FILES_DIR}/#{uuid}"
-  file_name = file.sub('.erb', '')
+  file_name = file.sub(".erb", "")
   temp_file = "#{dir}/#{file_name}"
   FileUtils.mkdir_p(Pathname.new(temp_file).dirname.to_s)
   file_contents = File.read("./test/#{file}")
   file_contents = ERB.new(file_contents).result(OpenStruct.new(variables).instance_eval { binding }) if variables.any?
-  File.open(temp_file, 'w') { |w| w.write(file_contents) }
+  File.open(temp_file, "w") { |w| w.write(file_contents) }
   require temp_file
   Coverband::Utils::RelativeFileConverter.convert(File.expand_path(temp_file))
 end
 
 @@dogs = 0
 def require_class_unique_file
-  @@dogs +=1
-  require_unique_file('dog.rb.erb', dog_number: @@dogs)
+  @@dogs += 1
+  require_unique_file("dog.rb.erb", dog_number: @@dogs)
 end
 
 def remove_unique_files

data/views/layout.erb

@@ -18,11 +18,7 @@
       <%= display_nav %>
 
       <div id="content">
-        <%= formatted_file_list("All Files", result, result.source_files) unless view_gems? %>
-
-        <% result.groups.each do |name, files| %>
-          <%= formatted_file_list(name, result, files) %>
-        <% end %>
+        <%= formatted_file_list("Coverage", result, result.source_files) %>
       </div>
 
       <div id="footer">
@@ -31,13 +27,7 @@
 
       <div class="source_files">
       <% result.source_files.each do |source_file| %>
-        <% if (!source_file.gem? || (view_gems? && gem_details? && source_file.gem? )) %>
-          <% if static_html? %>
-            <%= formatted_source_file(result, source_file) %>
-          <% else %>
-            <%= formatted_source_file_loader(result, source_file) %>
-          <% end %>
-        <% end %>
+        <%= formatted_source_file_loader(result, source_file) %>
       <% end %>
       </div>
     </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coverband
 version: !ruby/object:Gem::Version
-  version: 4.2.5
+  version: 5.0.0.rc.4
 platform: ruby
 authors:
 - Dan Mayer
@@ -9,22 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-27 00:00:00.000000000 Z
+date: 2020-08-17 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: aws-sdk-s3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +166,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: standardrb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -194,7 +180,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-performance
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -208,7 +194,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: minitest-profile
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -222,7 +208,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-profile
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -258,7 +244,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".jrubyrc"
-- ".rubocop.yml"
+- ".standard.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -271,19 +257,22 @@ files:
 - changes.md
 - config.ru
 - coverband.gemspec
+- lib/alternative_coverband_patch.rb
 - lib/coverband.rb
 - lib/coverband/adapters/base.rb
 - lib/coverband/adapters/file_store.rb
 - lib/coverband/adapters/hash_redis_store.rb
 - lib/coverband/adapters/redis_store.rb
+- lib/coverband/adapters/stdout_store.rb
+- lib/coverband/adapters/web_service_store.rb
 - lib/coverband/at_exit.rb
 - lib/coverband/collectors/coverage.rb
 - lib/coverband/collectors/delta.rb
 - lib/coverband/collectors/view_tracker.rb
+- lib/coverband/collectors/view_tracker_service.rb
 - lib/coverband/configuration.rb
 - lib/coverband/integrations/background.rb
 - lib/coverband/integrations/background_middleware.rb
-- lib/coverband/integrations/bundler.rb
 - lib/coverband/integrations/rack_server_check.rb
 - lib/coverband/integrations/report_middleware.rb
 - lib/coverband/integrations/resque.rb
@@ -292,10 +281,8 @@ files:
 - lib/coverband/reporters/html_report.rb
 - lib/coverband/reporters/web.rb
 - lib/coverband/utils/absolute_file_converter.rb
-- lib/coverband/utils/file_groups.rb
 - lib/coverband/utils/file_hasher.rb
 - lib/coverband/utils/file_list.rb
-- lib/coverband/utils/gem_list.rb
 - lib/coverband/utils/html_formatter.rb
 - lib/coverband/utils/jruby_ext.rb
 - lib/coverband/utils/lines_classifier.rb
@@ -303,7 +290,6 @@ files:
 - lib/coverband/utils/relative_file_converter.rb
 - lib/coverband/utils/result.rb
 - lib/coverband/utils/results.rb
-- lib/coverband/utils/s3_report.rb
 - lib/coverband/utils/source_file.rb
 - lib/coverband/utils/tasks.rb
 - lib/coverband/version.rb
@@ -350,6 +336,7 @@ files:
 - test/coverband/adapters/file_store_test.rb
 - test/coverband/adapters/hash_redis_store_test.rb
 - test/coverband/adapters/redis_store_test.rb
+- test/coverband/adapters/web_service_store_test.rb
 - test/coverband/at_exit_test.rb
 - test/coverband/collectors/coverage_test.rb
 - test/coverband/collectors/delta_test.rb
@@ -367,16 +354,13 @@ files:
 - test/coverband/reporters/html_test.rb
 - test/coverband/reporters/web_test.rb
 - test/coverband/utils/absolute_file_converter_test.rb
-- test/coverband/utils/file_groups_test.rb
 - test/coverband/utils/file_hasher_test.rb
 - test/coverband/utils/file_list_test.rb
-- test/coverband/utils/gem_list_test.rb
 - test/coverband/utils/html_formatter_test.rb
 - test/coverband/utils/lines_classifier_test.rb
 - test/coverband/utils/relative_file_converter_test.rb
 - test/coverband/utils/result_test.rb
 - test/coverband/utils/results_test.rb
-- test/coverband/utils/s3_report_test.rb
 - test/coverband/utils/source_file_line_test.rb
 - test/coverband/utils/source_file_test.rb
 - test/dog.rb
@@ -429,7 +413,6 @@ files:
 - test/unique_files.rb
 - views/data.erb
 - views/file_list.erb
-- views/gem_list.erb
 - views/layout.erb
 - views/nav.erb
 - views/settings.erb
@@ -451,9 +434,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: []
 rubygems_version: 3.0.3
 signing_key: 
@@ -471,6 +454,7 @@ test_files:
 - test/coverband/adapters/file_store_test.rb
 - test/coverband/adapters/hash_redis_store_test.rb
 - test/coverband/adapters/redis_store_test.rb
+- test/coverband/adapters/web_service_store_test.rb
 - test/coverband/at_exit_test.rb
 - test/coverband/collectors/coverage_test.rb
 - test/coverband/collectors/delta_test.rb
@@ -488,16 +472,13 @@ test_files:
 - test/coverband/reporters/html_test.rb
 - test/coverband/reporters/web_test.rb
 - test/coverband/utils/absolute_file_converter_test.rb
-- test/coverband/utils/file_groups_test.rb
 - test/coverband/utils/file_hasher_test.rb
 - test/coverband/utils/file_list_test.rb
-- test/coverband/utils/gem_list_test.rb
 - test/coverband/utils/html_formatter_test.rb
 - test/coverband/utils/lines_classifier_test.rb
 - test/coverband/utils/relative_file_converter_test.rb
 - test/coverband/utils/result_test.rb
 - test/coverband/utils/results_test.rb
-- test/coverband/utils/s3_report_test.rb
 - test/coverband/utils/source_file_line_test.rb
 - test/coverband/utils/source_file_test.rb
 - test/dog.rb

data/.rubocop.yml

@@ -1,84 +0,0 @@
-AllCops:
-  TargetRubyVersion: 2.4
-  Exclude:
-    - vendor/bundle/**/*
-    - docs/**/*
-    - test/rails6_dummy/**/*
-    - test/rails5_dummy/**/*
-    - test/fixtures/**/*
-    # Get the code passing first then we will enable for tests
-    - test/**/*
-Documentation:
-  Enabled: false
-Metrics/MethodLength:
-  Enabled: false
-Layout/LineLength:
-  Max: 160
-Metrics/BlockNesting:
-  Max: 5
-Metrics/BlockLength:
-  Max: 30
-Metrics/CyclomaticComplexity:
-  Enabled: false
-Metrics/PerceivedComplexity:
-  Enabled: false
-Metrics/AbcSize:
-  Enabled: false
-Metrics/ClassLength:
-  Enabled: false
-Metrics/ModuleLength:
-  Enabled: false
-Metrics/ParameterLists:
-  Max: 10
-Naming/AccessorMethodName:
-  Enabled: false
-Naming/RescuedExceptionsVariableName:
-  Enabled: false
-Naming/PredicateName:
-  Enabled: true
-Style/TernaryParentheses:
-  Enabled: false
-Style/MutableConstant:
-  Enabled: false
-Style/IdenticalConditionalBranches:
-  Enabled: false
-Style/ClassVars:
-  Enabled: false
-Style/MultilineBlockChain:
-  Enabled: false
-Style/StringLiterals:
-  Enabled: false
-Style/IfInsideElse:
-  Enabled: false
-Style/FrozenStringLiteralComment:
-  Enabled: true
-Style/GuardClause:
-  Enabled: true
-Style/NumericPredicate:
-  Enabled: true
-Style/NumericLiterals:
-  Enabled: false
-Style/NumericLiteralPrefix:
-  Enabled: false
-Style/ClassAndModuleChildren:
-  Enabled: false
-Style/SymbolArray:
-  Enabled: false
-Style/SymbolProc:
-  Enabled: false
-Style/RegexpLiteral:
-  Enabled: false
-Layout/MultilineMethodCallIndentation:
-  Enabled: true
-Layout/MultilineOperationIndentation:
-  Enabled: true
-Lint/RescueException:
-  Enabled: true
-Lint/UselessAccessModifier:
-  Enabled: true
-Lint/ShadowingOuterLocalVariable:
-  Enabled: true
-Style/FormatString:
-  Enabled: true
-Security/Eval:
-  Enabled: true

data/lib/coverband/integrations/bundler.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-module BundlerEagerLoad
-  def require(*groups)
-    Coverband.eager_loading_coverage { super }
-  end
-end
-Bundler.singleton_class.prepend BundlerEagerLoad

data/lib/coverband/utils/file_groups.rb

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-#
-# Applies the configured groups to the given array of Coverband::SourceFile items
-#
-module Coverband
-  module Utils
-    class FileGroups
-      def initialize(files)
-        @grouped = {}
-        @files = files
-        filter_to_groups
-      end
-
-      def grouped_results
-        @grouped
-      end
-
-      private
-
-      def filter_to_groups
-        grouped_files = []
-        Coverband.configuration.groups.each do |name, filter|
-          if name == 'Gems'
-            gem_lists = gem_files(name, filter)
-            grouped_files.concat(gem_lists.flatten) if gem_lists.flatten.any?
-          else
-            app_files(name, filter)
-            grouped_files += @grouped[name]
-          end
-        end
-        if !Coverband.configuration.groups.empty? && !(other_files = @files.reject do |source_file|
-                                                         grouped_files.include?(source_file)
-                                                       end).empty?
-          @grouped['Ungrouped'] = Coverband::Utils::FileList.new(other_files)
-        end
-      end
-
-      def gem_files(name, filter)
-        grouped_gems = @files.select { |source_file| source_file.filename =~ /#{filter}/ }.group_by(&:gem_name)
-        gem_lists = grouped_gems.values.map { |gem_files| Coverband::Utils::FileList.new(gem_files) }
-        @grouped[name] = Coverband::Utils::GemList.new(gem_lists) if gem_lists.flatten.any?
-        gem_lists
-      end
-
-      def app_files(name, filter)
-        @grouped[name] = Coverband::Utils::FileList.new(@files.select do |source_file|
-          source_file.filename =~ /#{filter}/ && source_file.filename !~ /#{Coverband.configuration.gem_paths.first}/
-        end)
-      end
-    end
-  end
-end

data/lib/coverband/utils/gem_list.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-####
-# An array of  FileLists instances with helpers to roll up the stats
-# methods for calculating coverage across them etc.
-####
-module Coverband
-  module Utils
-    class GemList < FileList
-      # Returns the count of lines that have coverage
-      def covered_lines
-        to_a.map(&:covered_lines).inject(:+)
-      end
-
-      # Returns the count of lines that have been missed
-      def missed_lines
-        to_a.map(&:missed_lines).inject(:+)
-      end
-
-      # Returns the count of lines that are not relevant for coverage
-      def never_lines
-        to_a.map(&:never_lines).inject(:+)
-      end
-
-      # Returns the count of skipped lines
-      def skipped_lines
-        to_a.map(&:skipped_lines).inject(:+)
-      end
-    end
-  end
-end

data/lib/coverband/utils/s3_report.rb

@@ -1,105 +0,0 @@
-# frozen_string_literal: true
-
-module Coverband
-  module Utils
-    ###
-    # TODO: this is currently a html report writer
-    # this should support writing coverage the current method should be fine
-    # to write every report to S3 and sum them later or use the 2 pass
-    # method we do for redis if in a background thread
-    ###
-    class S3Report
-      def self.instance
-        s3_options = {
-          region: Coverband.configuration.s3_region,
-          access_key_id: Coverband.configuration.s3_access_key_id,
-          secret_access_key: Coverband.configuration.s3_secret_access_key
-        }
-        new(Coverband.configuration.s3_bucket, s3_options)
-      end
-
-      def initialize(bucket_name, options = {})
-        @bucket_name = bucket_name
-        @region = options[:region]
-        @access_key_id = options[:access_key_id]
-        @secret_access_key = options[:secret_access_key]
-        begin
-          require 'aws-sdk-s3'
-        rescue StandardError
-          err_msg = 'Coverband requires aws-sdk in order use S3Report.'
-          Coverband.configuration.logger&.error err_msg
-        end
-      end
-
-      def persist!
-        if defined?(Aws)
-          object.put(body: coverage_content)
-        else
-          object.write(coverage_content)
-        end
-      end
-
-      def retrieve
-        if defined?(Aws)
-          s3_client.get_object(bucket: Coverband.configuration.s3_bucket,
-                               key: 'coverband/index.html').body.read
-        else
-          object.read
-        end
-      end
-
-      private
-
-      def coverage_content
-        version = Coverband::VERSION
-        File.read("#{Coverband.configuration.root}/coverage/index.html").gsub("./assets/#{version}/", '')
-      end
-
-      def object
-        if defined?(Aws)
-          bucket.object('coverband/index.html')
-        else
-          bucket.objects['coverband/index.html']
-        end
-      end
-
-      def client_options
-        {
-          region: @region,
-          access_key_id: @access_key_id,
-          secret_access_key: @secret_access_key
-        }
-      end
-
-      def s3_client
-        if defined?(Aws)
-          # AWS SDK v2
-          Aws::S3::Client.new(client_options)
-        else
-          # AWS SDK v1
-          AWS::S3::Client.new(client_options)
-        end
-      end
-
-      def s3
-        resource_options = { client: s3_client }
-        resource_options = {} if client_options.values.any?(&:nil?)
-        if defined?(Aws)
-          # AWS SDK v2
-          Aws::S3::Resource.new(resource_options)
-        else
-          # AWS SDK v1
-          AWS::S3.new(resource_options)
-        end
-      end
-
-      def bucket
-        if defined?(Aws)
-          s3.bucket(@bucket_name)
-        else
-          s3.buckets[@bucket_name]
-        end
-      end
-    end
-  end
-end