simplecov 0.16.1 → 0.18.2

data/lib/simplecov/source_file/branch.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+module SimpleCov
+  class SourceFile
+    #
+    # Representing single branch that has been detected in coverage report.
+    # Give us support methods that handle needed calculations.
+    class Branch
+      attr_reader :start_line, :end_line, :coverage, :type
+
+      # rubocop:disable Metrics/ParameterLists
+      def initialize(start_line:, end_line:, coverage:, inline:, type:)
+        @start_line = start_line
+        @end_line   = end_line
+        @coverage   = coverage
+        @inline     = inline
+        @type       = type
+        @skipped    = false
+      end
+      # rubocop:enable Metrics/ParameterLists
+
+      def inline?
+        @inline
+      end
+
+      #
+      # Return true if there is relevant count defined > 0
+      #
+      # @return [Boolean]
+      #
+      def covered?
+        !skipped? && coverage.positive?
+      end
+
+      #
+      # Check if branche missed or not
+      #
+      # @return [Boolean]
+      #
+      def missed?
+        !skipped? && coverage.zero?
+      end
+
+      # The line on which we want to report the coverage
+      #
+      # Usually we choose the line above the start of the branch (so that it shows up
+      # at if/else) because that
+      # * highlights the condition
+      # * makes it distinguishable if the first line of the branch is an inline branch
+      #   (see the nested_branches fixture)
+      #
+      def report_line
+        if inline?
+          start_line
+        else
+          start_line - 1
+        end
+      end
+
+      # Flags the branch as skipped
+      def skipped!
+        @skipped = true
+      end
+
+      # Returns true if the branch was marked skipped by virtue of nocov comments.
+      def skipped?
+        @skipped
+      end
+
+      def overlaps_with?(line_range)
+        start_line <= line_range.end && end_line >= line_range.begin
+      end
+
+      #
+      # Return array with coverage count and badge
+      #
+      # @return [Array]
+      #
+      def report
+        [type, coverage]
+      end
+    end
+  end
+end

data/lib/simplecov/source_file/line.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module SimpleCov
+  class SourceFile
+    # Representation of a single line in a source file including
+    # this specific line's source code, line_number and code coverage,
+    # with the coverage being either nil (coverage not applicable, e.g. comment
+    # line), 0 (line not covered) or >1 (the amount of times the line was
+    # executed)
+    class Line
+      # The source code for this line. Aliased as :source
+      attr_reader :src
+      # The line number in the source file. Aliased as :line, :number
+      attr_reader :line_number
+      # The coverage data for this line: either nil (never), 0 (missed) or >=1 (times covered)
+      attr_reader :coverage
+      # Whether this line was skipped
+      attr_reader :skipped
+
+      # Lets grab some fancy aliases, shall we?
+      alias source src
+      alias line line_number
+      alias number line_number
+
+      def initialize(src, line_number, coverage)
+        raise ArgumentError, "Only String accepted for source" unless src.is_a?(String)
+        raise ArgumentError, "Only Integer accepted for line_number" unless line_number.is_a?(Integer)
+        raise ArgumentError, "Only Integer and nil accepted for coverage" unless coverage.is_a?(Integer) || coverage.nil?
+
+        @src         = src
+        @line_number = line_number
+        @coverage    = coverage
+        @skipped     = false
+      end
+
+      # Returns true if this is a line that should have been covered, but was not
+      def missed?
+        !never? && !skipped? && coverage.zero?
+      end
+
+      # Returns true if this is a line that has been covered
+      def covered?
+        !never? && !skipped? && coverage.positive?
+      end
+
+      # Returns true if this line is not relevant for coverage
+      def never?
+        !skipped? && coverage.nil?
+      end
+
+      # Flags this line as skipped
+      def skipped!
+        @skipped = true
+      end
+
+      # Returns true if this line was skipped, false otherwise. Lines are skipped if they are wrapped with
+      # # :nocov: comment lines.
+      def skipped?
+        !!skipped
+      end
+
+      # The status of this line - either covered, missed, skipped or never. Useful i.e. for direct use
+      # as a css class in report generation
+      def status
+        return "skipped" if skipped?
+        return "never" if never?
+        return "missed" if missed?
+        return "covered" if covered?
+      end
+    end
+  end
+end

data/lib/simplecov/useless_results_remover.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module SimpleCov
+  #
+  # Select the files that related to working scope directory of SimpleCov
+  #
+  module UselessResultsRemover
+    ROOT_REGX = /\A#{Regexp.escape(SimpleCov.root + File::SEPARATOR)}/io.freeze
+
+    def self.call(coverage_result)
+      coverage_result.select do |path, _coverage|
+        path =~ ROOT_REGX
+      end
+    end
+  end
+end

data/lib/simplecov/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SimpleCov
-  VERSION = "0.16.1".freeze
+  VERSION = "0.18.2"
 end

metadata

@@ -1,49 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: simplecov
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.18.2
 platform: ruby
 authors:
 - Christoph Olszowka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2020-02-12 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.8'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.8'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: simplecov-html
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: docile
   requirement: !ruby/object:Gem::Requirement
@@ -59,21 +25,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: simplecov-html
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
-  type: :development
+        version: '0.11'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
-description: Code coverage for Ruby 1.9+ with a powerful configuration library and
-  automatic merging of coverage across test suites
+        version: '0.11'
+description: Code coverage for Ruby with a powerful configuration library and automatic
+  merging of coverage across test suites
 email:
 - christoph at olszowka de
 executables: []
@@ -81,6 +47,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
+- CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - ISSUE_TEMPLATE.md
 - LICENSE
@@ -89,8 +56,14 @@ files:
 - doc/commercial-services.md
 - doc/editor-integration.md
 - lib/simplecov.rb
