simplecov 0.18.0 → 0.19.0

data/lib/simplecov/process.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Process
+  class << self
+    def fork_with_simplecov(&block)
+      if defined?(SimpleCov) && SimpleCov.running
+        fork_without_simplecov do
+          SimpleCov.at_fork.call(Process.pid)
+          block.call if block_given?
+        end
+      else
+        fork_without_simplecov(&block)
+      end
+    end
+
+    alias fork_without_simplecov fork
+    alias fork fork_with_simplecov
+  end
+end

data/lib/simplecov/result.rb

@@ -25,9 +25,11 @@ module SimpleCov
 
     # Initialize a new SimpleCov::Result from given Coverage.result (a Hash of filenames each containing an array of
     # coverage data)
-    def initialize(original_result)
+    def initialize(original_result, command_name: nil, created_at: nil)
       result = adapt_result(original_result)
       @original_result = result.freeze
+      @command_name = command_name
+      @created_at = created_at
       @files = SimpleCov::FileList.new(result.map do |filename, coverage|
         SimpleCov::SourceFile.new(filename, JSON.parse(JSON.dump(coverage))) if File.file?(filename)
       end.compact.sort_by(&:filename))
@@ -70,15 +72,15 @@ module SimpleCov
       }
     end
 
+    def time_since_creation
+      Time.now - created_at
+    end
+
     # Loads a SimpleCov::Result#to_hash dump
     def self.from_hash(hash)
-      command_name, data = hash.first
-
-      result = SimpleCov::Result.new(data["coverage"])
-
-      result.command_name = command_name
-      result.created_at = Time.at(data["timestamp"])
-      result
+      hash.map do |command_name, data|
+        new(data.fetch("coverage"), command_name: command_name, created_at: Time.at(data["timestamp"]))
+      end
     end
 
   private
@@ -86,7 +88,7 @@ module SimpleCov
     # We changed the format of the raw result data in simplecov, as people are likely
     # to have "old" resultsets lying around (but not too old so that they're still
     # considered we can adapt them).
-    # See https://github.com/colszowka/simplecov/pull/824#issuecomment-576049747
+    # See https://github.com/simplecov-ruby/simplecov/pull/824#issuecomment-576049747
     def adapt_result(result)
       if pre_simplecov_0_18_result?(result)
         adapt_pre_simplecov_0_18_result(result)
@@ -103,9 +105,9 @@ module SimpleCov
     end
 
     def adapt_pre_simplecov_0_18_result(result)
-      result.map do |file_path, line_coverage_data|
-        [file_path, {"lines" => line_coverage_data}]
-      end.to_h
+      result.transform_values do |line_coverage_data|
+        {"lines" => line_coverage_data}
+      end
     end
 
     def coverage

data/lib/simplecov/result_merger.rb

@@ -53,13 +53,8 @@ module SimpleCov
       # All results that are above the SimpleCov.merge_timeout will be
       # dropped. Returns an array of SimpleCov::Result items.
       def results
-        results = []
-        resultset.each do |command_name, data|
-          result = SimpleCov::Result.from_hash(command_name => data)
-          # Only add result if the timeout is above the configured threshold
-          results << result if (Time.now - result.created_at) < SimpleCov.merge_timeout
-        end
-        results
+        results = Result.from_hash(resultset)
+        results.select { |result| result.time_since_creation < SimpleCov.merge_timeout }
       end
 
       def merge_and_store(*results)

data/lib/simplecov/source_file.rb

@@ -25,7 +25,7 @@ module SimpleCov
     def src
       # We intentionally read source code lazily to
       # suppress reading unused source code.
-      @src ||= File.open(filename, "rb", &:readlines)
+      @src ||= load_source
     end
     alias source src
 
@@ -162,15 +162,64 @@ module SimpleCov
     end
 
     def build_no_cov_chunks
-      no_cov_lines = src.map.with_index(1).select { |line, _index| LinesClassifier.no_cov_line?(line) }
+      no_cov_lines = src.map.with_index(1).select { |line_src, _index| LinesClassifier.no_cov_line?(line_src) }
 
-      warn "uneven number of nocov comments detected" if no_cov_lines.size.odd?
+      # if we have an uneven number of nocovs we assume they go to the
+      # end of the file, the source doesn't really matter
+      # Can't deal with this within the each_slice due to differing
+      # behavior in JRuby: jruby/jruby#6048
+      no_cov_lines << ["", src.size] if no_cov_lines.size.odd?
 
-      no_cov_lines.each_slice(2).map do |(_line_start, index_start), (_line_end, index_end)|
+      no_cov_lines.each_slice(2).map do |(_line_src_start, index_start), (_line_src_end, index_end)|
         index_start..index_end
       end
     end
 
