simplecov 1.2.0 → 1.3.1

data/lib/simplecov/simulate_coverage.rb

@@ -22,8 +22,8 @@ module SimpleCov
     # left both as empty hashes, which made unloaded files invisible to the
     # branch/method denominators while their lines did count, so a glob that
     # picked up files without specs silently inflated branch% relative to
-    # line% (#1059). When Prism isn't loadable or the file can't be parsed,
-    # fall back to the old empty hashes.
+    # line% (#1059). When the file can't be parsed, fall back to the old empty
+    # hashes.
     #
     # Pass `synthesize: false` to skip the static analysis. Callers use it when
     # neither branch nor method coverage is enabled, since nothing will read

data/lib/simplecov/source_file/builder_context.rb

@@ -11,8 +11,15 @@ module SimpleCov
       # unavailable or parsing fails, signaling callers to keep every Coverage entry
       # rather than risk false drops. The `defined?` guard preserves a nil
       # memoization across calls.
+      #
+      # Nil for a template too, without parsing: every entry a template reports
+      # is eval-generated by construction, so the filter has nothing to
+      # distinguish there, and a template whose text happens to parse as Ruby
+      # (a Haml `#id` tag reads as a comment) would otherwise lose its real
+      # branches to a confident wrong parse.
       def real_source_positions
         return @real_source_positions if instance_variable_defined?(:@real_source_positions)
+        return @real_source_positions = nil if Directive::Template.template?(filename)
 
         @real_source_positions = StaticCoverageExtractor.real_source_positions(src.join)
       end

data/lib/simplecov/source_file/skip_chunks.rb

@@ -30,16 +30,25 @@ module SimpleCov
       end
 
       def directive_chunks
-        @directive_chunks ||= Directive.disabled_ranges(@src)
+        @directive_chunks ||= Directive.disabled_ranges(ruby_lines)
       end
 
       private
 
+      # The Ruby the file holds, which for a template means the Ruby inside its
+      # tags or script lines with its own comments turned into Ruby comments.
+      # Both kinds of marker are found there, so a toggle in a template's
+      # comment syntax gets the same treatment, and the same deprecation
+      # warning, as one in a Ruby file.
+      def ruby_lines
+        @ruby_lines ||= Directive::Template.ruby_lines(@filename, @src)
+      end
+
       # An uneven number of nocovs is assumed to run to the end of the file. It
       # cannot be handled inside the each_slice because JRuby behaves differently
       # there (jruby/jruby#6048).
       def build_nocov_chunks
-        no_cov_lines = @src.filter_map.with_index(1) do |line_src, index|
+        no_cov_lines = ruby_lines.filter_map.with_index(1) do |line_src, index|
           index if LinesClassifier.no_cov_line?(line_src)
         end
 

data/lib/simplecov/source_file/statistics.rb

@@ -30,15 +30,11 @@ module SimpleCov
         }
       end
 
-      # Files added via track_files but never loaded have no branch or method data,
-      # and report 0% instead of the empty-set default of 100% (#902). A file with
-      # missed entries and none covered already computes to 0%, so only a file that
-      # really has covered entries keeps its computed percentage.
       def branch_statistics
         sf = @source_file
         covered = sf.covered_branches
         missed = sf.missed_branches
-        percent = 0.0 if sf.not_loaded? && covered.empty?
+        percent = 0.0 if covered.empty? && unaccounted?(sf, "branches")
 
         {branch: coverage_statistics(covered, missed, percent: percent)}
       end
@@ -47,11 +43,25 @@ module SimpleCov
         sf = @source_file
         covered = sf.covered_methods
         missed = sf.missed_methods
-        percent = 0.0 if sf.not_loaded? && covered.empty?
+        percent = 0.0 if covered.empty? && unaccounted?(sf, "methods")
 
         {method: coverage_statistics(covered, missed, percent: percent)}
       end
 
