minitest-holdify 1.3.5 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d19382125e8e102ff0d8b01ca8227e68b44c7d0a532e99b5b2e7236a37a37407
-  data.tar.gz: cc34821ba517f701180baa40391421cc6d888d18a079be4c1445d6bda43578dc
+  metadata.gz: bf4cac7c6df9469fcdf1d5d9163a889b65c1c77777dfaf32622d21cfebe108ae
+  data.tar.gz: 495c373a2830de647cbaef7e58f36a8dd1664bdd50c4528c3135b3af277d025e
 SHA512:
-  metadata.gz: '0981c21b5932c8931c467642c6b1575bd3c61f34430f9330eb3c8c22d6712de5dba67ce6b31b8f8f59ed8e2778ddf3d393570721eda84496a35001e394e22588'
-  data.tar.gz: 5a73f8ab4dedddfe7694651d9a582641926648810c8dc30bec911a10c0f60dd63fa14b2b38422fd861b8abe18e9890b86de182cb73a28b7026b1bc8e7428912d
+  metadata.gz: 8894999267d0057e657ab17bd41612ffe09681ff5e7325d3d90903d33f0b06dc2e1a4438b1c87048136ba2c61d24f60e2f2b22bc5d849064e559c8393be5cad9
+  data.tar.gz: 91224d393746382dc2470704b0f013b1b71798ba9d225de85c544aed9f97ee9f1f676dace6a395c58b257044b98fb919b5a818cfb107cd46acda495b7d7f2953

data/lib/holdify/feedback.rb

@@ -137,10 +137,9 @@ module Holdify
       SGR = { clear:   "\e[0m",
               red:     "\e[31m",
               green:   "\e[32m",
-              yellow:  "\e[33m",
-              magenta: "\e[35m" }.freeze
+              yellow:  "\e[33m" }.freeze
 
-      def dye(color, string) = "#{SGR[color]}#{string}#{SGR[:clear]}"
+      def dye(color, string) = "#{SGR[color]}#{string}#{SGR[:clear] if SGR[color]}"
 
       def file_refs
         refs = super
@@ -158,22 +157,26 @@ 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
-                     "#{sgr}#{type}#{' ' * width}#{SGR[:clear]}"
+          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
+
+          gutter = if type == '+'
+                     ' ' * width
                    else
                      lineno[0] += 1
-                     "#{sgr}#{type || ' '}#{lineno[0].to_s.rjust(width)}#{SGR[:clear] if sgr}"
+                     lineno[0].to_s.rjust(width)
                    end
 
-          "#{gutter} #{line}"
+          "#{dye(color, "#{type}#{gutter}")} #{line}"
         end
       end
     end

data/lib/holdify.rb

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