minitest-holdify 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 633215ac6e960bb4fe8e63dbf22d1247b9b684da3a2300611882b5a1251ca0ad
-  data.tar.gz: a80e8995767b2b3438dc809f494a473e4376da664924ba6ee117aa26ccc2d274
+  metadata.gz: 7560a67982ab6acf747a90307f0fc5fca6ff30c4675aefaf92c973afaa01fe65
+  data.tar.gz: 928f88bd3d8711d13817c924a5c587117e9e61d1cb3a7301b2a097f7cfafb95a
 SHA512:
-  metadata.gz: '0129f206eddc8ba5683d64e6ac5c4273dd83818a43ef636a5493706816143b6b35c567bcb407aed623c3c761f0a1d954ac23b2c691c6e81b6f1affcdad0d4ac5'
-  data.tar.gz: e1980a9bfd4f392c40c13194bb35c6d375f26bcef76a93ac4d1173305da5d3c557e8ecf69e659194ce1515b89b8ae2f423f204db883ff0c092c13db467c9e395
+  metadata.gz: b2cb240ed6c9d90797003b00508b4640d694617b78661fd8ff59a7533eb771a58e12d1f24024cf09d71224c490446c92f325b3bc4b0217ee2c2774d3f78ab4f9
+  data.tar.gz: aa038a10daa87f5d4700d7778dd86e75049d06036f2435b769c455b2f4f37e08fac5a21a91d7a375f06a53dda9a5c2ac50858f4e26cdde27e4d2a6732976fa7c

data/lib/holdify/hold.rb

@@ -8,37 +8,37 @@ module Holdify
     def initialize(test)
       @test    = test
       @path,   = test.method(test.name).source_location
-      @store   = Holdify.stores[@path] ||= Store.new(@path)
+      @store   = Holdify.stores(@path)
       @session = Hash.new { |h, k| h[k] = [] } # { line => [values] }
-      @forced  = []                            # [ "file:line" ]
-      @added   = []                            # [ "file:line" ]
+      @forced  = []                            # [ line ]
+      @added   = []                            # [ line ]
     end
 
     def call(actual, force: false)
       location = find_location
       line     = location.lineno
-      raise "Could not find holdify statement at line #{line}" unless @store.xxh_at(line)
+      raise "Could not find holdify statement at line #{line}" unless @store.xxh(line)
 
-      @session[line] << actual
-      @forced << "#{@path}:#{line}" if force
+      @forced << line if force
 
-      return actual if force || Holdify.reconcile
-
-      # Expected value
       values = @store.get(line)
-      index  = @session[line].size - 1
-      return values[index] if values && index < values.size
-
-      @added << "#{@path}:#{line}"
-      actual
+      index  = @session[line].size
+      value  = if force || Holdify.reconcile
+                 actual
+               elsif values && index < values.size
+                 values[index]
+               else
+                 @added << line
+                 actual
+               end
+
+      @session[line] << value
+      value
     end
 
     def save
-      return unless @test.failures.empty?
-
-      @added.each   { |loc| warn "[holdify] Held new value for #{loc}" } unless Holdify.quiet
+      @added.each   { |line| warn "[holdify] Held new value for #{@path}:#{line}" } unless Holdify.quiet
       @session.each { |line, values| @store.set(line, values) }
-      @store.save
     end
 
     # Find the location in the test that triggered the hold

data/lib/holdify/ledger.rb

@@ -9,28 +9,26 @@ module Holdify
     def initialize(path, source)
       @path   = "#{path}#{CONFIG[:ext]}"
       @source = source
-      File.delete(@path) if Holdify.reconcile && File.exist?(@path)
-      @data = load_and_align
+      FileUtils.rm_f(@path) if Holdify.reconcile
+      @data = File.exist?(@path) ? load_and_align : {}
     end
 
     def get(line) = @data[line]
 
     def set(line, values) = (@data[line] = values)
 
-    def save
+    def persist
       return FileUtils.rm_f(@path) if @data.empty?
 
       output = {}
       @data.keys.sort.each do |line|
-        sha = @source.xxh_at(line)
-        next unless sha
+        xxh = @source.xxh(line)
+        next unless xxh
 
-        output["L#{line} #{sha}"] = @data[line]
+        output["L#{line} #{xxh}"] = @data[line]
       end
 
       content = YAML.dump(output, line_width: 78) # Ensure 80 columns (including pretty gutter)
-      return if File.exist?(@path) && File.read(@path) == content
-
       File.write(@path, content)
     end
 
@@ -38,19 +36,19 @@ module Holdify
 
     def load_and_align
       {}.tap do |aligned|
