ruby-prof 0.15.8 → 0.15.9

data/test/rack_test.rb

@@ -8,6 +8,16 @@ class FakeRackApp
   end
 end
 
+module Rack
+  class Request
+    def initialize(env)
+    end
+    def path
+      '/path/to/resource.json'
+    end
+  end
+end
+
 class RackTest < TestCase
   def test_create_print_path
     path = Dir.mktmpdir
@@ -15,6 +25,44 @@ class RackTest < TestCase
 
     Rack::RubyProf.new(FakeRackApp.new, :path => path)
 
-    assert_equal(true, Dir.exist?(path))
+    assert(Dir.exist?(path))
+  end
+
+  def test_create_profile_reports
+    path = Dir.mktmpdir
+
+    adapter = Rack::RubyProf.new(FakeRackApp.new, :path => path)
+
+    adapter.call(:fake_env)
+
+    %w(flat.txt graph.txt graph.html call_stack.html).each do |base_name|
+      file_path = ::File.join(path, "path-to-resource.json-#{base_name}")
+      assert(File.exist?(file_path))
+    end
+  end
+
+  def test_skip_paths
+    path = Dir.mktmpdir
+
+    adapter = Rack::RubyProf.new(FakeRackApp.new, :path => path, :skip_paths => [%r{\.json$}])
+
+    adapter.call(:fake_env)
+
+    %w(flat.txt graph.txt graph.html call_stack.html).each do |base_name|
+      file_path = ::File.join(path, "path-to-resource.json-#{base_name}")
+      assert(!File.exist?(file_path))
+    end
+  end
+
+  def test_allows_lazy_filename_setting
+    path = Dir.mktmpdir
+
+    printer = {::RubyProf::FlatPrinter => lambda { 'dynamic.txt' }}
+    adapter = Rack::RubyProf.new(FakeRackApp.new, :path => path, :printers => printer)
+
+    adapter.call(:fake_env)
+
+    file_path = ::File.join(path, 'path-to-resource.json-dynamic.txt')
+    assert(File.exist?(file_path))
   end
 end

data/test/recursive_test.rb

@@ -3,31 +3,33 @@
 
 require File.expand_path('../test_helper', __FILE__)
 
-# Simple recursive test
-def simple(n)
-  sleep(1)
-  n -= 1
-  return if n == 0
-  simple(n)
-end
+module SimpleRecursion
+  # Simple recursive test
+  def simple(n)
+    sleep(1)
+    n -= 1
+    return if n == 0
+    simple(n)
+  end
 
 
-# More complicated recursive test
-def render_partial(i)
-  sleep(1)
-  case i
-  when 0
-    render_partial(10)
-  when 1
-    2.times do |j|
-      render_partial(j + 10)
+  # More complicated recursive test
+  def render_partial(i)
+    sleep(1)
+    case i
+    when 0
+      render_partial(10)
+    when 1
+      2.times do |j|
+        render_partial(j + 10)
+      end
     end
   end
-end
 
-def render
-  2.times do |i|
-    render_partial(i)
+  def render
+    2.times do |i|
+      render_partial(i)
+    end
   end
 end
 
@@ -38,6 +40,8 @@ class RecursiveTest < TestCase
     RubyProf::measure_mode = RubyProf::WALL_TIME
   end
 
+  include SimpleRecursion
+
   def test_simple
     result = RubyProf.profile do
       simple(2)
@@ -64,9 +68,9 @@ class RecursiveTest < TestCase
     assert_equal('RecursiveTest#test_simple', call_info.call_sequence)
     assert_equal(1, call_info.children.length)
 
-    # Method 1: Object#simple
+    # Method 1: SimpleRecursion#simple
     method = methods[1]
-    assert_equal('Object#simple', method.full_name)
+    assert_equal('SimpleRecursion#simple', method.full_name)
     assert_equal(2, method.called)
     assert_in_delta(2, method.total_time, 0.1)
     assert_in_delta(0, method.self_time, 0.1)
@@ -77,12 +81,12 @@ class RecursiveTest < TestCase
 
     call_info = method.call_infos.first
     assert_equal(2, call_info.children.length)
-    assert_equal('RecursiveTest#test_simple->Object#simple', call_info.call_sequence)
+    assert_equal('RecursiveTest#test_simple->SimpleRecursion#simple', call_info.call_sequence)
     assert(!call_info.recursive)
 
     call_info = method.call_infos.last
     assert_equal(1, call_info.children.length)