+      # A file tracked but never loaded once carried no branch or method tuples
+      # at all, so an empty set meant "nobody knows", and answering the
+      # empty-set default of 100% overstated it (#902). Simulation now
+      # synthesizes those tuples statically, so a file carrying a table at all,
+      # empty or not, has been accounted for: it has no branches, or a
+      # directive skipped the ones it has, and it is as covered as a loaded
+      # file with none. Only a file carrying no table for the criterion is
+      # still unaccounted for. A file with missed entries and none covered
+      # already computes to 0% either way, so only one that really has covered
+      # entries keeps its computed percentage.
+      def unaccounted?(source_file, table)
+        source_file.not_loaded? && source_file.coverage_data[table].nil?
+      end
+
       def coverage_statistics(covered, missed, omitted: 0, percent: nil)
         CoverageStatistics.new(
           total_strength: covered.sum { |item| item.coverage.to_i },

data/lib/simplecov/static_coverage_extractor/condition_folding.rb

@@ -8,14 +8,9 @@ module SimpleCov
     # must not synthesize one either: the arm would be a phantom no loaded run
     # can hit, the same unmergeable-tuple failure as #1226 / #1233.
     module ConditionFolding
-      # CRuby 3.4 rebuilt the fold on the Prism compiler, and the parse.y fold it
-      # replaced differed in three observable ways: `__FILE__` folded on
-      # 3.2/3.3; parentheses were transparent for every literal on 3.2; and on
-      # 3.2 the dead arm's branch table entries survive the fold while its
-      # `def`s still never register.
+      # CRuby 3.4 rebuilt the fold on the Prism compiler, and the parse.y fold
+      # it replaced still differs on 3.3, where `__FILE__` folds.
       FOLDS_SOURCE_FILE = Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.4")
-      PARENS_ALWAYS_TRANSPARENT = Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.3")
-      DEAD_ARM_BRANCHES_SURVIVE = PARENS_ALWAYS_TRANSPARENT
       # Container literals in discarded position are eliminated from 3.3 on, but
       # 3.3's compile.c elides a container whose contents are merely
       # effect-free (`[x]`), while the Prism compiler demands fully static
@@ -42,8 +37,7 @@ module SimpleCov
 
       # CRuby folds `if nil`, `if "x"`, and `if -> {}` but keeps a real branch
       # for `if (nil)`, `if ("x")`, and `if (-> {})`, while every other literal
-      # folds parenthesized or not. Consulted only when parentheses are not
-      # always transparent.
+      # folds parenthesized or not.
       PAREN_OPAQUE_TYPES = [
         ::Prism::NilNode, ::Prism::StringNode, ::Prism::LambdaNode, ::Prism::SourceFileNode
       ].freeze
@@ -58,42 +52,18 @@ module SimpleCov
         ::Prism::SourceLineNode, ::Prism::SourceFileNode, ::Prism::SourceEncodingNode, ::Prism::RegularExpressionNode
       ].freeze
 
-      # `self` is eliminated by every supported compiler; local/ivar/defined?
-      # elimination arrived with the Prism-era compilers. Anything that can
-      # raise or run hooks is never eliminated and keeps the branch real.
-      PRISM_ERA_ELIMINABLE_READS = [
-        ::Prism::LocalVariableReadNode, ::Prism::InstanceVariableReadNode, ::Prism::DefinedNode
-      ].freeze
-
-      # simplecov:disable branch — which arm runs is fixed by the running Ruby's version
+      # Non-literal reads that are also eliminated when discarded. Anything that
+      # can raise or run hooks is never eliminated and keeps the branch real.
       ELIMINABLE_READ_TYPES = [
-        ::Prism::SelfNode,
-        *(PRISM_ERA_ELIMINABLE_READS unless PARENS_ALWAYS_TRANSPARENT)
+        ::Prism::SelfNode, ::Prism::LocalVariableReadNode,
+        ::Prism::InstanceVariableReadNode, ::Prism::DefinedNode
       ].freeze
-      # simplecov:enable branch
 
       private
 
-      # On 3.2 the dead arm's branch table entries survive the fold (parse.y
-      # instrumented branches before eliminating dead code) while its methods
-      # never register, so the dead arm is visited with method collection
-      # suppressed.
+      # `visit` is nil-safe, so a missing arm just visits nothing.
       def visit_folded_arms(verdict, truthy_arm, falsy_arm)
-        live, dead = verdict.equal?(:truthy) ? [truthy_arm, falsy_arm] : [falsy_arm, truthy_arm]
-        visit(live)
-        visit_dead_arm(dead) if DEAD_ARM_BRANCHES_SURVIVE
-      end
-
-      def visit_dead_arm(arm)
-        # Save/restore rather than set/clear: a fold nested inside this dead arm
-        # re-enters here and must not clear suppression for the rest of it.
-        previous = @suppress_methods
-        begin
-          @suppress_methods = true
-          visit(arm)
-        ensure
-          @suppress_methods = previous
-        end
+        visit(verdict.equal?(:truthy) ? truthy_arm : falsy_arm)
       end
 
       # `:truthy` or `:falsy` when the compiler folds, nil when it doesn't. The
@@ -115,8 +85,6 @@ module SimpleCov
       def foldable?(node, unwrapped)
         return false unless STATIC_CONDITION_TYPES.any? { |type| unwrapped.instance_of?(type) }
 
-        return true if PARENS_ALWAYS_TRANSPARENT
-
         unwrapped.equal?(node) || PAREN_OPAQUE_TYPES.none? { |type| unwrapped.instance_of?(type) }
       end
 
@@ -151,7 +119,6 @@ module SimpleCov
 
       def static_container_literal?(node)
         return true if STATIC_LITERAL_LEAF_TYPES.any? { |type| node.instance_of?(type) }
-        return false if PARENS_ALWAYS_TRANSPARENT
 
         static_container?(node)
       end

data/lib/simplecov/static_coverage_extractor/method_collector.rb

@@ -17,12 +17,8 @@ module SimpleCov
 
       # `def name(...)` and `def self.name(...)` both produce DefNode. The class
       # context is the surrounding lexical class or module, or `Object` at the top
-      # level, matching `Coverage`'s convention. Suppression covers 3.2's folded
-      # dead arms, where nested branches stay instrumented but a `def` never
-      # registers.
+      # level, matching `Coverage`'s convention.
       def visit_def_node(node)
-        return super if @suppress_methods
-
         class_name = @class_stack.last || "Object"
         key = [class_name, node.name, node.start_line, node.start_column, node.end_line, node.end_column]
         @methods[key] = 0

data/lib/simplecov/static_coverage_extractor/visitor.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "prism"
 require_relative "prism_compat"
 require_relative "condition_folding"
 require_relative "location_conventions"
@@ -12,7 +13,7 @@ module SimpleCov
     # Ruby's `Coverage` reports. Tuple ids are sequential across the file like
     # `Coverage`'s, but the numbering order can differ. That's fine: the
     # combiners intern on source span and the report output drops ids, so
-    # nothing downstream compares them. Only defined when Prism is loadable.
+    # nothing downstream compares them.
     class Visitor < Prism::Visitor
       include MethodCollector
       include LocationConventions
@@ -31,7 +32,6 @@ module SimpleCov
         @next_id = 0
         @class_stack = []
         @value_positions = nil
-        @suppress_methods = false
       end
 
       # On legacy Rubies the location of an empty branch arm depends on whether
@@ -48,11 +48,9 @@ module SimpleCov
       # Coverage synthesizes a `:else` arm attributed to the whole condition's
       # range, and so do we.
       #
-      # A folded condition emits no tuple, and on modern Rubies only its live
-      # arm is descended into: the compiler eliminates the dead arm's entire
-      # subtree, so a branch or method nested there would be a phantom no
-      # loaded run can produce. On 3.2 the dead arm is visited too, branches
-      # only.
+      # A folded condition emits no tuple, and only its live arm is descended
+      # into: the compiler eliminates the dead arm's entire subtree, so a branch
+      # or method nested there would be a phantom no loaded run can produce.
       def visit_if_node(node)
         verdict = folded_condition(node.predicate)
         return visit_folded_arms(verdict, node.statements, PrismCompat.subsequent(node)) if verdict

data/lib/simplecov/static_coverage_extractor.rb

@@ -1,13 +1,5 @@
 # frozen_string_literal: true
 
-begin
-  require "prism"
-rescue LoadError
-  # Prism isn't available on this Ruby (older than 3.3 without the gem).
-  # `StaticCoverageExtractor.available?` will return false and callers fall
-  # back to the previous "empty hashes" behavior.
-end
-
 module SimpleCov
   # Static enumeration of the branches and methods Ruby's `Coverage` library
   # would have reported if a file had been loaded with `branches: true` /
@@ -20,19 +12,20 @@ module SimpleCov
   # Position info comes from Prism's reported source locations; it doesn't
   # always match `Coverage`'s byte-for-byte, but lines are reliable and
   # downstream consumers that key off line numbers see the data they expect.
+  #
+  # Prism loads on the first extraction rather than with SimpleCov, so a
+  # line-only run never needs it. Where it cannot load at all (JRuby on
+  # Windows, whose FFI backend fails to open libprism), extraction answers nil
+  # like any other failure.
   module StaticCoverageExtractor
     extend self
 
-    def available?
-      defined?(Prism) ? true : false
-    end
-
     # Parse `source` and return `{"branches" => {...}, "methods" => {...}}`
-    # matching the shape `Coverage.result[path]` produces. Returns nil on parse
-    # failure or when Prism isn't available, which callers treat as "couldn't
+    # matching the shape `Coverage.result[path]` produces. Returns nil when
+    # Prism cannot load or parsing fails, which callers treat as "couldn't
     # extract, fall back to empty hashes".
     def call(source)
-      return nil unless available?
+      return nil unless prism_loaded?
 
       result = Prism.parse(source)
       return nil if result.failure?
@@ -61,8 +54,8 @@ module SimpleCov
     # Coincidental line-sharing between a real branch and an eval-generated one
     # keeps both, an acceptable false-negative for an opt-in filter.
     #
-    # Returns nil when Prism is unavailable or parsing fails, signaling callers
-    # to keep every Coverage entry.
+    # Returns nil when Prism cannot load or parsing fails, signaling callers to
+    # keep every Coverage entry.
     def real_source_positions(source)
       extracted = call(source)
       return nil unless extracted
@@ -73,6 +66,14 @@ module SimpleCov
       }
     end
 
+    # Memoized, because a failed load leaves nothing in $LOADED_FEATURES and
+    # would otherwise be retried for every file.
+    def prism_loaded?
+      return @prism_loaded if instance_variable_defined?(:@prism_loaded)
+
+      @prism_loaded = load_prism
+    end
+
     # Both keys carry their start line third, after the parts that vary between
     # recordings. Read through a parameter list rather than an index, because
     # every spelling of an index answers the same for a tuple of this fixed
@@ -84,11 +85,14 @@ module SimpleCov
     def method_identity(_class_name, name, start_line, *)
       [name, start_line]
     end
+
+    private
+
+    def load_prism
+      require_relative "static_coverage_extractor/visitor"
+      true
+    rescue LoadError
+      false
+    end
   end
 end
-
-# simplecov:disable branch
-# The `else` arm (Prism missing) is unreachable on engines where the dogfood
-# report runs; the Visitor class only matters when Prism is loadable.
-require_relative "static_coverage_extractor/visitor" if SimpleCov::StaticCoverageExtractor.available?
-# simplecov:enable branch

data/lib/simplecov/version.rb

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

data/lib/simplecov/view_coverage/template_compiler.rb

@@ -64,20 +64,29 @@ module SimpleCov
         segments.fetch(-2).to_sym
       end
 
-      # The single place ActionView is named. The handler lookup is the one the
-      # resolver performs, so a template language the project has registered a
-      # handler for compiles here the way it does when rendered. Nil when
-      # nothing is registered for the extension, which is how a default glob
-      # naming `.haml` behaves in a project that has no Haml: ActionView would
-      # hand back the raw handler and the template would report as static text.
+      # Nil when nothing is registered for the extension, which is how a default
+      # glob naming `.haml` behaves in a project that has no Haml.
+      # `handler_for_extension` is not that lookup: it falls back to the raw
+      # handler, and the template would report as static text.
       def build_template(path, source)
         extension = File.extname(path).delete_prefix(".")
-        handler = ActionView::Template.registered_template_handler(extension)
+        handler = handler_for(extension)
         return nil unless handler
 
         no_locals = [] #: Array[Symbol]
         ActionView::Template.new(source, path, handler, locals: no_locals, format: format_for(path))
       end
+
+      # Rails main removed `Template.registered_template_handler` when the
+      # registry moved onto `Template::Handlers`. Read that hash directly so an
+      # unregistered extension stays nil. Older Rails still have the method.
+      def handler_for(extension)
+        if ActionView::Template.respond_to?(:registered_template_handler)
+          ActionView::Template.registered_template_handler(extension)
+        else
+          ActionView::Template::Handlers.template_handlers[extension.to_sym]
+        end
+      end
     end
   end
 end

data/man/simplecov.1

@@ -1,4 +1,4 @@
-.TH SIMPLECOV 1 "2026-08-24" "simplecov 1.2.0" "User Commands"
+.TH SIMPLECOV 1 "2026-09-22" "simplecov 1.3.1" "User Commands"
 .SH NAME
 simplecov \- coverage reports and questions from the terminal
 .SH SYNOPSIS
