minitest-holdify 1.3.3 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16f323fa95fbafe93f7554b26b3bcfd77c64904541374d1bb2355625a0cf3456
-  data.tar.gz: 35af707d16f16b01da03cdc4c57601c62d7c33157604a5a539f3b3b313dcfc21
+  metadata.gz: d19382125e8e102ff0d8b01ca8227e68b44c7d0a532e99b5b2e7236a37a37407
+  data.tar.gz: cc34821ba517f701180baa40391421cc6d888d18a079be4c1445d6bda43578dc
 SHA512:
-  metadata.gz: 1becfd3103d6e03e31e25b5cbfc16155792a6454d5052b85e4797d7d1597a25689dfc109597d115cd541c736eedb17c2b708cf6cd28089f13e8819b79cef62ac
-  data.tar.gz: 7a7be717e2bba29f50c16dcc0d4017cd9dc96a41618e65c8eeabec5a457de4da6891b190efe7a04464d2a447e4a81e55baf24b4546c37785022d1c9068f01a49
+  metadata.gz: '0981c21b5932c8931c467642c6b1575bd3c61f34430f9330eb3c8c22d6712de5dba67ce6b31b8f8f59ed8e2778ddf3d393570721eda84496a35001e394e22588'
+  data.tar.gz: 5a73f8ab4dedddfe7694651d9a582641926648810c8dc30bec911a10c0f60dd63fa14b2b38422fd861b8abe18e9890b86de182cb73a28b7026b1bc8e7428912d

data/lib/holdify/feedback.rb

@@ -8,12 +8,8 @@ module Holdify
   # Feedback report on failure
   class Feedback
     def initialize(hold, hold_ref, *args)
-      test_lno  = hold.test_loc.lineno
-      index     = hold.session[test_lno].size - 1   # current index
-      xxh       = hold.store.xxh(test_lno)
       yaml_path = hold.store.path
-
-      @yaml_lno = find_yaml_lno(yaml_path, test_lno, xxh, index)
+      @yaml_lno = find_yaml_lno(hold, yaml_path)
       @yaml_ref = Holdify.relativize("#{yaml_path}:#{@yaml_lno}")
 
       @hold_ref = Holdify.relativize(hold_ref)
@@ -34,7 +30,7 @@ module Holdify
       extend Color::GitDiff
     end
 
-    def message = [@message, *file_refs, *diff, ''].join("\n")
+    def render = [@message, *file_refs, *diff, ''].join("\n")
 
     def file_refs
       ["--- @stored --> #{@yaml_ref}", "+++ @tested --> #{@hold_ref}"].tap do |refs|
@@ -46,7 +42,11 @@ module Holdify
 
     private
 
-    def find_yaml_lno(yaml_path, test_lno, xxh, index)
+    def find_yaml_lno(hold, yaml_path)
+      test_lno = hold.test_loc.lineno
+      index    = hold.session[test_lno].size - 1   # current index
+      xxh      = hold.store.xxh(test_lno)
+
       found = false
       count = -1
       File.foreach(yaml_path).with_index(1) do |line, ln|
@@ -91,8 +91,8 @@ 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)
@@ -105,14 +105,16 @@ module Holdify
         end.compact
       end
 
+      # Reduce the hunk lines by 1 and calculate the gutter width
       def render_hunk(line)
         width = 0
         hunk  = line.gsub(/([-+]\d+),(\d+)\s+([-+]\d+),(\d+)/) do
-          v1, = $2.to_i - 1          # rubocop:disable Style/PerlBackrefs
-          v2  = $4.to_i - 1          # rubocop:disable Style/PerlBackrefs
-          width = (@yaml_lno + [v1, v2].max).to_s.length
-          "#{$1},#{v1} #{$3},#{v2}"  # rubocop:disable Style/PerlBackrefs
-        end
+                  v1,   = $2.to_i - 1          # rubocop:disable Style/PerlBackrefs
+                  v2    = $4.to_i - 1          # rubocop:disable Style/PerlBackrefs
+                  width = (@yaml_lno + [v1, v2].max).to_s.length
+                  "#{$1},#{v1} #{$3},#{v2}"    # rubocop:disable Style/PerlBackrefs
+                end
+
         [width, hunk]
       end
 
