hotch 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c35cd590d82f32eb2e073d78b2dcf3a59f9dac26
-  data.tar.gz: 0043e7a301ab0c4ede090e614723ca40657f172e
+  metadata.gz: 91a709e2c682f3fdb58f2c6c4a6a819f0e9c6395
+  data.tar.gz: e24a3beacb055a62464c27a50c81c029679abd16
 SHA512:
-  metadata.gz: 85a612b48a755637431d2827db351df62ca9667837de967ffe1d7b71b9895b054a5bc46245d1d4432dbfa048a42a1381941c38edf92e77b955458cc8be6f31eb
-  data.tar.gz: 540d85864f5f6c3a88b6f3de0a04ade4af677d317d2799fc01a8b93de1aa423014ff4b66df68125006b4e90451dd9a585797358c55308f8e5a049a09dd8c1051
+  metadata.gz: 4d65c21413d4d0fb1bfaa8de21da4caf996f48d545904d880b05db53df8aed646c6837b05179b3e33273602066de7d5181550c9723c4b06cccf8588c5d2cfaf8
+  data.tar.gz: 9dc92d4e2d05c918a8ec19ecc07633d6e9f957109493cf28c7e692cc31b5e39c7328212cb3dd18c2a3a60ed44c0d68f68ed5262a89c6ca786bb4e95cf91bc863

data/README.md

@@ -62,7 +62,7 @@ dry/struct/class_interface.rb:77 T_OBJECT  2000         0         0       0
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'hotch', '~> 0.4.0'
+gem 'hotch', '~> 0.4.1'
 ```
 
 And then execute:
@@ -198,5 +198,5 @@ Follow these steps to release this gem:
     edit lib/hotch/version.rb
     edit README.md
     # Commit
-    git commit -m "Release vX.Y.Z"
+    git commit -am "Release vX.Y.Z"
     rake release

data/lib/hotch/memory.rb

@@ -1,14 +1,17 @@
 require 'allocation_tracer'
 
 class Hotch
-  def self.memory(name: $0)
+  def self.memory(name: $0, &block)
     caller = Kernel.caller_locations(1).first
     name = "#{name}:#{caller.path}:#{caller.lineno}"
     memory = Memory.new(name)
 
     memory.report_at_exit
-    memory.run do
-      yield
+
+    if block
+      memory.run(&block)
+    else
+      memory.start
     end
   end
 
@@ -16,11 +19,12 @@ class Hotch
     def initialize(name, ignore_paths: [])
       @name = name
       @ignore_paths = Array(ignore_paths || [])
-      @report = nil
+      @reports = []
       @started = nil
     end
 
     def start
+      return if @started
       ObjectSpace::AllocationTracer.setup [:path, :line, :type]
       ObjectSpace::AllocationTracer.start
       @started = true
@@ -30,7 +34,7 @@ class Hotch
       return unless @started
       results = ObjectSpace::AllocationTracer.stop
       @started = nil
-      @report = Report.new(results, @ignore_paths)
+      @reports << Report.new(results, @ignore_paths)
     end
 
     def run
@@ -42,7 +46,9 @@ class Hotch
 
     def report
       # TODO make it persistent (as CSV)
-      yield @report
+      report = @reports.inject(:sum)
+      yield report
+      @reports.clear
     end
 
     def report_at_exit
@@ -66,17 +72,28 @@ class Hotch
     end
 
     class Report
+      attr_reader :lines
+
       def initialize(results, ignore_paths)
         @header = Line.new(*Line.members)
-        @total = Line::Total.new
         @lines = results.map do |result|
-          if line = Line.from_result(result, ignore_paths)
-            @total.sum(line)
-            line
-          end
+          Line.from_result(result, ignore_paths)
         end.compact
       end
 
+      def sum(other)
+        by_key = Hash[@lines.map { |line| [line.key, line] }]
+        other.lines.each do |line|
+          if existing = by_key[line.key]
+            existing.sum(line)
+          else
+            by_key[line.key] = line
+            @lines << line
+          end
+        end
+        self
+      end
+
       def format
         # TODO refactor
         max_lengths = Array.new(Line.members.size, 0)
@@ -89,12 +106,28 @@ class Hotch
       end
 
       def puts(io)
+        total!
         fmt = format
         @header.puts(io, fmt)
         @lines.sort_by(&:count).each { |line| line.puts(io, fmt) }
         @total.puts(io, fmt)
       end
 
+      def to_s
+        io = StringIO.new
+        puts(io)
+        io.string
+      end
+
+      private def total!
+        return if defined? @total
+
+        @total = Line::Total.new
+        @lines.each do |line|
+          @total.sum(line)
+        end
+      end
+
       class Line < Struct.new(:filename, :type, :count, :old_count, :total_age,
                               :min_age, :max_age, :total_memsize)
         # [
@@ -108,6 +141,10 @@ class Hotch
           new(filename, *args)
         end
 
+        def key
+          [filename, type]
+        end
+
         def puts(io, fmt)
           send = method(:send)
           io.puts fmt % members.map(&send)
@@ -117,6 +154,12 @@ class Hotch
           members.map { |member| self[member].to_s.size }
         end
 
+        def sum(other)
+          other.to_a.each.with_index do |value, i|
+            self[i] += value if Numeric === value
+          end
+        end
+
         private
 
         MAX_PATH_LENGTH = 50
@@ -135,12 +178,6 @@ class Hotch
           def initialize
             super("TOTAL", "", 0, 0, 0, 0, 0, 0)
           end
-
-          def sum(other)
-            other.to_a.each.with_index do |value, i|
-              self[i] += value if Numeric === value
-            end
-          end
         end
       end
     end

data/lib/hotch/version.rb

@@ -1,3 +1,3 @@
 class Hotch
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotch
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Peter Suschlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-17 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stackprof
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Profile helper