+    def load_source
+      lines = []
+      # The default encoding is UTF-8
+      File.open(filename, "rb:UTF-8") do |file|
+        current_line = file.gets
+
+        if shebang?(current_line)
+          lines << current_line
+          current_line = file.gets
+        end
+
+        read_lines(file, lines, current_line)
+      end
+    end
+
+    SHEBANG_REGEX = /\A#!/.freeze
+    def shebang?(line)
+      SHEBANG_REGEX.match?(line)
+    end
+
+    def read_lines(file, lines, current_line)
+      return lines unless current_line
+
+      set_encoding_based_on_magic_comment(file, current_line)
+      lines.concat([current_line], ensure_remove_undefs(file.readlines))
+    end
+
+    RUBY_FILE_ENCODING_MAGIC_COMMENT_REGEX = /\A#\s*(?:-\*-)?\s*(?:en)?coding:\s*(\S+)\s*(?:-\*-)?\s*\z/.freeze
+    def set_encoding_based_on_magic_comment(file, line)
+      # Check for encoding magic comment
+      # Encoding magic comment must be placed at first line except for shebang
+      if (match = RUBY_FILE_ENCODING_MAGIC_COMMENT_REGEX.match(line))
+        file.set_encoding(match[1], "UTF-8")
+      end
+    end
+
+    def ensure_remove_undefs(file_lines)
+      # invalid/undef replace are technically not really necessary but nice to
+      # have and work around a JRuby incompatibility. Also moved here from
+      # simplecov-html to have encoding shenaningans in one place. See #866
+      # also setting these option on `file.set_encoding` doesn't seem to work
+      # properly so it has to be done here.
+      file_lines.each { |line| line.encode!("UTF-8", invalid: :replace, undef: :replace) }
+    end
+
     def build_lines
       coverage_exceeding_source_warn if coverage_data["lines"].size > src.size
       lines = src.map.with_index(1) do |src, i|

data/lib/simplecov/useless_results_remover.rb

@@ -5,12 +5,14 @@ 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
+        path =~ root_regx
       end
     end
+
+    def self.root_regx
+      @root_regx ||= /\A#{Regexp.escape(SimpleCov.root + File::SEPARATOR)}/i.freeze
+    end
   end
 end

data/lib/simplecov/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SimpleCov
-  VERSION = "0.18.0"
+  VERSION = "0.19.0"
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: simplecov
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Christoph Olszowka
+- Tobias Pfeiffer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-28 00:00:00.000000000 Z
+date: 2020-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docile
@@ -30,18 +31,19 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        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
+- pragtob@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -55,6 +57,7 @@ files:
 - doc/alternate-formatters.md
 - doc/commercial-services.md
 - doc/editor-integration.md
+- lib/minitest/simplecov_plugin.rb
 - lib/simplecov.rb
 - lib/simplecov/combine.rb
 - lib/simplecov/combine/branches_combiner.rb
@@ -66,6 +69,10 @@ files:
 - lib/simplecov/coverage_statistics.rb
 - lib/simplecov/defaults.rb
 - lib/simplecov/exit_codes.rb
+- lib/simplecov/exit_codes/exit_code_handling.rb
+- lib/simplecov/exit_codes/maximum_coverage_drop_check.rb
+- lib/simplecov/exit_codes/minimum_coverage_by_file_check.rb
+- lib/simplecov/exit_codes/minimum_overall_coverage_check.rb
 - lib/simplecov/file_list.rb
 - lib/simplecov/filter.rb
 - lib/simplecov/formatter.rb
@@ -75,6 +82,7 @@ files:
 - lib/simplecov/lines_classifier.rb
 - lib/simplecov/load_global_config.rb
 - lib/simplecov/no_defaults.rb
+- lib/simplecov/process.rb
 - lib/simplecov/profiles.rb
 - lib/simplecov/profiles/bundler_filter.rb
 - lib/simplecov/profiles/hidden_filter.rb
@@ -90,15 +98,15 @@ files:
 - lib/simplecov/source_file/line.rb
 - lib/simplecov/useless_results_remover.rb
 - lib/simplecov/version.rb
-homepage: https://github.com/colszowka/simplecov
+homepage: https://github.com/simplecov-ruby/simplecov
 licenses:
 - MIT
 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.0
+  bug_tracker_uri: https://github.com/simplecov-ruby/simplecov/issues
+  changelog_uri: https://github.com/simplecov-ruby/simplecov/blob/main/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/simplecov/0.19.0
   mailing_list_uri: https://groups.google.com/forum/#!forum/simplecov
-  source_code_uri: https://github.com/colszowka/simplecov/tree/v0.18.0
+  source_code_uri: https://github.com/simplecov-ruby/simplecov/tree/v0.19.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -107,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="