minitest-holdify 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2fecbc870f5205d62da0200a806adc5dc5d47b99a81e53c1af4d50f3f8aaa21
-  data.tar.gz: 06aed82a631a3632c531ef311a53f89e339a00d122fbc75eb31c52f1723e8d24
+  metadata.gz: aff615590c52a4b538a92ae7e90dd24a6d4f5461e70b3cc240f5a30a819a8855
+  data.tar.gz: 6a0977317a054b2e6c89c403715c2815cd3d24d479161f83c622acb55ded2aeb
 SHA512:
-  metadata.gz: ebd7c7cbf15fc450a1a657affe961399ac916c3d57aafc74a89067638ba2d569c59ea134eecd811361d6970989a227dc6814bc1bec07673ee5ea2ca86ea5f877
-  data.tar.gz: c14c8219c1fbaaf1f10a6f28eef93f4696f71d59020090f85d96afe0ae431fa6a52db0a91d6f37f713ea266a6ef61369589bd85544a70c681f73c1902f0055eb
+  metadata.gz: 8f0553c5e76cced33e96d49adf7b89929d2d119d3f375ac36ea1aa3fac2a5786cfc65000aaefae5bf5066f94921840549927761a36b2f9832f6ea770a8a71702
+  data.tar.gz: 73ff0933e454a35def50e40b2cf46b82a45a4fa801c6dbb2dcb9a36d4ef11ddd91ee51649260f60e544ef581e7768942076aa1a4120aae4aeabf5a4d4a65cb79

data/lib/holdify/feedback.rb

@@ -68,8 +68,8 @@ module Holdify
       def git_command = "git diff --no-index --no-color --unified=1000 #{@exp_path} #{@act_path}"
 
       def diff
-        @exp_path = create_tempfile(@expected).path
-        @act_path = create_tempfile(@actual).path
+        @exp_path = create_tempfile(@expected, 'expected').path
+        @act_path = create_tempfile(@actual, 'actual').path
 
         stdout, = Open3.capture3(git_command)
         regex   = /\A[^@]*\r?\n/m   # cleanup git headers
@@ -83,9 +83,9 @@ module Holdify
         # :nocov:
       end
 
-      def create_tempfile(obj)
+      def create_tempfile(obj, type)
         Tempfile.create.tap do |file|
-          file.write(YAML.dump(obj))
+          file.write(Store.hold_dump(obj).sub(/(?=\n)/, type))
           file.close
         end
       end
@@ -94,17 +94,27 @@ module Holdify
         width  = 0
         lineno = [@yaml_lno - 1]
         lines.map.with_index do |line, i|
-          if i.zero?            # @@ ... @@
-            w = line.scan(/,(\d+)/).flatten.map(&:to_i).max
-            width = (@yaml_lno + w).to_s.length
+          if i.zero? # @@ ... @@
+            width, line = render_hunk(line)
             next line
           end
-          next if i == 1        # ---
+          next if i == 1 || (i == 2 && !Holdify.color)  # ---
 
           render_line(line, lineno, width)
         end.compact
       end
 
+      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
+        [width, hunk]
+      end
+
       def render_line(line, lineno, width)
         type   = line[0]
         line   = line[1..]

data/lib/holdify/hold.rb

@@ -51,10 +51,6 @@ module Holdify
       end
     end
 
-    def warn_for(actual)
-      warn("[holdify] The value from #{Holdify.relative(@test_loc.path)}:#{@test_loc.lineno} is:\n[holdify] => #{actual.inspect}")
-    end
-
     def feedback(*) = Feedback.new(self, *).message
   end
 end

data/lib/holdify/store.rb

@@ -11,6 +11,11 @@ module Holdify
       def register(target, obj); end
     end
 
+    def self.hold_dump(obj)
+      visitor = NoAliasVisitor.create
+      visitor << obj
+      visitor.tree.to_yaml
+    end
     extend Forwardable
 
     def_delegator :@source, :xxh
@@ -38,17 +43,11 @@ module Holdify
         output["L#{lineno} #{xxh}"] = @data[lineno]
       end
 
-      File.write(@path, hold_dump(output))
+      File.write(@path, self.class.hold_dump(output))
     end
 
     private
 
-    def hold_dump(obj)
-      visitor = NoAliasVisitor.create
-      visitor << obj
-      visitor.tree.to_yaml
-    end
-
     def load_and_align
       {}.tap do |aligned|
         data = YAML.unsafe_load_file(@path) || {}

data/lib/holdify.rb

@@ -7,7 +7,7 @@ require_relative 'holdify/store'
 
 # The container module
 module Holdify
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 
   class << self
     attr_accessor :reconcile, :quiet, :git, :pwd, :color, :rel_paths, :store_ext

data/lib/minitest/holdify_plugin.rb

@@ -68,17 +68,19 @@ module Minitest
       expected = @hold.(actual, **)
 
       begin
-        if actual.nil?
+        if inspect
+          message = ['INSPECT[?]', message].compact.join(' ')
+          flunk(message)
+        elsif actual.nil?
           assert_nil expected, message
         else
           send(assertion || :assert_equal, expected, actual, message)
         end
       rescue Minitest::Assertion => e
-        raise Minitest::Assertion, @hold.feedback(e.location, expected, actual, message)
+        feedback = @hold.feedback(e.location, expected, actual, message)
+        raise(Minitest::Assertion, feedback)
       end
 
-      @hold.warn_for(actual) if inspect
-
       expected
     end
 

metadata

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