@@ -149,7 +151,11 @@ 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
+          # Words/ruby entities | indent | other single-chars
+          re = '[[:alnum:]_:]+|[[:space:]]+|.'
+          "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
@@ -164,7 +170,7 @@ module Holdify
                      "#{sgr}#{type}#{' ' * width}#{SGR[:clear]}"
                    else
                      lineno[0] += 1
-                     "#{sgr}#{type || ' '}#{lineno[0].to_s.rjust(width)}#{SGR[:clear]}"
+                     "#{sgr}#{type || ' '}#{lineno[0].to_s.rjust(width)}#{SGR[:clear] if sgr}"
                    end
 
           "#{gutter} #{line}"

data/lib/holdify/hold.rb

@@ -39,6 +39,10 @@ module Holdify
       @session.each { |lineno, values| @store.set_values(lineno, values) }
     end
 
+    def feedback(*) = Feedback.new(self, *).render
+
+    private
+
     # Find the triggering LOC inside the test block/method
     def find_test_loc
       caller_locations(2).find do |location|
@@ -48,7 +52,5 @@ module Holdify
         label == @test.name || label == '<top (required)>' || label == '<main>' || label.start_with?('<class:', '<module:')
       end
     end
-
-    def feedback(*) = Feedback.new(self, *).message
   end
 end

data/lib/holdify.rb

@@ -7,7 +7,7 @@ require_relative 'holdify/store'
 
 # The container module
 module Holdify
-  VERSION = '1.3.3'
+  VERSION = '1.3.5'
 
   @fresh_mutex  = Mutex.new
   @fresh        = []
@@ -23,7 +23,7 @@ module Holdify
       end
     end
 
-    def fresh_report
+    def warn_fresh_values
       return if quiet
 
       @fresh_mutex.synchronize do

data/lib/minitest/holdify_plugin.rb

@@ -19,8 +19,8 @@ module Minitest
     opts.on '--holdify-no-color', 'Disable colored output' do
       options[:holdify_no_color] = true
     end
-    opts.on '--holdify-no-relative-paths', 'Disable relative paths in file references' do
-      options[:holdify_no_relative_paths] = true
+    opts.on '--holdify-absolute-paths', 'Disable relative paths in file references' do
+      options[:holdify_absolute_paths] = true
     end
     opts.on '--holdify-store-ext EXT', 'The yaml store extension (default .yaml)' do |ext|
       options[:holdify_store_ext] = ext
@@ -38,19 +38,19 @@ module Minitest
     Holdify.quiet     = options[:holdify_quiet]
     Holdify.git_diff  = git unless options[:holdify_no_git_diff]
     Holdify.color     = !ENV.key?('NO_COLOR') unless options[:holdify_no_color]
-    Holdify.rel_paths = true unless options[:holdify_no_relative_paths]
+    Holdify.rel_paths = true unless options[:holdify_absolute_paths]
     Holdify.store_ext = options[:holdify_store_ext] || '.yaml'
 
     Minitest.after_run do
       Holdify.persist_stores!
-      Holdify.fresh_report
+      Holdify.warn_fresh_values
     end
   end
 
   # Patching Minitest::Assertion
   class Assertion
     remove_const :RE
-    RE = /in [`'](?:[^']+[#.])?(?:assert|refute|flunk|pass|fail|raise|must|wont|to)/ # :nodoc:
+    RE = /in [`'](?:[^']+[#.])?(?:assert|refute|flunk|pass|fail|raise|must|wont|to)/ # add to (to_hold)
   end
 
   # Reopen the minitest class

metadata

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