minitest-holdify 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06f80be32b494ec786f8d873556a8046d6e051854ce38051c1f9a41ecce91fe7
-  data.tar.gz: 95efd3e040696f2eacdbcf61b378db9c51bb33889f73b54c418d8bb0417e6244
+  metadata.gz: c91100bb90de5695419fdb279520529462f67f37d2e580ce6d61c496cf43cbcb
+  data.tar.gz: 48b9d63b74bdea68de55c7a2790e8fb1fef59dc1eb956bce96b02d7ef0b141b3
 SHA512:
-  metadata.gz: 3174aad64ba870444147f629ca38dddbbafce4b57d94d72d32febc1c32afdc56c6f2415337e43fab7be44a45a7d7edae7197aabc06f5ea82504bc868ca3ab123
-  data.tar.gz: a336655be1c76832e50c00b919bbb7ecc8a735b1b49e8067a8df3506fa7a6ef2f7b1553b10356bca2fd54025a0fb22a936bdc70f390eaaa124e244f978407df9
+  metadata.gz: c17c6cfea957cbad41b2f272da130226a1c878546b46559ec80ccb1f939cb8c395c3b91a91e98ada8a1760bf3b661568364f6ca22f2e34ac957961c6011b4a40
+  data.tar.gz: 89f7c53a3ae05ef7e302efff24398e1579067d246a913c2ca91029185e08af9d8b4dae35da3a6686def351ce6fa89b0b9da1a34d388526dfa1455f5a5950e170

data/lib/holdify/hold.rb

@@ -9,26 +9,35 @@ module Holdify
       @test    = test
       @path,   = test.method(test.name).source_location
       @store   = Holdify.stores[@path] ||= Store.new(@path)
-      @session = Hash.new { |h, k| h[k] = [] }
-      @forced  = []
-      @added   = []
+      @session = Hash.new { |h, k| h[k] = [] } # { lineno => [values] }
+      @forced  = []                            # [ "file:lineno" ]
+      @added   = []                            # [ "file:lineno" ]
+      @index   = {}                            # { lineno => index }
+      @counts  = Hash.new(0)                   # { id => count }
     end
 
     def call(actual, force: false)
       location = find_location
-      id       = @store.id_at(location.lineno)
-      raise "Could not find holdify statement at line #{location.lineno}" unless id
+      lineno   = location.lineno
+      id       = @store.id_at(lineno)
+      raise "Could not find holdify statement at line #{lineno}" unless id
 
-      @session[id] << actual
-      @forced << "#{location.path}:#{location.lineno}" if force
+      unless @index.key?(lineno)
+        @index[lineno] = @counts[id]
+        @counts[id] += 1
+      end
+      index = @index[lineno]
+
+      @session[lineno] << actual
+      @forced << "#{location.path}:#{lineno}" if force
 
       return actual if force || Holdify.reconcile
 
-      stored = @store.stored(id)
-      index  = @session[id].size - 1
+      stored = @store.stored(id, index)
+      index  = @session[lineno].size - 1
       return stored[index] if stored && index < stored.size
 
-      @added << "#{location.path}:#{location.lineno}"
+      @added << "#{location.path}:#{lineno}"
       actual
     end
 
@@ -36,7 +45,11 @@ module Holdify
       return unless @test.failures.empty?
 
       @added.each { |loc| warn "[holdify] Held new value for #{loc}" } unless Holdify.quiet
-      @session.each { |id, values| @store.update(id, values) }
+      @session.each do |lineno, values|
+        id    = @store.id_at(lineno)
+        index = @index[lineno]
+        @store.update(lineno, id, values, index)
+      end
       @store.save
     end
 

