minitest-holdify 1.3.2 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fb43344c6f2a11991bd6ec2b71e7fabcb8a8c5f77bd2048cbac1f9c94b85448
-  data.tar.gz: d8c9580c6701d82c50e11b96bd4bf0bc8fe9efeb98f7287057c6f8220519425d
+  metadata.gz: 91ac2c93846bb953d73a2cee3f89f8985b5ed1596b13995423212e91020cf52f
+  data.tar.gz: c3d196b9a65791d40aa3255a2c11345bebecf989a7c154d0e7d93cb4b9302294
 SHA512:
-  metadata.gz: b9420de8747442f0c2853caed136ac08bbd8066af4aa7d429efdec534a7e081b4a12b7bf7f5652de887f73c478a085f0f7032c34c5befd6b558b81128eff6583
-  data.tar.gz: 1c78694729ccf6de3192648f1d0657fcf7cbcb3d471fbb82ffd4e18e6a9378a58eea0ea23a7ee057a6206ecd474bd56455506f765bef2fa1d9a2633644c012f2
+  metadata.gz: 20007012180156142177f200c8874325e446638ab65fd87ecd6aa7f3377473fce0ff8dee1c88da698dc5aff77318cd66d6ad2bf3c419fabbc9c77170ff9b909d
+  data.tar.gz: aad5cb0fd0683f63fe3754c39745e87674e0df1c98b2babc4facc926d79bf1d0c9d3f643dd72d156acf29b18a159c0ea79e21b4e0e68ff384bc7c1402a2ae60e

data/lib/holdify/feedback.rb

@@ -22,12 +22,16 @@ module Holdify
 
       @expected, @actual, @message = *args
 
-      # Extend with features
-      extend(Color) if Holdify.color
+      # Extend features
+      extend Color if Holdify.color
       return unless Holdify.git_diff
 
-      extend GitDiff
-      extend(Color::GitDiff) if Holdify.color
+      @diff_yaml_headers = 2    # ----expected and +---actual (no sgr code) on 2 lines
+      extend GitDiff            # rubocop:disable Layout/EmptyLinesAfterModuleInclusion
+      return unless Holdify.color
+
+      @diff_yaml_headers = 1    # ---expected---actual (with sgr codes) on single line
+      extend Color::GitDiff
     end
 
     def message = [@message, *file_refs, *diff, ''].join("\n")
@@ -87,14 +91,15 @@ module Holdify
       end
 
       def process_lines(lines)
-        width  = 0
-        lineno = [@yaml_lno - 1]
+        width   = 0
+        lineno  = [@yaml_lno - 1]
         lines.map.with_index do |line, i|
           if i.zero? # @@ ... @@
             width, line = render_hunk(line)
             next line
+          elsif i <= @diff_yaml_headers # ---
+            next
           end
-          next if i == 1 || (i == 2 && !Holdify.color)  # ---
 
           render_line(line, lineno, width)
         end.compact
@@ -144,7 +149,10 @@ module Holdify
 
       # Methods enabling the git-diff ANSI feedback
       module GitDiff
-        def git_command = "git diff --no-index --color-words='[^ ]+|[ ]+' --unified=1000 #{@exp_path} #{@act_path}"
+        def git_command
+          re = '[[:alnum:]:._-]+|[^[:alnum:]:._-]|[[:space:]]+' # YAML and HTML friendly: avoid long continuous tokens
+          "git diff --no-index --color-words='#{re}' --unified=1000 #{@exp_path} #{@act_path}"
+        end
 
         def render_line(line, lineno, width)
           clean   = line.gsub(/\e\[(1|22|0)m/, '').lstrip
@@ -156,7 +164,7 @@ module Holdify
 
           sgr    = SGR[color].to_s if color
           gutter = if added
-                     "#{sgr}#{type} #{' ' * width}#{SGR[:clear]}"
+                     "#{sgr}#{type}#{' ' * width}#{SGR[:clear]}"
                    else
                      lineno[0] += 1
                      "#{sgr}#{type || ' '}#{lineno[0].to_s.rjust(width)}#{SGR[:clear]}"

data/lib/holdify.rb

@@ -7,7 +7,7 @@ require_relative 'holdify/store'
 
 # The container module
 module Holdify
-  VERSION = '1.3.2'
+  VERSION = '1.3.4'
 
   @fresh_mutex  = Mutex.new
   @fresh        = []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-holdify
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.4
 platform: ruby
 authors:
 - Domizio Demichelis