ruby-prof 1.7.2 → 2.0.0

data/test/printing_recursive_graph_test.rb

@@ -1,81 +1,81 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-require File.expand_path('../test_helper', __FILE__)
-require 'fileutils'
-require 'stringio'
-
-# --- code to be tested ---
-module PRGT
-  extend self
-
-  def f(n)
-    n.times { sleep 0.1 }
-  end
-
-  def g(n)
-    n.times { sleep 0.2 }
-  end
-
-  def run
-    2.times { f(2); g(4) }
-  end
-end
-
-# --- expected test output ---
-=begin
-Measure Mode: wall_time
-Thread ID: 1307675084040
-Fiber ID: 1307708787440
-Total Time: 2.0939999999973224
-Sort by:
-
-  %total   %self      total       self       wait      child            calls     name
---------------------------------------------------------------------------------
-                      1.657      0.000      0.000      1.657              2/2     Integer#times
-  79.13%   0.00%      1.657      0.000      0.000      1.657                2     PRGT#g
-                      1.657      0.000      0.000      1.657              2/5     Integer#times
---------------------------------------------------------------------------------
-                      2.094      2.094      0.000      0.000            12/12     Integer#times
- 100.00% 100.00%      2.094      2.094      0.000      0.000               12     Kernel#sleep
---------------------------------------------------------------------------------
-                      0.437      0.000      0.000      0.437              2/2     Integer#times
-  20.87%   0.00%      0.437      0.000      0.000      0.437                2     PRGT#f
-                      0.437      0.000      0.000      0.437              2/5     Integer#times
---------------------------------------------------------------------------------
-                      0.437      0.000      0.000      0.437              2/5     PRGT#f
-                      1.657      0.000      0.000      1.657              2/5     PRGT#g
-                      2.094      0.000      0.000      2.094              1/5     PRGT#run
- 100.00%   0.00%      2.094      0.000      0.000      2.094                5    *Integer#times
-                      2.094      2.094      0.000      0.000            12/12     Kernel#sleep
-                      1.657      0.000      0.000      1.657              2/2     PRGT#g
-                      0.437      0.000      0.000      0.437              2/2     PRGT#f
---------------------------------------------------------------------------------
-                      2.094      0.000      0.000      2.094              1/1     PrintingRecursiveGraphTest#setup
- 100.00%   0.00%      2.094      0.000      0.000      2.094                1     PRGT#run
-                      2.094      0.000      0.000      2.094              1/5     Integer#times
---------------------------------------------------------------------------------
- 100.00%   0.00%      2.094      0.000      0.000      2.094                1     PrintingRecursiveGraphTest#setup
-                      2.094      0.000      0.000      2.094              1/1     PRGT#run
-
-* indicates recursively called methods
-=end
-
-class PrintingRecursiveGraphTest < TestCase
-  def setup
-    super
-    # WALL_TIME so we can use sleep in our test and get same measurements on linux and windows
-    @result = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) do
-      PRGT.run
-    end
-  end
-
-  def test_printing_rescursive_graph
-    printer = RubyProf::GraphPrinter.new(@result)
-    buffer = ''
-    printer.print(StringIO.new(buffer))
-    puts buffer if ENV['SHOW_RUBY_PROF_PRINTER_OUTPUT'] == "1"
-
-    refute_nil(buffer)
-  end
-end
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require File.expand_path('../test_helper', __FILE__)
+require 'fileutils'
+require 'stringio'
+
+# --- code to be tested ---
+module PRGT
+  extend self
+
+  def f(n)
+    n.times { sleep 0.1 }
+  end
+
+  def g(n)
+    n.times { sleep 0.2 }
+  end
+
+  def run
+    2.times { f(2); g(4) }
+  end
+end
+
+# --- expected test output ---
+=begin
+Measure Mode: wall_time
+Thread ID: 1307675084040
+Fiber ID: 1307708787440
+Total Time: 2.0939999999973224
+Sort by:
+
+  %total   %self      total       self       wait      child            calls     name
+--------------------------------------------------------------------------------
+                      1.657      0.000      0.000      1.657              2/2     Integer#times
+  79.13%   0.00%      1.657      0.000      0.000      1.657                2     PRGT#g
+                      1.657      0.000      0.000      1.657              2/5     Integer#times
+--------------------------------------------------------------------------------
+                      2.094      2.094      0.000      0.000            12/12     Integer#times
+ 100.00% 100.00%      2.094      2.094      0.000      0.000               12     Kernel#sleep
+--------------------------------------------------------------------------------
+                      0.437      0.000      0.000      0.437              2/2     Integer#times
+  20.87%   0.00%      0.437      0.000      0.000      0.437                2     PRGT#f
+                      0.437      0.000      0.000      0.437              2/5     Integer#times
+--------------------------------------------------------------------------------
+                      0.437      0.000      0.000      0.437              2/5     PRGT#f
+                      1.657      0.000      0.000      1.657              2/5     PRGT#g
+                      2.094      0.000      0.000      2.094              1/5     PRGT#run
+ 100.00%   0.00%      2.094      0.000      0.000      2.094                5    *Integer#times
+                      2.094      2.094      0.000      0.000            12/12     Kernel#sleep
+                      1.657      0.000      0.000      1.657              2/2     PRGT#g
+                      0.437      0.000      0.000      0.437              2/2     PRGT#f
+--------------------------------------------------------------------------------
+                      2.094      0.000      0.000      2.094              1/1     PrintingRecursiveGraphTest#setup
+ 100.00%   0.00%      2.094      0.000      0.000      2.094                1     PRGT#run
+                      2.094      0.000      0.000      2.094              1/5     Integer#times
+--------------------------------------------------------------------------------
+ 100.00%   0.00%      2.094      0.000      0.000      2.094                1     PrintingRecursiveGraphTest#setup
+                      2.094      0.000      0.000      2.094              1/1     PRGT#run
+
+* indicates recursively called methods
+=end
+
+class PrintingRecursiveGraphTest < TestCase
+  def setup
+    super
+    # WALL_TIME so we can use sleep in our test and get same measurements on linux and windows
+    @result = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) do
+      PRGT.run
+    end
+  end
+
+  def test_printing_rescursive_graph
+    printer = RubyProf::GraphPrinter.new(@result)
+    buffer = StringIO.new
+    printer.print(buffer)
+    puts buffer.string if ENV['SHOW_RUBY_PROF_PRINTER_OUTPUT'] == "1"
+
+    refute_nil(buffer.string)
+  end
+end

data/test/profile_test.rb

@@ -1,101 +1,101 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-require File.expand_path('../test_helper', __FILE__)
-require_relative './call_tree_builder'
-
-class ProfileTest < TestCase
-  def test_measure_mode
-    profile = RubyProf::Profile.new(:measure_mode => RubyProf::PROCESS_TIME)
-    assert_equal(RubyProf::PROCESS_TIME, profile.measure_mode)
-  end
-
-  def test_measure_mode_string
-    profile = RubyProf::Profile.new(:measure_mode => RubyProf::PROCESS_TIME)
-    assert_equal("process_time", profile.measure_mode_string)
-  end
-
-  def test_add_thread
-    profile = RubyProf::Profile.new
-    assert_empty(profile.threads)
-
-    method_info = RubyProf::MethodInfo.new(Array, :size)
-    call_tree = RubyProf::CallTree.new(method_info)
-    thread = RubyProf::Thread.new(call_tree, Thread.current, Fiber.current)
-
-    profile.add_thread(thread)
-    assert_equal(1, profile.threads.size)
-    assert(thread.equal?(profile.threads.first))
-  end
-
-  def test_add_threads
-    call_tree_1 = create_call_tree_1
-    ruby_thread_1 = Thread.new { }
-    thread_1 = RubyProf::Thread.new(call_tree_1, ruby_thread_1, Fiber.current)
-
-    call_tree_2 = create_call_tree_2
-    ruby_thread_2 = Thread.new { }
-    thread_2 = RubyProf::Thread.new(call_tree_2, ruby_thread_2, Fiber.current)
-
-    profile = RubyProf::Profile.new
-    profile.add_thread(thread_1)
-    profile.add_thread(thread_2)
-    assert_equal(1, profile.threads.count)
-  end
-
-  def test_add_fibers
-    call_tree_1 = create_call_tree_1
-    fiber_1 = Fiber.new { }
-    thread_1 = RubyProf::Thread.new(call_tree_1, Thread.current, fiber_1)
-
-    call_tree_2 = create_call_tree_2
-    fiber_2 = Fiber.new { }
-    thread_2 = RubyProf::Thread.new(call_tree_2, Thread.current, fiber_2)
-
-    profile = RubyProf::Profile.new
-    profile.add_thread(thread_1)
-    profile.add_thread(thread_2)
-    assert_equal(2, profile.threads.count)
-  end
-
-  def test_remove_thread
-    profile = RubyProf::Profile.new
-    assert_empty(profile.threads)
-
-    method_info = RubyProf::MethodInfo.new(Array, :size)
-    call_tree = RubyProf::CallTree.new(method_info)
-    thread = RubyProf::Thread.new(call_tree, Thread.current, Fiber.current)
-
-    profile.add_thread(thread)
-    assert_equal(1, profile.threads.size)
-    assert(thread.equal?(profile.threads.first))
-
-    removed = profile.remove_thread(thread)
-    assert_equal(0, profile.threads.size)
-    assert(removed.equal?(thread))
-  end
-
-  def test_merge
-    call_tree_1 = create_call_tree_1
-    fiber_1 = Thread.new { }
-    thread_1 = RubyProf::Thread.new(call_tree_1, Thread.current, fiber_1)
-
-    call_tree_2 = create_call_tree_2
-    fiber_2 = Thread.new { }
-    thread_2 = RubyProf::Thread.new(call_tree_2, Thread.current, fiber_2)
-
-    profile = RubyProf::Profile.new
-    profile.add_thread(thread_1)
-    profile.add_thread(thread_2)
-
-    profile.merge!
-    assert_equal(1, profile.threads.count)
-
-    assert_equal(thread_1, profile.threads.first)
-
-    assert_in_delta(11.6, thread_1.call_tree.total_time, 0.00001)
-    assert_in_delta(0, thread_1.call_tree.self_time, 0.00001)
-    assert_in_delta(0.0, thread_1.call_tree.wait_time, 0.00001)
-    assert_in_delta(11.6, thread_1.call_tree.children_time, 0.00001)
-  end
-end
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require File.expand_path('../test_helper', __FILE__)
+require_relative './call_tree_builder'
+
+class ProfileTest < TestCase
+  def test_measure_mode
+    profile = RubyProf::Profile.new(measure_mode: RubyProf::PROCESS_TIME)
+    assert_equal(RubyProf::PROCESS_TIME, profile.measure_mode)
+  end
+
+  def test_measure_mode_string
+    profile = RubyProf::Profile.new(measure_mode: RubyProf::PROCESS_TIME)
+    assert_equal("process_time", profile.measure_mode_string)
+  end
+
+  def test_add_thread
+    profile = RubyProf::Profile.new
+    assert_empty(profile.threads)
+
+    method_info = RubyProf::MethodInfo.new(Array, :size)
+    call_tree = RubyProf::CallTree.new(method_info)
+    thread = RubyProf::Thread.new(call_tree, Thread.current, Fiber.current)
+
+    profile.add_thread(thread)
+    assert_equal(1, profile.threads.size)
+    assert(thread.equal?(profile.threads.first))
+  end
+
+  def test_add_threads
+    call_tree_1 = create_call_tree_1
+    ruby_thread_1 = Thread.new { }
+    thread_1 = RubyProf::Thread.new(call_tree_1, ruby_thread_1, Fiber.current)
+
+    call_tree_2 = create_call_tree_2
+    ruby_thread_2 = Thread.new { }
+    thread_2 = RubyProf::Thread.new(call_tree_2, ruby_thread_2, Fiber.current)
+
+    profile = RubyProf::Profile.new
+    profile.add_thread(thread_1)
+    profile.add_thread(thread_2)
+    assert_equal(1, profile.threads.count)
+  end
+
+  def test_add_fibers
+    call_tree_1 = create_call_tree_1
+    fiber_1 = Fiber.new { }
+    thread_1 = RubyProf::Thread.new(call_tree_1, Thread.current, fiber_1)
+
+    call_tree_2 = create_call_tree_2
+    fiber_2 = Fiber.new { }
+    thread_2 = RubyProf::Thread.new(call_tree_2, Thread.current, fiber_2)
+
+    profile = RubyProf::Profile.new
+    profile.add_thread(thread_1)
+    profile.add_thread(thread_2)
+    assert_equal(2, profile.threads.count)
+  end
+
+  def test_remove_thread
+    profile = RubyProf::Profile.new
+    assert_empty(profile.threads)
+
+    method_info = RubyProf::MethodInfo.new(Array, :size)
+    call_tree = RubyProf::CallTree.new(method_info)
+    thread = RubyProf::Thread.new(call_tree, Thread.current, Fiber.current)
+
+    profile.add_thread(thread)
+    assert_equal(1, profile.threads.size)
+    assert(thread.equal?(profile.threads.first))
+
+    removed = profile.remove_thread(thread)
+    assert_equal(0, profile.threads.size)
+    assert(removed.equal?(thread))
+  end
+
+  def test_merge
+    call_tree_1 = create_call_tree_1
+    fiber_1 = Thread.new { }
+    thread_1 = RubyProf::Thread.new(call_tree_1, Thread.current, fiber_1)
+
+    call_tree_2 = create_call_tree_2
+    fiber_2 = Thread.new { }
+    thread_2 = RubyProf::Thread.new(call_tree_2, Thread.current, fiber_2)
+
+    profile = RubyProf::Profile.new
+    profile.add_thread(thread_1)
+    profile.add_thread(thread_2)
+
+    profile.merge!
+    assert_equal(1, profile.threads.count)
+
+    assert_equal(thread_1, profile.threads.first)
+
+    assert_in_delta(11.6, thread_1.call_tree.total_time, 0.00001)
+    assert_in_delta(0, thread_1.call_tree.self_time, 0.00001)
+    assert_in_delta(0.0, thread_1.call_tree.wait_time, 0.00001)
+    assert_in_delta(11.6, thread_1.call_tree.children_time, 0.00001)
+  end
+end

data/test/rack_test.rb

@@ -1,93 +1,103 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-require File.expand_path('../test_helper', __FILE__)
-
-class FakeRackApp
-  def call(env)
-  end
-end
-
-module Rack
-  class Request
-    def initialize(env)
-      if env == :fake_env
-        @env = {}
-      else
-        @env = env
-      end
-    end
-
-    def path
-      @env[:path] || '/path/to/resource.json'
-    end
-  end
-end
-
-class RackTest < TestCase
-  def test_create_print_path
-    path = Dir.mktmpdir
-    Dir.delete(path)
-
-    Rack::RubyProf.new(FakeRackApp.new, :path => 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_only_paths
-    path = Dir.mktmpdir
-
-    adapter = Rack::RubyProf.new(FakeRackApp.new, :path => path, :only_paths => [%r{\.json$}])
-
-    adapter.call({path: '/path/to/resource.json'})
-
-    %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
-
-    adapter.call({path: '/path/to/resource.html'})
-    %w(flat.txt graph.txt graph.html call_stack.html).each do |base_name|
-      file_path = ::File.join(path, "path-to-resource.html-#{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
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require File.expand_path('../test_helper', __FILE__)
+
+class FakeRackApp
+  def call(env)
+  end
+end
+
+module Rack
+  class Request
+    def initialize(env)
+      if env == :fake_env
+        @env = {}
+      else
+        @env = env
+      end
+    end
+
+    def path
+      @env[:path] || '/path/to/resource.json'
+    end
+  end
+end
+
+class RackTest < TestCase
+  def test_pathname_path
+    path = Pathname.new(Dir.mktmpdir)
+    adapter = Rack::RubyProf.new(FakeRackApp.new, path: path)
+
+    adapter.call(:fake_env)
+
+    file_path = ::File.join(path.to_s, 'path-to-resource.json-flat.txt')
+    assert(File.exist?(file_path))
+  end
+
+  def test_create_print_path
+    path = Dir.mktmpdir
+    Dir.delete(path)
+
+    Rack::RubyProf.new(FakeRackApp.new, path: 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_only_paths
+    path = Dir.mktmpdir
+
+    adapter = Rack::RubyProf.new(FakeRackApp.new, path: path, only_paths: [%r{\.json$}])
+
+    adapter.call({path: '/path/to/resource.json'})
+
+    %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
+
+    adapter.call({path: '/path/to/resource.html'})
+    %w(flat.txt graph.txt graph.html call_stack.html).each do |base_name|
+      file_path = ::File.join(path, "path-to-resource.html-#{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