-    assert_equal('RecursiveTest#test_simple->Object#simple->Object#simple', call_info.call_sequence)
+    assert_equal('RecursiveTest#test_simple->SimpleRecursion#simple->SimpleRecursion#simple', call_info.call_sequence)
     assert(call_info.recursive)
 
     method = methods[2]
@@ -95,12 +99,12 @@ class RecursiveTest < TestCase
 
     assert_equal(2, method.call_infos.length)
     call_info = method.call_infos[0]
-    assert_equal('RecursiveTest#test_simple->Object#simple->Kernel#sleep', call_info.call_sequence)
+    assert_equal('RecursiveTest#test_simple->SimpleRecursion#simple->Kernel#sleep', call_info.call_sequence)
     assert_equal(0, call_info.children.length)
     assert(!call_info.recursive)
 
     call_info = method.call_infos[1]
-    assert_equal('RecursiveTest#test_simple->Object#simple->Object#simple->Kernel#sleep', call_info.call_sequence)
+    assert_equal('RecursiveTest#test_simple->SimpleRecursion#simple->SimpleRecursion#simple->Kernel#sleep', call_info.call_sequence)
     assert_equal(0, call_info.children.length)
     assert(!call_info.recursive)
   end
@@ -128,7 +132,7 @@ class RecursiveTest < TestCase
     assert(!call_info.recursive)
 
     method = methods[1]
-    assert_equal('Object#render', method.full_name)
+    assert_equal('SimpleRecursion#render', method.full_name)
     assert_equal(1, method.called)
     assert_in_delta(5, method.total_time, 0.1)
     assert_in_delta(0, method.self_time, 0.01)
@@ -137,7 +141,7 @@ class RecursiveTest < TestCase
 
     assert_equal(1, method.call_infos.length)
     call_info = method.call_infos[0]
-    assert_equal('RecursiveTest#test_cycle->Object#render', call_info.call_sequence)
+    assert_equal('RecursiveTest#test_cycle->SimpleRecursion#render', call_info.call_sequence)
     assert_equal(1, call_info.children.length)
     assert(!call_info.recursive)
 
@@ -151,17 +155,17 @@ class RecursiveTest < TestCase
 
     assert_equal(2, method.call_infos.length)
     call_info = method.call_infos[0]
-    assert_equal('RecursiveTest#test_cycle->Object#render->Integer#times', call_info.call_sequence)
+    assert_equal('RecursiveTest#test_cycle->SimpleRecursion#render->Integer#times', call_info.call_sequence)
     assert_equal(1, call_info.children.length)
     assert(!call_info.recursive)
 
     call_info = method.call_infos[1]
-    assert_equal('RecursiveTest#test_cycle->Object#render->Integer#times->Object#render_partial->Integer#times', call_info.call_sequence)
+    assert_equal('RecursiveTest#test_cycle->SimpleRecursion#render->Integer#times->SimpleRecursion#render_partial->Integer#times', call_info.call_sequence)
     assert_equal(1, call_info.children.length)
     assert(call_info.recursive)
 
     method = methods[3]
-    assert_equal('Object#render_partial', method.full_name)
+    assert_equal('SimpleRecursion#render_partial', method.full_name)
     assert_equal(5, method.called)
     assert_in_delta(5, method.total_time, 0.1)
     assert_in_delta(0, method.self_time, 0.1)
@@ -170,17 +174,17 @@ class RecursiveTest < TestCase
 
     assert_equal(3, method.call_infos.length)
     call_info = method.call_infos[0]
-    assert_equal('RecursiveTest#test_cycle->Object#render->Integer#times->Object#render_partial', call_info.call_sequence)
+    assert_equal('RecursiveTest#test_cycle->SimpleRecursion#render->Integer#times->SimpleRecursion#render_partial', call_info.call_sequence)
     assert_equal(3, call_info.children.length)
     assert(!call_info.recursive)
 
     call_info = method.call_infos[1]
-    assert_equal('RecursiveTest#test_cycle->Object#render->Integer#times->Object#render_partial->Object#render_partial', call_info.call_sequence)
+    assert_equal('RecursiveTest#test_cycle->SimpleRecursion#render->Integer#times->SimpleRecursion#render_partial->SimpleRecursion#render_partial', call_info.call_sequence)
     assert_equal(1, call_info.children.length)
     assert(call_info.recursive)
 
     call_info = method.call_infos[2]
-    assert_equal('RecursiveTest#test_cycle->Object#render->Integer#times->Object#render_partial->Integer#times->Object#render_partial', call_info.call_sequence)
+    assert_equal('RecursiveTest#test_cycle->SimpleRecursion#render->Integer#times->SimpleRecursion#render_partial->Integer#times->SimpleRecursion#render_partial', call_info.call_sequence)
     assert_equal(1, call_info.children.length)
     assert(call_info.recursive)
 
@@ -194,17 +198,17 @@ class RecursiveTest < TestCase
 
     assert_equal(3, method.call_infos.length)
     call_info = method.call_infos[0]
-    assert_equal('RecursiveTest#test_cycle->Object#render->Integer#times->Object#render_partial->Kernel#sleep', call_info.call_sequence)
+    assert_equal('RecursiveTest#test_cycle->SimpleRecursion#render->Integer#times->SimpleRecursion#render_partial->Kernel#sleep', call_info.call_sequence)
     assert_equal(0, call_info.children.length)
     assert(!call_info.recursive)
 
     call_info = method.call_infos[1]
-    assert_equal('RecursiveTest#test_cycle->Object#render->Integer#times->Object#render_partial->Object#render_partial->Kernel#sleep', call_info.call_sequence)
+    assert_equal('RecursiveTest#test_cycle->SimpleRecursion#render->Integer#times->SimpleRecursion#render_partial->SimpleRecursion#render_partial->Kernel#sleep', call_info.call_sequence)
     assert_equal(0, call_info.children.length)
     assert(!call_info.recursive)
 
     call_info = method.call_infos[2]
-    assert_equal('RecursiveTest#test_cycle->Object#render->Integer#times->Object#render_partial->Integer#times->Object#render_partial->Kernel#sleep', call_info.call_sequence)
+    assert_equal('RecursiveTest#test_cycle->SimpleRecursion#render->Integer#times->SimpleRecursion#render_partial->Integer#times->SimpleRecursion#render_partial->Kernel#sleep', call_info.call_sequence)
     assert_equal(0, call_info.children.length)
     assert(!call_info.recursive)
   end

data/test/test_helper.rb

@@ -144,3 +144,96 @@ module MemoryTestHelper
     total
   end
 end
+
+module PrinterTestHelper
+  Metrics = Struct.new(:name, :total, :self_t, :wait, :child, :calls)
+  class Metrics
+    def pp
+      "%s[total: %.2f, self: %.2f, wait: %.2f, child: %.2f, calls: %s]" %
+        [name, total, self_t, wait, child, calls]
+    end
+  end
+
+  Entry = Struct.new(:total_p, :self_p, :metrics, :parents, :children)
+  class Entry
+    def child(name)
+      children.detect{|m| m.name == name}
+    end
+
+    def parent(name)
+      parents.detect{|m| m.name == name}
+    end
+
+    def pp
+      res = ""
+      res << "NODE (total%%: %.2f, self%%: %.2f) %s\n" % [total_p, self_p, metrics.pp]
+      res << "  PARENTS:\n"
+      parents.each {|m| res << "    " + m.pp << "\n"}
+      res << "  CHILDREN:\n"
+      children.each {|m| res << "    " + m.pp << "\n"}
+      res
+    end
+  end
+
+  class MetricsArray < Array
+    def metrics_for(name)
+      detect {|e| e.metrics.name == name}
+    end
+
+    def pp(io = STDOUT)
+      entries = map do |e|
+        begin
+          e.pp
+        rescue
+          puts $!.message + e.inspect
+          ""
+        end
+      end
+      io.puts entries.join("--------------------------------------------------\n")
+    end
+
+    def self.parse(str)
+      res = new
+      entry = nil
+      relatives = []
+      state = :preamble
+
+      str.each_line do |l|
+        line = l.chomp.strip
+        if line =~ /-----/
+          if state == :preamble
+            state = :parsing_parents
+            entry = Entry.new
+          elsif state == :parsing_parents
+            entry = Entry.new
+          elsif state == :parsing_children
+            entry.children = relatives
+            res << entry
+            entry = Entry.new
+            relatives = []
+            state = :parsing_parents
+          end
+        elsif line =~ /^\s*$/ || line =~ /indicates recursively called methods/
+          next
+        elsif state != :preamble
+          elements = line.split(/\s+/)
+          method = elements.pop
+          numbers = elements[0..-2].map(&:to_f)
+          metrics = Metrics.new(method, *numbers[-4..-1], elements[-1])
+          if numbers.size == 6
+            entry.metrics = metrics
+            entry.total_p = numbers[0]
+            entry.self_p = numbers[1]
+            entry.parents = relatives
+            entry.children = relatives = []
+            state = :parsing_children
+            res << entry
+          else
+            relatives << metrics
+          end
+        end
+      end
+      res
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-prof
 version: !ruby/object:Gem::Version
-  version: 0.15.8
+  version: 0.15.9
 platform: ruby
 authors:
 - Shugo Maeda, Charlie Savage, Roger Pack, Stefan Kaes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.5.0
+        version: 5.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.5.0
+        version: 5.8.3
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -73,16 +73,67 @@ files:
 - Rakefile
 - bin/ruby-prof
 - bin/ruby-prof-check-trace
+- doc/LICENSE.html
+- doc/README_rdoc.html
+- doc/Rack.html
+- doc/Rack/RubyProf.html
+- doc/RubyProf.html
+- doc/RubyProf/AbstractPrinter.html
+- doc/RubyProf/AggregateCallInfo.html
+- doc/RubyProf/CallInfo.html
+- doc/RubyProf/CallInfoPrinter.html
+- doc/RubyProf/CallInfoVisitor.html
+- doc/RubyProf/CallStackPrinter.html
+- doc/RubyProf/CallTreePrinter.html
+- doc/RubyProf/Cmd.html
+- doc/RubyProf/DotPrinter.html
+- doc/RubyProf/FlatPrinter.html
+- doc/RubyProf/FlatPrinterWithLineNumbers.html
+- doc/RubyProf/GraphHtmlPrinter.html
+- doc/RubyProf/GraphPrinter.html
+- doc/RubyProf/MethodInfo.html
+- doc/RubyProf/MultiPrinter.html
+- doc/RubyProf/Profile.html
+- doc/RubyProf/ProfileTask.html
+- doc/RubyProf/Thread.html
 - doc/created.rid
 - doc/css/fonts.css
 - doc/css/rdoc.css
+- doc/examples/flat_txt.html
+- doc/examples/graph_html.html
+- doc/examples/graph_txt.html
 - doc/fonts/Lato-Light.ttf
 - doc/fonts/Lato-LightItalic.ttf
 - doc/fonts/Lato-Regular.ttf
 - doc/fonts/Lato-RegularItalic.ttf
 - doc/fonts/SourceCodePro-Bold.ttf
 - doc/fonts/SourceCodePro-Regular.ttf
+- doc/images/add.png
+- doc/images/arrow_up.png
+- doc/images/brick.png
+- doc/images/brick_link.png
+- doc/images/bug.png
+- doc/images/bullet_black.png
+- doc/images/bullet_toggle_minus.png
+- doc/images/bullet_toggle_plus.png
+- doc/images/date.png
+- doc/images/delete.png
+- doc/images/find.png
 - doc/images/loadingAnimation.gif
+- doc/images/macFFBgHack.png
+- doc/images/package.png
+- doc/images/page_green.png
+- doc/images/page_white_text.png
+- doc/images/page_white_width.png
+- doc/images/plugin.png
+- doc/images/ruby.png
+- doc/images/tag_blue.png
+- doc/images/tag_green.png
+- doc/images/transparent.png
+- doc/images/wrench.png
+- doc/images/wrench_orange.png
+- doc/images/zoom.png
+- doc/index.html
 - doc/js/darkfish.js
 - doc/js/jquery.js
 - doc/js/navigation.js
@@ -92,6 +143,7 @@ files:
 - doc/js/search_index.js.gz
 - doc/js/searcher.js
 - doc/js/searcher.js.gz
+- doc/table_of_contents.html
 - examples/flat.txt
 - examples/graph.dot
 - examples/graph.html
@@ -162,6 +214,7 @@ files:
 - test/exceptions_test.rb
 - test/exclude_threads_test.rb
 - test/fiber_test.rb
+- test/issue137_test.rb
 - test/line_number_test.rb
 - test/measure_allocations_test.rb
 - test/measure_cpu_time_test.rb
@@ -177,6 +230,7 @@ files:
 - test/pause_resume_test.rb
 - test/prime.rb
 - test/printers_test.rb
+- test/printing_recursive_graph_test.rb
 - test/rack_test.rb
 - test/recursive_test.rb
 - test/singleton_test.rb
@@ -207,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Fast Ruby profiler