+- lib/simplecov/combine.rb
+- lib/simplecov/combine/branches_combiner.rb
+- lib/simplecov/combine/files_combiner.rb
+- lib/simplecov/combine/lines_combiner.rb
+- lib/simplecov/combine/results_combiner.rb
 - lib/simplecov/command_guesser.rb
 - lib/simplecov/configuration.rb
+- lib/simplecov/coverage_statistics.rb
 - lib/simplecov/defaults.rb
 - lib/simplecov/exit_codes.rb
 - lib/simplecov/file_list.rb
@@ -98,27 +71,34 @@ files:
 - lib/simplecov/formatter.rb
 - lib/simplecov/formatter/multi_formatter.rb
 - lib/simplecov/formatter/simple_formatter.rb
-- lib/simplecov/jruby_fix.rb
 - lib/simplecov/last_run.rb
 - lib/simplecov/lines_classifier.rb
 - lib/simplecov/load_global_config.rb
 - lib/simplecov/no_defaults.rb
 - lib/simplecov/profiles.rb
 - lib/simplecov/profiles/bundler_filter.rb
+- lib/simplecov/profiles/hidden_filter.rb
 - lib/simplecov/profiles/rails.rb
 - lib/simplecov/profiles/root_filter.rb
 - lib/simplecov/profiles/test_frameworks.rb
-- lib/simplecov/railtie.rb
-- lib/simplecov/railties/tasks.rake
-- lib/simplecov/raw_coverage.rb
 - lib/simplecov/result.rb
+- lib/simplecov/result_adapter.rb
 - lib/simplecov/result_merger.rb
+- lib/simplecov/simulate_coverage.rb
 - lib/simplecov/source_file.rb
+- lib/simplecov/source_file/branch.rb
+- lib/simplecov/source_file/line.rb
+- lib/simplecov/useless_results_remover.rb
 - lib/simplecov/version.rb
-homepage: http://github.com/colszowka/simplecov
+homepage: https://github.com/colszowka/simplecov
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/colszowka/simplecov/issues
+  changelog_uri: https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/simplecov/0.18.2
+  mailing_list_uri: https://groups.google.com/forum/#!forum/simplecov
+  source_code_uri: https://github.com/colszowka/simplecov/tree/v0.18.2
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -127,17 +107,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: Code coverage for Ruby 1.9+ with a powerful configuration library and automatic
-  merging of coverage across test suites
+summary: Code coverage for Ruby
 test_files: []

data/lib/simplecov/jruby_fix.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-if defined?(JRUBY_VERSION) && JRUBY_VERSION.to_f < 1.7
-  require "jruby"
-  java_import "org.jruby.ast.NodeType"
-
-  # Coverage for JRuby < 1.7.0 does not work correctly
-  #
-  #  - does not distinguish lines that cannot be executed
-  #  - does (partial) coverage for files loaded before `Coverage.start`.
-  #  - does not expand a path like `lib/../spec` to `spec`.
-  #
-  # This monkey patches Coverage to address those issues
-  module Coverage
-    class << self
-      alias __broken_result__ result
-
-      def result # rubocop:disable Metrics/MethodLength
-        fixed = {}
-        __broken_result__.each do |path, executed_lines|
-          next unless File.file? path
-
-          covered_lines = executed_lines.dup
-
-          process = lambda do |node|
-            if node.node_type == NodeType::NEWLINENODE
-              pos = node.position
-              covered_lines[pos.line] ||= 0
-            end
-            node.child_nodes.each(&process)
-          end
-
-          process[JRuby.parse(File.read(path), path)]
-
-          if (first = covered_lines.detect { |x| x }) && first > 0
-            fixed[File.expand_path(path)] = covered_lines
-          end
-        end
-
-        fixed
-      end
-    end
-  end
-end

data/lib/simplecov/railtie.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-module SimpleCov
-  class Railtie < ::Rails::Railtie
-    rake_tasks do
-      load "simplecov/railties/tasks.rake"
-    end
-  end
-end

data/lib/simplecov/railties/tasks.rake

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-require "rake/testtask"
-Rake::TestTask.new do |t|
-  t.name = "simplecov"
-  t.loader = :direct # uses require() which skips PWD in Ruby 1.9
-  t.libs.push "test", "spec", Dir.pwd
-  t.test_files = FileList["{test,spec}/**/*_{test,spec}.rb"]
-  t.ruby_opts.push "-r", "simplecov", "-e", "SimpleCov.start(:rails)".inspect
-end
-
-require "rake/clean"
-CLOBBER.include "coverage"

data/lib/simplecov/raw_coverage.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-module SimpleCov
-  module RawCoverage
-  module_function
-
-    # Merges multiple Coverage.result hashes
-    def merge_results(*results)
-      results.reduce({}) do |result, merged|
-        merge_resultsets(result, merged)
-      end
-    end
-
-    # Merges two Coverage.result hashes
-    def merge_resultsets(result1, result2)
-      (result1.keys | result2.keys).each_with_object({}) do |filename, merged|
-        file1 = result1[filename]
-        file2 = result2[filename]
-        merged[filename] = merge_file_coverage(file1, file2)
-      end
-    end
-
-    def merge_file_coverage(file1, file2)
-      return (file1 || file2).dup unless file1 && file2
-
-      file1.map.with_index do |count1, index|
-        count2 = file2[index]
-        merge_line_coverage(count1, count2)
-      end
-    end
-
-    def merge_line_coverage(count1, count2)
-      sum = count1.to_i + count2.to_i
-      if sum.zero? && (count1.nil? || count2.nil?)
-        nil
-      else
-        sum
-      end
-    end
-  end
-end