-        raw_data = (File.exist?(@path) && YAML.unsafe_load_file(@path)) || {}
-        raw_data.group_by { |k, _| k.split.last }.each do |sha, entries|
-          target_lines = @source.lines_with(sha)
-          next if target_lines.empty?
-
-          # Old data
-          candidates   = entries.map { |key, values| { line: key[/\d+/].to_i, values: values } }
-          exact, moved = candidates.partition { |c| target_lines.include?(c[:line]) }
+        data = YAML.unsafe_load_file(@path) || {}
+        data.group_by { |k, _| k.split.last }.each do |xxh, entries|
+          lines = @source.lines(xxh)
+          next if lines.empty?
+
+          # Position of the held lines compared to the source lines
+          stayed, moved = entries.map { |key, values| { line: key[/\d+/].to_i, values: values } }
+                                 .partition { |c| lines.include?(c[:line]) }
           moved.sort_by! { |c| c[:line] }
 
-          # New aligned data
-          target_lines.each do |line|
-            match = exact.find { |c| c[:line] == line } || moved.shift
+          # Align lines
+          lines.each do |line|
+            match         = stayed.find { |c| c[:line] == line } || moved.shift
             aligned[line] = match[:values] if match
           end
         end

data/lib/holdify/source.rb

@@ -1,32 +1,32 @@
 # frozen_string_literal: true
 
-require 'xxhash'
+require 'digest/xxhash'
 
 module Holdify
   # Represents the current state of the source file
   class Source
-    def initialize(path) = (@line_sha, @sha_lines = parse(path))
+    def initialize(path) = (@line_xxh, @xxh_lines = parse(path))
 
-    def xxh_at(line) = @line_sha[line]
+    def xxh(line) = @line_xxh[line]
 
-    def lines_with(sha) = @sha_lines[sha]
+    def lines(xxh) = @xxh_lines[xxh]
 
     private
 
     def parse(path)
-      line_sha  = {}
-      sha_lines = Hash.new { |h, k| h[k] = [] }
+      line_xxh  = {}
+      xxh_lines = Hash.new { |h, k| h[k] = [] }
 
       File.foreach(path).with_index(1) do |text, line|
         content = text.strip
         next if content.empty?
 
-        sha = XXhash.xxh32(content).to_s
-        line_sha[line] = sha
-        sha_lines[sha] << line
+        xxh            = Digest::XXH3_64bits.hexdigest(content)
+        line_xxh[line] = xxh
+        xxh_lines[xxh] << line
       end
 
-      [line_sha, sha_lines]
+      [line_xxh, xxh_lines]
     end
   end
 end

data/lib/holdify/store.rb

@@ -14,7 +14,7 @@ module Holdify
       @ledger = Ledger.new(path, @source)
     end
 
-    def_delegator  :@source, :xxh_at
-    def_delegators :@ledger, :get, :set, :save
+    def_delegator  :@source, :xxh
+    def_delegators :@ledger, :get, :set, :persist
   end
 end

data/lib/holdify.rb

@@ -5,14 +5,24 @@ require_relative 'holdify/hold'
 
 # The container module
 module Holdify
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
   CONFIG  = { ext: '.yaml' }.freeze
 
   class << self
     attr_accessor :reconcile, :quiet
     attr_writer :pretty
 
-    def stores = @stores ||= {}
+    def stores(path = nil)
+      return @stores unless path
+
+      @mutex.synchronize do
+        @stores[path] ||= Store.new(path)
+      end
+    end
+
+    def persist_all!
+      @stores&.each_value(&:persist)
+    end
 
     def pretty
       return @pretty unless @pretty.nil?
@@ -21,4 +31,6 @@ module Holdify
                 system('git --version', out: File::NULL, err: File::NULL)
     end
   end
+  @mutex  = Mutex.new
+  @stores = {}
 end

data/lib/minitest/holdify_plugin.rb

@@ -5,6 +5,11 @@ require 'holdify/pretty'
 
 # Implement the minitest plugin
 module Minitest
+  # Register the after_run hook to persist all data
+  def self.plugin_holdify_init(_options)
+    Minitest.after_run { Holdify.persist_all! }
+  end
+
   # Set the Holdify options
   def self.plugin_holdify_options(opts, _options)
     opts.on '--holdify-reconcile', 'Reconcile the held values with the new ones' do
@@ -26,12 +31,15 @@ module Minitest
     # Ensure store is tidied and saved after the test runs
     def before_teardown
       super
-      @hold&.save
-      return unless @hold&.forced&.any? && failures.empty?
+      return unless failures.empty? && @hold
+
+      @hold.save
+      return unless @hold.forced.any?
 
+      path, = method(name).source_location
       msg = <<~MSG.chomp
         [holdify] the value has been stored: remove the "!" suffix to pass the test
-        #{@hold.forced.uniq.map { |l| "  #{l}" }.join("\n")}
+        #{@hold.forced.uniq.map { |l| "  #{path}:#{l}" }.join("\n")}
       MSG
       raise Minitest::Assertion, msg
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-holdify
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Domizio Demichelis
@@ -10,33 +10,33 @@ cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: digest-xxhash
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 0.2.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 0.2.9
 - !ruby/object:Gem::Dependency
-  name: xxhash
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 5.0.0
 description: Stop maintaining large expected values in your test/fixture files! Hold
   them automatically. Update them effortlessly.
 email: