minitest-holdify 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d19382125e8e102ff0d8b01ca8227e68b44c7d0a532e99b5b2e7236a37a37407
-  data.tar.gz: cc34821ba517f701180baa40391421cc6d888d18a079be4c1445d6bda43578dc
+  metadata.gz: dbd748b5b683c4eb669332d65aa2b2b2a7f85ebeda0f19231e1f5d3b581881e2
+  data.tar.gz: 55064de27d4b03325fd59be8b759d57afefd66bdc376af773a28472b90b9c289
 SHA512:
-  metadata.gz: '0981c21b5932c8931c467642c6b1575bd3c61f34430f9330eb3c8c22d6712de5dba67ce6b31b8f8f59ed8e2778ddf3d393570721eda84496a35001e394e22588'
-  data.tar.gz: 5a73f8ab4dedddfe7694651d9a582641926648810c8dc30bec911a10c0f60dd63fa14b2b38422fd861b8abe18e9890b86de182cb73a28b7026b1bc8e7428912d
+  metadata.gz: 5140bf266f4903077e7718e13f982fd29409490dface61f73dec08a4b5cefc9ed2b094a92935ad3931fc46291c0cd9d6d185acc48960707cc2108df98ff7e03d
+  data.tar.gz: 95621206dfa3b5af7d83f0e8a2916760d3a4ed582f66f34967714aedee0a486d15a4d4695e73697f2e760397708c33e5005918135d8b2c4490dfeba1c6e2ca38

data/lib/holdify/feedback.rb

@@ -158,19 +158,24 @@ module Holdify
         end
 
         def render_line(line, lineno, width)
-          clean   = line.gsub(/\e\[(1|22|0)m/, '').lstrip
-          added   = clean.start_with?(SGR[:green]) && !line.include?(SGR[:red])
-          removed = clean.start_with?(SGR[:red]) && !line.include?(SGR[:green])
-          changed = line.include?(SGR[:red]) || line.include?(SGR[:green])
-
-          type, color = (added && ['+', :green]) || (removed && ['-', :red]) || (changed && ['~', :yellow])
-
-          sgr    = SGR[color].to_s if color
-          gutter = if added
+          clean       = line.strip
+          type, color = case
+                        when clean.start_with?(SGR[:green]) && !line.include?(SGR[:red]) && clean.end_with?(SGR[:clear], "\e[m")
+                          ['+', :green]
+                        when clean.start_with?(SGR[:red]) && !line.include?(SGR[:green]) && clean.end_with?(SGR[:clear], "\e[m")
+                          ['-', :red]
+                        when line.include?(SGR[:red]) || line.include?(SGR[:green])
+                          ['~', :yellow]
+                        else
+                          [' ', :none]
+                        end
+
+          sgr    = SGR[color]
+          gutter = if type == '+'
                      "#{sgr}#{type}#{' ' * width}#{SGR[:clear]}"
                    else
                      lineno[0] += 1
-                     "#{sgr}#{type || ' '}#{lineno[0].to_s.rjust(width)}#{SGR[:clear] if sgr}"
+                     "#{sgr}#{type}#{lineno[0].to_s.rjust(width)}#{SGR[:clear] if sgr}"
                    end
 
           "#{gutter} #{line}"

data/lib/holdify.rb

@@ -7,7 +7,7 @@ require_relative 'holdify/store'
 
 # The container module
 module Holdify
-  VERSION = '1.3.5'
+  VERSION = '1.3.6'
 
   @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.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Domizio Demichelis