simplecov 0.18.0.beta2 → 0.18.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eeee06c5cbeaf6c89000a43641f7a6163d9b267d145698e742089385eae6e2b8
-  data.tar.gz: 76e7182adc3c8156e021d780618733f6237a81723656f0123b51abf34a63e891
+  metadata.gz: a5ac4654ad44859d2e7b68cc5375314766127720e33d51080cc02120d35cc9cb
+  data.tar.gz: 89ceeaf8b9b1a76bd05a4f078c50a80050bd247ef067164201f9721ce7378b5b
 SHA512:
-  metadata.gz: e5e785e01ff4bf53c9cbdbeaeb7cc5925265e2ec9cacecb9865261150eed13b8c59c43d840588eb6baa0565ce510c74891f535f02bb1db42d2eeea4e61b3cd54
-  data.tar.gz: d8f29ed7d8ecf8a01d9fcd843a0c2a9845f022a690c8c7096c23077f7e3c2488fce290e099e70083ee44e37d1bb05f1535c2ec1a70b6952929ab92857b38a339
+  metadata.gz: 8afee26e98b841b002d097d589afbbc8b892452897423c927b817b51696bb7063e3f2e849f462434b765fb09970fbb6759d31d5362ea5c6e90eb65e82824eb78
+  data.tar.gz: ed2f4ffab150fd1da883604eccec94a087184aeaadb4b4d6f1f7273efa6020d1034b9e2eebbc8b88a9c63c54d545ccd6db4f5db58ee29f8182703ed40281342e

data/CHANGELOG.md

@@ -1,10 +1,19 @@
-0.18.0.beta2 (unreleased)
+0.18.0.beta3 (2020-01-20)
+========================
+
+## Enhancements
+* Instead of ignoring old `.resultset.json`s that are inside the merge timeout, adapt and respect them
+
+## Bugfixes
+* Remove the constant warning printing if you still have a `.resultset.json` in pre 0.18 layout that is within your merge timeout
+
+0.18.0.beta2 (2020-01-19)
 ===================
 
 ## Enhancements
 * only turn on the requested coverage criteria (when activating branch coverage before SimpleCov would also instruct Ruby to take Method coverage)
 * Change how branch coverage is displayed, now it's `branch_type: hit_count` which should be more self explanatory. See [#830](https://github.com/colszowka/simplecov/pull/830) for an example and feel free to give feedback!
-* Allow early running exit tasks and avoid the `at_exit` hook through the `SimpleCov.run_exit_tasks!` method. (thanks [@macumber]: https://github.com/macumber))
+* Allow early running exit tasks and avoid the `at_exit` hook through the `SimpleCov.run_exit_tasks!` method. (thanks [@macumber](https://github.com/macumber))
 * Allow manual collation of result sets through the `SimpleCov.collate` entrypoint. See the README for more details (thanks [@ticky](https://github.com/ticky))
 * Within `case`, even if there is no `else` branch declared show missing coverage for it (aka no branch of it). See [#825](https://github.com/colszowka/simplecov/pull/825)
 * Stop symbolizing all keys when loading cache (should lead to be faster and consume less memory)

data/lib/simplecov/combine/results_combiner.rb

@@ -34,11 +34,6 @@ module SimpleCov
       # @return [Hash]
       #
       def combine_result_sets(combined_results, result)
-        unless correct_format?(result)
-          warn_wrong_format
-          return combined_results
-        end
-
         results_files = combined_results.keys | result.keys
 
         results_files.each_with_object({}) do |file_name, file_combination|
@@ -49,41 +44,6 @@ module SimpleCov
         end
       end
 
-      # We might start a run of a new simplecov version with a new format stored while
-      # there is still a recent file like this lying around. If it's recent enough (
-      # see merge_timeout) it will end up here. In order not to crash against this
-      # we need to do some basic checking of the format of data we expect and
-      # otherwise ignore it. See #820
-      #
-      # Currently correct format is:
-      # { file_path_string => {coverage_criterion => coverage_date}}
-      #
-      # Internal use/reliance only.
-      def correct_format?(result)
-        result.empty? || matches_current_format?(result)
-      end
-
-      def matches_current_format?(result)
-        # I so wish I could already use pattern matching
-        key, data = result.first
-
-        key.is_a?(String) && second_level_choice_of_criterion?(data)
-      end
-
-      SECOND_LEVEL_KEYS = %w[lines branches].freeze
-      def second_level_choice_of_criterion?(data)
-        second_level_key, = data.first
-
-        SECOND_LEVEL_KEYS.member?(second_level_key)
-      end
-
-      def warn_wrong_format
-        warn "Merging results, encountered an incorrectly formatted value. "\
-          "This value was ignored.\nIf you just upgraded simplecov this is "\
-          "likely due to a changed file format. If this happens again please "\
-          "file a bug. https://github.com/colszowka/simplecov/issues"
-      end
-
       #
       # Combine two files coverage results
       #

data/lib/simplecov/result.rb

@@ -26,8 +26,9 @@ 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)
-      @original_result = original_result.freeze
-      @files = SimpleCov::FileList.new(original_result.map do |filename, coverage|
+      result = adapt_result(original_result)
+      @original_result = result.freeze
+      @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))
       filter!
@@ -82,6 +83,31 @@ module SimpleCov
 
   private
 
+    # 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
+    def adapt_result(result)
+      if pre_simplecov_0_18_result?(result)
+        adapt_pre_simplecov_0_18_result(result)
+      else
+        result
+      end
+    end
+
+    # pre 0.18 coverage data pointed from file directly to an array of line coverage
+    def pre_simplecov_0_18_result?(result)
+      _key, data = result.first
+
+      data.is_a?(Array)
+    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
+    end
+
     def coverage
       keys = original_result.keys & filenames
       Hash[keys.zip(original_result.values_at(*keys))]

data/lib/simplecov/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simplecov
 version: !ruby/object:Gem::Version
-  version: 0.18.0.beta2
+  version: 0.18.0.beta3
 platform: ruby
 authors:
 - Christoph Olszowka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-19 00:00:00.000000000 Z
+date: 2020-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docile
@@ -95,9 +95,9 @@ licenses:
 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.beta2
+  documentation_uri: https://www.rubydoc.info/gems/simplecov/0.18.0.beta3
   mailing_list_uri: https://groups.google.com/forum/#!forum/simplecov
-  source_code_uri: https://github.com/colszowka/simplecov/tree/v0.18.0.beta2
+  source_code_uri: https://github.com/colszowka/simplecov/tree/v0.18.0.beta3
 post_install_message: 
 rdoc_options: []
 require_paths: