rspec-capturing-formatter 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19503a13ac6bfc68facc76325bd41bd2b440adcd62286043bdc4d640973604ca
-  data.tar.gz: bbed93a7930a15b1a1b4bd395c474b6e2a725e735bca93a9528d27d67a111e09
+  metadata.gz: 86c5a7a4ac477c385790c51f48ec8a541a2ddb98dd7ae54221eabab56cb1cd8d
+  data.tar.gz: 4f2dfe985f9cc9fa07e9657c91d2237f8aa4785444636302047845c53a16fa1f
 SHA512:
-  metadata.gz: 71c8229f3cd01dc16408afc61e663715a3d10040cc64cd5a8b47e72686647cfd4c2c877b1e9fe6683cf7c825fe17cb9d16a631ef89a61ed433a994c6251719de
-  data.tar.gz: 7e5390702ff5a2bd814124e03f82bf413e59d8a28332aef8c9e002b8001b635fd22df8a03a0c7e73af0b276eaa315157f7f3df7701ba1c8100518b0273436803
+  metadata.gz: 65b49e1b9f9412f070c336a9e0af3678b6b56f297919b076ce2d84216b589ba5b5b556763972cbe4869141d4b69cdc26ae91d7d0a0d84017a8c62e3c3ec5044a
+  data.tar.gz: fe4ffca9eb311c1502d51ca61ccc9525361839ad73c11e55564bd5946814391ae329eb755cc2aebbbf64d51be5922da04154ccd42086a6b37104ba7c5c4c56b4

data/README.md

@@ -98,9 +98,9 @@ RSpec::CapturingFormatter.configure do |config|
 end
 ```
 
-When `config.color == true`, coloring is enabled even when there is no TTY. Coloring is always disabled when `NO_COLOR` or when RSpec's `--no-color` option is set.
+When `config.color == true`, coloring is enabled for TTY destinations and disabled for redirected output by default. `FORCE_COLOR` enables coloring when it is non-empty and not `0`; RSpec's `--force-color` has the same effect. Coloring is always disabled when `NO_COLOR`, `config.color = false`, or RSpec's `--no-color` option is set.
 
-On Windows, interactive coloring is supported in Windows Terminal. Legacy Windows console sessions are not supported color targets and receive plain-text output instead of raw ANSI escape sequences. Redirected reports keep ANSI coloring when enabled, so they can be viewed by ANSI-aware CI logs or tools.
+On Windows, interactive coloring is supported in Windows Terminal. Legacy Windows console sessions are not supported color targets and receive plain-text output instead of raw ANSI escape sequences. Redirected reports are plain by default and remain colored when `FORCE_COLOR` or `--force-color` is used.
 
 ## Output capture limitations
 

data/Rakefile

@@ -12,7 +12,8 @@ task :spec do
     rspec_args << "--format"
     rspec_args << "RSpec::CapturingFormatter"
   end
-  if ENV["FORCE_COLOR"]
+  force_color = ENV["FORCE_COLOR"]
+  if force_color && !force_color.empty? && force_color != "0"
     rspec_args << "--force-color"
   end
   if (file = ENV["FILE"])

data/lib/rspec/capturing_formatter/renderer.rb

@@ -29,10 +29,11 @@ module RSpec
 
       attr_reader :output
 
-      def initialize(output, configuration, capture_manager: nil, ansi_supported: nil)
+      def initialize(output, configuration, capture_manager: nil, ansi_supported: nil, env: ENV)
         @output = output || StringIO.new
         @configuration = configuration
         @capture_manager = capture_manager
+        @env = env
         @ansi_supported = ansi_supported.nil? ? WindowsTerminal.ansi_supported?(@output) : ansi_supported
         @entry_started = false
         @entry_kind = nil
@@ -223,7 +224,7 @@ module RSpec
       private
 
       def emit_captured_text(source, text, nonblocking: false)
-        text = strip_sgr(text) unless @ansi_supported
+        text = strip_sgr(text) unless color_enabled?
         return if text.empty?
 
         # Once application SGR appears, formatter source color stays off until the capture boundary.
@@ -267,7 +268,7 @@ module RSpec
 
       def line(value, color = nil)
         value = value.to_s
-        value = strip_sgr(value) unless @ansi_supported
+        value = strip_sgr(value) unless color_enabled?
         write_raw(RESET) if color_enabled?
         write_raw(style(value, color))
         write_raw("\n")
@@ -363,11 +364,24 @@ module RSpec
 
       def color_enabled?
         return false unless @ansi_supported
-        return false if ENV["NO_COLOR"] && !ENV["NO_COLOR"].empty?
-        return false if defined?(RSpec) && RSpec.respond_to?(:configuration) &&
-          RSpec.configuration.respond_to?(:color_mode) && RSpec.configuration.color_mode == :off
+        return false unless @configuration.color
+        return false if @env["NO_COLOR"] && !@env["NO_COLOR"].empty?
 
-        @configuration.color
+        color_mode = rspec_color_mode
+        return false if color_mode == :off
+        return true if color_mode == :on
+
+        force_color = @env["FORCE_COLOR"]
+        return true if force_color && !force_color.empty? && force_color != "0"
+
+        @output.respond_to?(:tty?) && @output.tty?
+      end
+
+      def rspec_color_mode
+        return unless defined?(RSpec) && RSpec.respond_to?(:configuration)
+
+        configuration = RSpec.configuration
+        configuration.color_mode if configuration.respond_to?(:color_mode)
       end
 
       def style(value, color)

data/lib/rspec/capturing_formatter/version.rb

@@ -4,6 +4,6 @@ module RSpec
   class CapturingFormatter
     # After updating this value, run `bundle exec rake bundle:install -m`
     # to sync all Bundler lockfiles.
-    VERSION = "1.0.2"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-capturing-formatter
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Hongli Lai