ruby-prof 1.3.1 → 1.4.3

data/test/printer_call_stack_test.rb

@@ -2,7 +2,6 @@
 # encoding: UTF-8
 
 require File.expand_path('../test_helper', __FILE__)
-require 'stringio'
 require 'fileutils'
 require 'tmpdir'
 require_relative 'prime'

data/test/printer_call_tree_test.rb

@@ -2,7 +2,6 @@
 # encoding: UTF-8
 
 require File.expand_path('../test_helper', __FILE__)
-require 'stringio'
 require 'fileutils'
 require 'tmpdir'
 require_relative 'prime'

data/test/printer_flat_test.rb

@@ -2,29 +2,40 @@
 # encoding: UTF-8
 
 require File.expand_path('../test_helper', __FILE__)
-require 'stringio'
 require 'fileutils'
+require 'stringio'
 require 'tmpdir'
 require_relative 'prime'
 
 # --  Tests ----
 class PrinterFlatTest < TestCase
-  def setup
-    # WALL_TIME so we can use sleep in our test and get same measurements on linux and windows
-    RubyProf::measure_mode = RubyProf::WALL_TIME
-    @result = RubyProf.profile do
+  def run_profile
+    RubyProf.profile(:measure_mode => RubyProf::WALL_TIME) do
       run_primes(1000, 5000)
     end
   end
 
   def flat_output_nth_column_values(output, n)