data/lib/holdify/pretty.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+require 'yaml'
+require 'tempfile'
+require 'open3'
+
+module Holdify
+  # Generates a pretty diff using git
+  module Pretty
+    RESET    = "\e[0m"
+    RED_FG   = "\e[31m"
+    GREEN_FG = "\e[32m"
+
+    G_BASE = "\e[100m #{RESET} ".freeze
+    G_EXP  = "\e[41m\e[97m\e[1m-#{RESET} ".freeze
+    G_ACT  = "\e[42m\e[97m\e[1m+#{RESET} ".freeze
+
+    class << self
+      def call(expected, actual)
+        exp_file = create_tempfile(expected)
+        act_file = create_tempfile(actual)
+
+        cmd = %W[git diff --no-index --word-diff=porcelain --unified=1000 #{exp_file.path} #{act_file.path}]
+        stdout, _stderr, _status = Open3.capture3(*cmd)
+
+        return nil if stdout.empty?
+
+        format(stdout)
+      rescue Errno::ENOENT
+        nil
+      ensure
+        exp_file&.close!
+        act_file&.close!
+      end
+
+      private
+
+      def format(diff)
+        lines = diff.lines.map(&:chomp)
+        start = lines.index { |l| l.start_with?('@@') }
+        return nil unless start
+
+        output  = ["#{G_EXP}#{RED_FG}Held (Expected)#{RESET}", "#{G_ACT}#{GREEN_FG}Current (Actual)#{RESET}"]
+        exp_buf = +''
+        act_buf = +''
+
+        lines[(start + 1)..].each do |line|
+          char = line[0]
+          text = line[1..]
+
+          # :nocov:
+          case char
+          # :nocov:
+          when ' '
+            exp_buf << text
+            act_buf << text
+          when '-'
+            exp_buf << RED_FG << text << RESET
+          when '+'
+            act_buf << GREEN_FG << text << RESET
+          when '~'
+            flush_buffers(output, exp_buf, act_buf)
+            exp_buf.clear
+            act_buf.clear
+          end
+        end
+
+        flush_buffers(output, exp_buf, act_buf) unless exp_buf.empty? && act_buf.empty?
+
+        output.join("\n")
+      end
+
+      def flush_buffers(output, exp, act)
+        if exp == act
+          output << "#{G_BASE}#{exp}"
+        else
+          output << "#{G_EXP}#{exp}"
+          output << "#{G_ACT}#{act}"
+        end
+      end
+
+      def create_tempfile(obj)
+        Tempfile.new(%w[holdify .yaml]).tap do |file|
+          file.write(YAML.dump(obj, line_width: 78)) # Ensure 80 columns (including gutter)
+          file.flush
+        end
+      end
+    end
+  end
+end

data/lib/holdify/store.rb

@@ -17,38 +17,52 @@ module Holdify
         @source[lineno] = Digest::SHA1.hexdigest(content) unless content.empty?
       end
 
+      @index = Hash.new { |h, k| h[k] = [] }                              # { id => ["L123 id", "L124 id"] }
       @data  = (File.exist?(@path) && YAML.unsafe_load_file(@path)) || {} # { key => [values] }
-      @index = {} # { id => "L123 id" }
 
-      valid_ids = @source.values
-      @data.keep_if do |key, _|
-        id = key.split.last
-        next false unless valid_ids.include?(id)
-
-        @index[id] = key
-        true
-      end
+      organize_data
     end
 
-    def id_at(lineno) = @source[lineno]
-    def stored(id)    = @data[@index[id]]
+    def id_at(lineno)     = @source[lineno]
+    def stored(id, index) = @data[@index[id][index]]
 
     # Overwrite the entry for a given ID with a new list of values
-    def update(id, values)
-      new_key = "L#{@source.key(id)} #{id}"
-      old_key = @index[id]
+    def update(lineno, id, values, index)
+      new_key = "L#{lineno} #{id}"
+      old_key = @index[id][index]
       @data.delete(old_key) if old_key && old_key != new_key
-      @data[@index[id] = new_key] = values
+      @data[new_key] = values
+      @index[id][index] = new_key
     end
 
     def save
       return FileUtils.rm_f(@path) if @data.empty?
 
       sorted  = @data.sort_by { |k, _| k[/\d+/].to_i }.to_h
-      content = YAML.dump(sorted, line_width: -1)
+      content = YAML.dump(sorted, line_width: 78)
       return if File.exist?(@path) && File.read(@path) == content
 
       File.write(@path, content)
     end
+
+    private
+
+    def organize_data
+      source_counts = @source.values.tally
+      sorted_keys   = @data.keys.sort_by { |k| k[/\d+/].to_i }
+
+      sorted_keys.each do |key|
+        id = key.split.last
+        next unless source_counts[id]
+
+        if @index[id].size < source_counts[id]
+          @index[id] << key
+        else
+          @data.delete(key)
+        end
+      end
+
+      @data.keep_if { |key, _| source_counts[key.split.last] }
+    end
   end
 end

data/lib/holdify.rb

@@ -5,12 +5,20 @@ require_relative 'holdify/hold'
 
 # Add description
 module Holdify
-  VERSION = '1.0.3'
+  VERSION = '1.1.0'
   CONFIG  = { ext: '.yaml' }.freeze
 
   class << self
     attr_accessor :reconcile, :quiet
+    attr_writer :pretty
 
     def stores = @stores ||= {}
+
+    def pretty
+      return @pretty unless @pretty.nil?
+
+      @pretty = $stdout.tty? && !ENV.key?('NO_COLOR') && ENV['TERM'] != 'dumb' &&
+                system('git --version', out: File::NULL, err: File::NULL)
+    end
   end
 end

data/lib/minitest/holdify_plugin.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'holdify'
+require 'holdify/pretty'
 
 # Implement the minitest plugin
 module Minitest
@@ -13,6 +14,9 @@ module Minitest
     opts.on '--holdify-quiet', 'Skip the warning on storing a new value' do
       Holdify.quiet = true
     end
+    opts.on '--holdify-pretty', 'Format the stored values with pretty print' do
+      Holdify.pretty = true
+    end
   end
 
   # Reopen the minitest class
@@ -40,10 +44,20 @@ module Minitest
       assertion, message = message, assertion unless assertion.nil? || assertion.is_a?(Symbol)
       expected = @hold.(actual, **)
 
-      if actual.nil?
-        assert_nil expected, message
-      else
-        send(assertion || :assert_equal, expected, actual, message)
+      begin
+        if actual.nil?
+          assert_nil expected, message
+        else
+          send(assertion || :assert_equal, expected, actual, message)
+        end
+      rescue Minitest::Assertion
+        raise unless Holdify.pretty
+
+        diff = Holdify::Pretty.call(expected, actual)
+        raise unless diff
+
+        msg = message ? "#{message}\n#{diff}" : diff
+        raise Minitest::Assertion, msg
       end
 
       if inspect

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-holdify
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Domizio Demichelis
@@ -34,6 +34,7 @@ files:
 - LICENSE.txt
 - lib/holdify.rb
 - lib/holdify/hold.rb
+- lib/holdify/pretty.rb
 - lib/holdify/store.rb
 - lib/minitest-holdify.rb
 - lib/minitest/holdify_plugin.rb
@@ -59,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Hardcoded values suck! Holdify them.
 test_files: []