@@ -168,8 +168,9 @@ line, branch, or method (default: line)
 .B \-\-missing
 Append the missed line ranges to each row
 .TP
-.B \-\-annotate github
-Emit ::warning workflow commands instead of rows
+.B \-\-annotate KIND
+Emit CI annotations instead of rows: github, gitlab, rdjson, azure, teamcity,
+or buildkite
 .TP
 .B \-\-json
 Emit results as a JSON array (for CI)
@@ -252,6 +253,10 @@ Exit non\-zero when patch coverage on any measured criterion is below N%
 .B \-\-find\-renames
 Follow a renamed file instead of counting the moved file as all\-new
 .TP
+.B \-\-annotate KIND
+Emit CI annotations instead of rows: github, gitlab, rdjson, azure, teamcity,
+or buildkite
+.TP
 .B \-\-json
 Emit results as a JSON array (for CI)
 .SS ratchet

data/sig/simplecov.rbs

@@ -123,6 +123,8 @@ module SimpleCov
 
   def self.tracked_file_paths: () -> Array[String]
 
+  def self.warn_templates_tracked: (Array[String] templates) -> void
+
   def self.inject_unloaded_files: (Hash[String, untyped] result, Array[String] candidate_paths, ?synthesize: bool?, ?lines: bool?) -> [Hash[String, untyped], Set[String]]
 
   def self.collect_own_coverage: (standalone: bool) -> void
@@ -669,6 +671,7 @@ module SimpleCov
     def source_file_for: (String path) -> SourceFile?
     def coverage_for: (String path) -> Hash[criterion, CoverageStatistics]?
     def groups: () -> Hash[String, FileList]
+    def configured_group?: (String group_name) -> bool
     def format!: () -> untyped
     def created_at: () -> Time
     def command_name: () -> String
@@ -953,6 +956,8 @@ module SimpleCov
 
       def method_statistics: () -> Hash[criterion, CoverageStatistics]
 
+      def unaccounted?: (SourceFile source_file, String table) -> bool
+
       def coverage_statistics: (Array[Line | Branch | Method] covered, Array[Line | Branch | Method] missed, ?omitted: Integer, ?percent: Float?) -> CoverageStatistics
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simplecov
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Erik Berlin
@@ -43,7 +43,9 @@ files:
 - lib/simplecov/cli.rb
 - lib/simplecov/cli/affected.rb
 - lib/simplecov/cli/affected/changed_files.rb
+- lib/simplecov/cli/affected/runner.rb
 - lib/simplecov/cli/affected/selection.rb
+- lib/simplecov/cli/annotations.rb
 - lib/simplecov/cli/badge.rb
 - lib/simplecov/cli/badge/svg.rb
 - lib/simplecov/cli/clean.rb
@@ -67,6 +69,7 @@ files:
 - lib/simplecov/cli/patch/output.rb
 - lib/simplecov/cli/ratchet.rb
 - lib/simplecov/cli/ratchet/output.rb
+- lib/simplecov/cli/real_path.rb
 - lib/simplecov/cli/report.rb
 - lib/simplecov/cli/run.rb
 - lib/simplecov/cli/serve.rb
@@ -125,6 +128,11 @@ files:
 - lib/simplecov/defaults.rb
 - lib/simplecov/deprecation.rb
 - lib/simplecov/directive.rb
+- lib/simplecov/directive/erb.rb
+- lib/simplecov/directive/haml.rb
+- lib/simplecov/directive/indented_template.rb
+- lib/simplecov/directive/slim.rb
+- lib/simplecov/directive/template.rb
 - lib/simplecov/exit_codes.rb
 - lib/simplecov/exit_codes/baseline_check.rb
 - lib/simplecov/exit_codes/check.rb
@@ -233,9 +241,9 @@ licenses:
 metadata:
   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/1.2.0
+  documentation_uri: https://www.rubydoc.info/gems/simplecov/1.3.1
   mailing_list_uri: https://groups.google.com/forum/#!forum/simplecov
-  source_code_uri: https://github.com/simplecov-ruby/simplecov/tree/v1.2.0
+  source_code_uri: https://github.com/simplecov-ruby/simplecov/tree/v1.3.1
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
@@ -244,14 +252,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.20
+rubygems_version: 4.0.21
 specification_version: 4
 summary: Code coverage for Ruby
 test_files: []