factory_trace 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd70e8ea6fe8ffb3e815147ea925478d36f4d298b9bbbd5b359b7d5e900d5265
-  data.tar.gz: e838d1f5525179c4fba7fa6daba3baf7ab8b23d27e981076069c3a4d33268472
+  metadata.gz: 9150973821d1c8196bf9dc7ba0ccbaa9c5e81cc397fed0613f2b0e0086104ec7
+  data.tar.gz: cbbf862a0a4aa1d3a436329dd4e2d2f94c2c700a1f5e0a07da5b08395f4fa89e
 SHA512:
-  metadata.gz: 0a0b4c5d0b471d570a4ab18567feed01559f861363779e4ba5010e8eb1b1a75a159d3affe54b0742da8c1909095df14cee0ec45eb7fbefcf3e594b8a58140037
-  data.tar.gz: 54b1804ed50d4ba0f327e9f18d100ad9c95c39c7ce6a373ed846aa5bbf8c6a9e7f5b42560db21b7922927aa135574a8f6d1acef6b39179b56bc911ba00dba151
+  metadata.gz: c12b5e6ee4de364e37c99a01c363931c35f6d5f32af1a9525e9ed990c11209c38473f1a9809eb2bc980237cb069cbffb017f3c44c50bb33f5b41b90645f46037
+  data.tar.gz: 245cc1ad516ff4a706f6f32fa6c96f2bf8d55b4ec032e9ebe10ca835f02bd06b501f94a5b5b9c742c2962d56c6c3e3eddfe55fa42e3e6d95376b545e2693ed6f

data/exe/factory_trace

@@ -7,9 +7,16 @@ require "factory_trace"
 fail "You should pass at least one file with traced information.\nYou can generate it using only_trace mode." if ARGV.empty?
 
 config = FactoryTrace.configuration
-hash = FactoryTrace::Readers::TraceReader.read_from_files(*ARGV)
-reports = FactoryTrace::Processors::FindUnused.call(hash[:defined], hash[:used])
-code = (reports.any? { |report| report[:code] == :unused && !report.key?(:value) }) ? 1 : 0
+writer = FactoryTrace::Writers::ReportWriter.new(config.out, config)
+code = 0
+
+%i[factory_bot fixtures].each do |kind|
+  result = FactoryTrace::Readers::TraceReader.read_from_files(kind, *ARGV)
+  reports = FactoryTrace::Processors::FindUnused.call(result[:defined], result[:used])
+  if reports.any? { |report| report[:code] == :unused && !report.key?(:value) }
+    code = 1
+  end
+  writer.write(reports, kind: kind)
+end
 
-FactoryTrace::Writers::ReportWriter.new(config.out, config).write(reports)
 exit(code)

data/lib/factory_trace/readers/trace_reader.rb

@@ -3,20 +3,20 @@
 module FactoryTrace
   module Readers
     class TraceReader
-      attr_reader :io, :configuration
+      attr_reader :io, :configuration, :kind
 
       # Read the data from files and merge it
       #
       # @return [Hash<Symbol, FactoryTrace::Structures::Collection>]
-      def self.read_from_files(*file_names, configuration: Configuration.new)
+      def self.read_from_files(kind, *file_names, configuration: Configuration.new)
         result = {defined: FactoryTrace::Structures::Collection.new, used: FactoryTrace::Structures::Collection.new}
 
         file_names.each do |file_name|
           File.open(file_name, "r") do |file|
-            data = new(file, configuration: configuration).read
+            data = new(kind, file, configuration: configuration).read
 
             [:defined, :used].each do |key|
-              result[key].merge!(data[key])
+              result[key].merge!(data[key]) unless data.empty?
             end
           end
         end
@@ -24,7 +24,8 @@ module FactoryTrace
         result
       end
 
-      def initialize(io, configuration: Configuration.new)
+      def initialize(kind, io, configuration: Configuration.new)
+        @kind = kind
         @io = io
         @configuration = configuration
       end
@@ -35,9 +36,14 @@ module FactoryTrace
       def read
         hash = JSON.parse(io.read)
 
+        defined = hash["defined"][kind.to_s]
+        used = hash["used"][kind.to_s]
+
+        return {} if defined.nil? || used.nil?
+
         {
-          defined: parse_collection(hash["defined"]),
-          used: parse_collection(hash["used"])
+          defined: parse_collection(defined),
+          used: parse_collection(used)
         }
       end
 

data/lib/factory_trace/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FactoryTrace
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 end

data/lib/factory_trace/writers/report_writer.rb

@@ -18,7 +18,7 @@ module FactoryTrace
       # @param [Array<Hash>] results
       # @param [Symbol] kind - :factory (default) or :fixture
       def write(results, kind:)
-        io.puts("")
+        io.puts("") unless file?
 
         total_color = (results.any? { |result| result[:code] == :unused && !result.key?(:value) }) ? :red : :green
 

data/lib/factory_trace/writers/trace_writer.rb

@@ -3,16 +3,9 @@
 module FactoryTrace
   module Writers
     class TraceWriter < Writer
-      # @param [FactoryTrace::Structures::Collection] defined
-      # @param [FactoryTrace::Structures::Collection] used
-      def write(defined, used, kind:)
-        io.puts("")
-        text =
-          case kind
-          when :factory_bot then "FactoryBot"
-          when :fixtures then "Fixtures"
-          end
-        io.puts("#{text} definitions and usages:")
+      # @param [Hash] defined
+      # @param [Hash] used
+      def write(defined, used)
         io.puts(JSON.pretty_generate(defined: defined.to_h, used: used.to_h))
       end
     end

data/lib/factory_trace/writers/writer.rb

@@ -9,6 +9,10 @@ module FactoryTrace
         @io = io
         @configuration = configuration
       end
+
+      def file?
+        io.is_a?(File)
+      end
     end
   end
 end

data/lib/factory_trace.rb

@@ -61,8 +61,14 @@ module FactoryTrace
         writer.write(Processors::FindUnused.call(defined_fixtures, used_fixtures), kind: :fixtures) if fixtures?
       elsif configuration.mode?(:trace_only)
         writer = Writers::TraceWriter.new(configuration.out, configuration)
-        writer.write(defined, used, kind: :factory_bot) if factory_bot?
-        writer.write(defined_fixtures, used_fixtures, kind: :fixtures) if fixtures?
+        writer.write(mix(defined_fixtures, defined), mix(used_fixtures, used))
+      end
+    end
+
+    def mix(fixtures, factory_bot)
+      {}.tap do |result|
+        result[:fixtures] = fixtures.to_h if fixtures?
+        result[:factory_bot] = factory_bot.to_h if factory_bot?
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factory_trace
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - djezzzl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2026-03-18 00:00:00.000000000 Z
+date: 2026-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_bot