-    only_method_calls = output.split("\n").select { |line| line =~ /^ +\d+/ }
-    only_method_calls.collect { |line| line.split(/ +/)[n] }
+    only_method_calls = output.split("\n").select { |line| line =~ /^\s+\d+/ }
+    only_method_calls.collect { |line| line.split(/\s+/)[n] }
+  end
+
+  def helper_test_flat_string(klass)
+    output = StringIO.new
+
+    printer = klass.new(self.run_profile)
+    printer.print(output)
+
+    assert_match(/Thread ID: -?\d+/i, output.string)
+    assert_match(/Fiber ID: -?\d+/i, output.string)
+    assert_match(/Total: \d+\.\d+/i, output.string)
+    assert_match(/Object#run_primes/i, output.string)
+    output.string
   end
 
-  def assert_sorted array
-    array = array.map{|n| n.to_f} # allow for > 10s times to sort right, since lexographically 4.0 > 10.0
-    assert_equal array, array.sort.reverse, "Array #{array.inspect} is not sorted"
+  def assert_sorted(array)
+    array = array.map(&:to_f) # allow for > 10s times to sort right, since lexographically 4.0 > 10.0
+    assert_equal(array, array.sort.reverse)
   end
 
   def test_flat_string
@@ -32,63 +43,56 @@ class PrinterFlatTest < TestCase
     assert_match(/prime.rb/, output)
   end
 
-  def helper_test_flat_string(klass)
-    output = ''
-
-    printer = klass.new(@result)
-    printer.print(output)
-
-    assert_match(/Thread ID: -?\d+/i, output)
-    assert_match(/Fiber ID: -?\d+/i, output)
-    assert_match(/Total: \d+\.\d+/i, output)
-    assert_match(/Object#run_primes/i, output)
-    output
-  end
-
   def test_flat_result_sorting_by_self_time_is_default
-    printer = RubyProf::FlatPrinter.new(@result)
+    printer = RubyProf::FlatPrinter.new(self.run_profile)
 
-    printer.print(output = '')
-    self_times = flat_output_nth_column_values(output, 3)
+    output = StringIO.new
+    printer.print(output)
+    self_times = flat_output_nth_column_values(output.string, 3)
 
     assert_sorted self_times
   end
 
   def test_flat_result_sorting
-    printer = RubyProf::FlatPrinter.new(@result)
+    printer = RubyProf::FlatPrinter.new(self.run_profile)
 
     sort_method_with_column_number = {:total_time => 2, :self_time => 3, :wait_time => 4, :children_time => 5}
 
     sort_method_with_column_number.each_pair do |sort_method, n|
-      printer.print(output = '', :sort_method => sort_method)
-      times = flat_output_nth_column_values(output, n)
-      assert_sorted times
+      output = StringIO.new
+      printer.print(output, :sort_method => sort_method)
+
+      times = flat_output_nth_column_values(output.string, n)
+      assert_sorted(times)
     end
   end
 
   def test_flat_result_max_percent
-    printer = RubyProf::FlatPrinter.new(@result)
+    printer = RubyProf::FlatPrinter.new(self.run_profile)
 
-    printer.print(output = '', max_percent: 1)
-    self_percents = flat_output_nth_column_values(output, 1).map(&:to_f)
+    output = StringIO.new
+    printer.print(output, max_percent: 1)
+    self_percents = flat_output_nth_column_values(output.string, 1).map(&:to_f)
 
     assert self_percents.max < 1
   end
 
   def test_flat_result_filter_by_total_time
-    printer = RubyProf::FlatPrinter.new(@result)
+    printer = RubyProf::FlatPrinter.new(self.run_profile)
 
-    printer.print(output = '', filter_by: :total_time, min_percent: 50)
-    total_times = flat_output_nth_column_values(output, 2).map(&:to_f)
+    output = StringIO.new
+    printer.print(output, filter_by: :total_time, min_percent: 50)
+    total_times = flat_output_nth_column_values(output.string, 2).map(&:to_f)
 
     assert (total_times.min / total_times.max) >= 0.5
   end
 
   def test_flat_result_filter_by_self_time
-    printer = RubyProf::FlatPrinter.new(@result)
+    printer = RubyProf::FlatPrinter.new(self.run_profile)
 
-    printer.print(output = '', filter_by: :self_time, min_percent: 0.1)
-    self_percents = flat_output_nth_column_values(output, 1).map(&:to_f)
+    output = StringIO.new
+    printer.print(output, filter_by: :self_time, min_percent: 0.1)
+    self_percents = flat_output_nth_column_values(output.string, 1).map(&:to_f)
 
     assert self_percents.min >= 0.1
   end

data/test/printer_graph_html_test.rb

@@ -2,7 +2,6 @@
 # encoding: UTF-8
 
 require File.expand_path('../test_helper', __FILE__)
-require 'stringio'
 require 'fileutils'
 require 'tmpdir'
 require_relative 'prime'

data/test/printer_graph_test.rb

@@ -2,7 +2,6 @@
 # encoding: UTF-8
 
 require File.expand_path('../test_helper', __FILE__)
-require 'stringio'
 require 'fileutils'
 require 'tmpdir'
 require_relative 'prime'
@@ -22,9 +21,9 @@ class PrinterGraphTest < TestCase
     only_root_calls.collect { |line| line.split(/ +/)[n] }
   end
 
-  def assert_sorted array
-    array = array.map{|n| n.to_f} # allow for > 10s times to sort right, since lexographically 4.0 > 10.0
-    assert_equal array, array.sort.reverse, "Array #{array.inspect} is not sorted"
+  def assert_sorted(array)
+    array = array.map {|n| n.to_f} # allow for > 10s times to sort right, since lexographically 4.0 > 10.0
+    assert_equal(array, array.sort.reverse, "Array #{array.inspect} is not sorted")
   end
 
   def test_graph_results_sorting

data/test/printers_test.rb

@@ -2,8 +2,8 @@
 # encoding: UTF-8
 
 require File.expand_path('../test_helper', __FILE__)
-require 'stringio'
 require 'fileutils'
+require 'stringio'
 require 'tmpdir'
 require_relative 'prime'
 
@@ -37,10 +37,10 @@ class PrintersTest < TestCase
   end
 
   def test_print_to_files
-    output_dir = 'examples2'
+    output_dir = 'tmp/examples2'
 
     if ENV['SAVE_NEW_PRINTER_EXAMPLES']
-      output_dir = 'examples'
+      output_dir = 'tmp/examples'
     end
     FileUtils.mkdir_p output_dir
 

data/test/printing_recursive_graph_test.rb

@@ -2,8 +2,8 @@
 # encoding: UTF-8
 
 require File.expand_path('../test_helper', __FILE__)
-require 'stringio'
 require 'fileutils'
+require 'stringio'
 
 # --- code to be tested ---
 module PRGT

data/test/profile_test.rb

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require File.expand_path('../test_helper', __FILE__)
+
+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
+end

data/test/rack_test.rb

@@ -24,16 +24,6 @@ module Rack
   end
 end
 
-module Rack
-  class RubyProf
-    attr_reader :_profiler
-
-    def public_delete_profiler!
-      delete_profiler!
-    end
-  end
-end
-
 class RackTest < TestCase
   def test_create_print_path
     path = Dir.mktmpdir
@@ -100,58 +90,4 @@ class RackTest < TestCase
     file_path = ::File.join(path, 'path-to-resource.json-dynamic.txt')
     assert(File.exist?(file_path))
   end
-
-  def test_works_for_multiple_requests
-    path = Dir.mktmpdir
-
-    adapter = Rack::RubyProf.new(FakeRackApp.new, :path => path, :max_requests => 2)
-
-    # make a 1st request, and check that this didn't create any files
-    adapter.call(:fake_env)
-    assert(Dir["#{path}/*"].empty?)
-
-    # now a second request should create all the expected files
-    adapter.call(:fake_env)
-    %w(flat.txt graph.txt graph.html call_stack.html).each do |base_name|
-      file_path = ::File.join(path, "multi-requests-2-#{base_name}")
-      assert(File.exist?(file_path))
-    end
-
-    # let's clean up
-    FileUtils.rm_rf(Dir["#{path}/*"])
-
-    # and do the same again for the next 2 requests
-    adapter.call(:fake_env)
-    assert(Dir["#{path}/*"].empty?)
-
-    adapter.call(:fake_env)
-    %w(flat.txt graph.txt graph.html call_stack.html).each do |base_name|
-      file_path = ::File.join(path, "multi-requests-2-#{base_name}")
-      assert(File.exist?(file_path))
-    end
-  end
-
-  def test_tries_to_print_results_if_shut_down_before_max_requests_reached
-    path = Dir.mktmpdir
-
-    adapter = Rack::RubyProf.new(FakeRackApp.new, :path => path, :max_requests => 100)
-
-    # make a 1st request, and check that this didn't create any files
-    adapter.call(:fake_env)
-    assert(Dir["#{path}/*"].empty?)
-
-    adapter.public_delete_profiler!
-
-    %w(flat.txt graph.txt graph.html call_stack.html).each do |base_name|
-      file_path = ::File.join(path, "multi-requests-1-#{base_name}")
-      assert(File.exist?(file_path))
-    end
-  end
-
-  def test_it_uses_separate_profilers_if_not_aggregating_multiple_requests
-    adapter1 = Rack::RubyProf.new(FakeRackApp.new)
-    adapter2 = Rack::RubyProf.new(FakeRackApp.new)
-
-    assert(adapter1.object_id != adapter2.object_id)
-  end
 end

data/test/start_stop_test.rb

@@ -22,23 +22,23 @@ class StartStopTest < TestCase
     sleep(2)
     @result = RubyProf.stop
   end
-  
+
   def test_extra_stop_should_raise
     RubyProf.start
     assert_raises(RuntimeError) do
       RubyProf.start
     end
-    
+
     assert_raises(RuntimeError) do
       RubyProf.profile {}
     end
-    
+
     RubyProf.stop # ok
     assert_raises(RuntimeError) do
       RubyProf.stop
     end
   end
-    
+
   def test_different_methods
     method1
 

data/test/temp.rb

@@ -0,0 +1,20 @@
+require 'redis'
+
+path = File.expand_path(File.join(__dir__, '..', 'lib'))
+$LOAD_PATH << path
+require 'ruby-prof'
+
+Widget = Struct.new(:key) do
+  def set!
+    Redis.current.set(key, 1, ex: 10)
+  end
+end
+
+result = RubyProf.profile do
+  (1..20).each { |i| Widget.new(i).set! }
+end
+
+printer = RubyProf::CallStackPrinter.new(result)
+File.open("framez.html", 'w:ASCII-8BIT') do |file|
+  printer.print(file, {})
+end

data/test/test_helper.rb

@@ -1,12 +1,17 @@
 # encoding: UTF-8
 
-# Disable minitest parallel tests. The problem is the thread switching will cahnge test results
-# (self vs wait time)
-ENV["N"] = "0"
-
 require 'bundler/setup'
 require 'minitest/autorun'
+
+# Disable minitest parallel tests. The problem is the thread switching will change test results
+# (self vs wait time)
+if Gem::Version.new(Minitest::VERSION) > Gem::Version.new('5.11.3')
+  ENV["MT_CPU"] = "0" # Newer versions minitest
+else
+  ENV["N"] = "0" # Older versions of minitest
+end
+
 require 'ruby-prof'
 
 class TestCase < Minitest::Test
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-prof
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.3
 platform: ruby
 authors:
 - Shugo Maeda, Charlie Savage, Roger Pack, Stefan Kaes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-12 00:00:00.000000000 Z
+date: 2021-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -161,11 +161,13 @@ files:
 - test/printer_graph_test.rb
 - test/printers_test.rb
 - test/printing_recursive_graph_test.rb
+- test/profile_test.rb
 - test/rack_test.rb
 - test/recursive_test.rb
 - test/singleton_test.rb
 - test/stack_printer_test.rb
 - test/start_stop_test.rb
+- test/temp.rb
 - test/test_helper.rb
 - test/thread_test.rb
 - test/unique_call_path_test.rb
@@ -177,7 +179,7 @@ metadata:
   bug_tracker_uri: https://github.com/ruby-prof/ruby-prof/issues
   changelog_uri: https://github.com/ruby-prof/ruby-prof/blob/master/CHANGES
   documentation_uri: https://ruby-prof.github.io/
-  source_code_uri: https://github.com/ruby-prof/ruby-prof/tree/v1.3.1
+  source_code_uri: https://github.com/ruby-prof/ruby-prof/tree/v1.4.3
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -186,14 +188,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Fast Ruby profiler