ruby-prof 1.5.0 → 1.6.1

data/test/pause_resume_test.rb

@@ -5,26 +5,22 @@ require File.expand_path('../test_helper', __FILE__)
 require_relative 'measure_times'
 
 class PauseResumeTest < TestCase
-  def setup
-    # Need to use wall time for this test due to the sleep calls
-    RubyProf::measure_mode = RubyProf::WALL_TIME
-  end
-
   def test_pause_resume
+    profile = RubyProf::Profile.new(measure_mode: RubyProf::WALL_TIME)
     # Measured
-    RubyProf.start
+    profile.start
     RubyProf::C1.sleep_wait
 
     # Not measured
-    RubyProf.pause
+    profile.pause
     sleep 1
     RubyProf::C1.sleep_wait
 
     # Measured
-    RubyProf.resume
+    profile.resume
     RubyProf::C1.sleep_wait
 
-    result = RubyProf.stop
+    result = profile.stop
 
     # Length should be 3:
     #   PauseResumeTest#test_pause_resume
@@ -59,7 +55,7 @@ class PauseResumeTest < TestCase
 
   # pause/resume in the same frame
   def test_pause_resume_1
-    profile = RubyProf::Profile.new
+    profile = RubyProf::Profile.new(measure_mode: RubyProf::WALL_TIME)
 
     profile.start
     method_1a
@@ -79,7 +75,7 @@ class PauseResumeTest < TestCase
 
   # pause in parent frame, resume in child
   def test_pause_resume_2
-    profile = RubyProf::Profile.new
+    profile = RubyProf::Profile.new(measure_mode: RubyProf::WALL_TIME)
 
     profile.start
     method_2a
@@ -96,7 +92,7 @@ class PauseResumeTest < TestCase
 
   # pause in child frame, resume in parent
   def test_pause_resume_3
-    profile = RubyProf::Profile.new
+    profile = RubyProf::Profile.new(measure_mode: RubyProf::WALL_TIME)
 
     profile.start
     method_3a(profile)
@@ -120,7 +116,7 @@ class PauseResumeTest < TestCase
   end
 
   def test_pause_seq
-    profile = RubyProf::Profile.new
+    profile = RubyProf::Profile.new(measure_mode: RubyProf::WALL_TIME)
     profile.start ; assert !profile.paused?
     profile.pause ; assert profile.paused?
     profile.resume; assert !profile.paused?
@@ -132,7 +128,7 @@ class PauseResumeTest < TestCase
   end
 
   def test_pause_block
-    profile = RubyProf::Profile.new
+    profile = RubyProf::Profile.new(measure_mode: RubyProf::WALL_TIME)
     profile.start
     profile.pause
     assert profile.paused?
@@ -151,7 +147,7 @@ class PauseResumeTest < TestCase
   end
 
   def test_pause_block_with_error
-    profile = RubyProf::Profile.new
+    profile = RubyProf::Profile.new(measure_mode: RubyProf::WALL_TIME)
     profile.start
     profile.pause
     assert profile.paused?
@@ -167,7 +163,7 @@ class PauseResumeTest < TestCase
   end
 
   def test_resume_when_not_paused
-    profile = RubyProf::Profile.new
+    profile = RubyProf::Profile.new(measure_mode: RubyProf::WALL_TIME)
     profile.start ; assert !profile.paused?
     profile.resume; assert !profile.paused?
     profile.stop  ; assert !profile.paused?

data/test/printer_call_stack_test.rb

@@ -9,9 +9,9 @@ require_relative 'prime'
 # --  Tests ----
 class PrinterCallStackTest < TestCase
   def setup
+    super
     # 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
+    @result = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) do
       run_primes(1000, 5000)
     end
   end

data/test/printer_call_tree_test.rb

@@ -9,9 +9,9 @@ require_relative 'prime'
 # --  Tests ----
 class PrinterCallTreeTest < TestCase
   def setup
+    super
     # 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
+    @result = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) do
       run_primes(1000, 5000)
     end
   end

data/test/printer_flat_test.rb

@@ -10,7 +10,7 @@ require_relative 'prime'
 # --  Tests ----
 class PrinterFlatTest < TestCase
   def run_profile
-    RubyProf.profile(:measure_mode => RubyProf::WALL_TIME) do
+    RubyProf::Profile.profile(:measure_mode => RubyProf::WALL_TIME) do
       run_primes(1000, 5000)
     end
   end

data/test/printer_graph_html_test.rb

@@ -9,9 +9,9 @@ require_relative 'prime'
 # --  Tests ----
 class PrinterGraphHtmlTest < TestCase
   def setup
+    super
     # 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
+    @result = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) do
       run_primes(1000, 5000)
     end
   end

data/test/printer_graph_test.rb

@@ -9,9 +9,9 @@ require_relative 'prime'
 # --  Tests ----
 class PrinterGraphTest < TestCase
   def setup
+    super
     # 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
+    @result = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) do
       run_primes(1000, 5000)
     end
   end

data/test/printers_test.rb

@@ -10,9 +10,9 @@ require_relative 'prime'
 # --  Tests ----
 class PrintersTest < TestCase
   def setup
+    super
     # 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
+    @result = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) do
       run_primes(1000, 5000)
     end
   end
@@ -24,7 +24,7 @@ class PrintersTest < TestCase
     printer.print(output)
 
     printer = RubyProf::CallTreePrinter.new(@result)
-    printer.print()
+    printer.print(:path => Dir.tmpdir)
 
     printer = RubyProf::FlatPrinter.new(@result)
     printer.print(output)
@@ -37,25 +37,19 @@ class PrintersTest < TestCase
   end
 
   def test_print_to_files
-    output_dir = 'tmp/examples2'
-
-    if ENV['SAVE_NEW_PRINTER_EXAMPLES']
-      output_dir = 'tmp/examples'
-    end
-    FileUtils.mkdir_p output_dir
-
     printer = RubyProf::DotPrinter.new(@result)
-    File.open("#{output_dir}/graph.dot", "w") {|f| printer.print(f)}
+    File.open("#{Dir.tmpdir}/graph.dot", "w") {|f| printer.print(f)}
 
     printer = RubyProf::CallStackPrinter.new(@result)
-    File.open("#{output_dir}/stack.html", "w") {|f| printer.print(f, :application => "primes")}
-
-    # printer = RubyProf::MultiPrinter.new(@result)
-    # printer.print(:path => "#{output_dir}", :profile => "multi", :application => "primes")
-    # for file in ['graph.dot', 'multi.flat.txt', 'multi.graph.html', "multi.callgrind.out.#{$$}", 'multi.stack.html', 'stack.html']
-    #   existant_file = output_dir + '/' + file
-    #   assert File.size(existant_file) > 0
-    # end
+    File.open("#{Dir.tmpdir}/stack.html", "w") {|f| printer.print(f, :application => "primes")}
+
+    printer = RubyProf::MultiPrinter.new(@result)
+    printer.print(:path => Dir.tmpdir, :profile => "multi", :application => "primes")
+
+    ['graph.dot', 'multi.flat.txt', 'multi.graph.html', "multi.callgrind.out.#{$$}", 'multi.stack.html', 'stack.html'].each do |file_name|
+      file_path = File.join(Dir.tmpdir, file_name)
+      refute(File.empty?(file_path))
+    end
   end
 
   def test_refuses_io_objects
@@ -124,7 +118,7 @@ class PrintersTest < TestCase
   end
 
   def test_all_with_small_percentiles
-    result = RubyProf.profile do
+    result = RubyProf::Profile.profile do
       sleep 2
       do_nothing
     end

data/test/printing_recursive_graph_test.rb

@@ -63,9 +63,9 @@ Sort by:
 
 class PrintingRecursiveGraphTest < TestCase
   def setup
+    super
     # 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
+    @result = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) do
       PRGT.run
     end
   end

data/test/recursive_test.rb

@@ -33,15 +33,10 @@ end
 
 # --  Tests ----
 class RecursiveTest < TestCase
-  def setup
-    # Need to use wall time for this test due to the sleep calls
-    RubyProf::measure_mode = RubyProf::WALL_TIME
-  end
-
   include SimpleRecursion
 
   def test_simple
-    result = RubyProf.profile do
+    result = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) do
       simple(1)
     end
 
@@ -201,7 +196,7 @@ class RecursiveTest < TestCase
   end
 
   def test_cycle
-    result = RubyProf.profile do
+    result = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) do
       render
     end
 

data/test/singleton_test.rb

@@ -26,7 +26,7 @@ end
 
 class SingletonTest < TestCase
   def test_singleton
-    result = RubyProf.profile do
+    result = RubyProf::Profile.profile do
       a = A.new
       a << :first_thing
       assert_equal(1, a.as.size)

data/test/stack_printer_test.rb

@@ -27,16 +27,12 @@ class STPT
 end
 
 class StackPrinterTest < TestCase
-  def setup
-    # Need to use wall time for this test due to the sleep calls
-    RubyProf::measure_mode = RubyProf::WALL_TIME
-  end
-
   def test_stack_can_be_printed
     start_time = Time.now
-    RubyProf.start
-    5.times{STPT.new.a}
-    result = RubyProf.stop
+    result = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) do
+      5.times{STPT.new.a}
+    end
+
     end_time = Time.now
     expected_time = end_time - start_time
 
@@ -50,6 +46,7 @@ class StackPrinterTest < TestCase
   end
 
   private
+
   def print(result)
     test = caller.first =~ /in `(.*)'/ ? $1 : "test"
     testfile_name = "#{Dir.tmpdir}/ruby_prof_#{test}.html"

data/test/start_stop_test.rb

@@ -5,37 +5,34 @@ require File.expand_path('../test_helper', __FILE__)
 
 class StartStopTest < TestCase
   def setup
+    super
     # Need to use wall time for this test due to the sleep calls
-    RubyProf::measure_mode = RubyProf::WALL_TIME
+    @profile = RubyProf::Profile.new(measure_mode: RubyProf::WALL_TIME)
   end
 
   def method1
-     RubyProf.start
-     method2
+    @profile.start
+    method2
   end
 
   def method2
-     method3
+    method3
   end
 
   def method3
     sleep(2)
-    @result = RubyProf.stop
+    @result = @profile.stop
   end
 
   def test_extra_stop_should_raise
-    RubyProf.start
+    @profile.start
     assert_raises(RuntimeError) do
-      RubyProf.start
+      @profile.start
     end
 
+    @profile.stop # ok
     assert_raises(RuntimeError) do
-      RubyProf.profile {}
-    end
-
-    RubyProf.stop # ok
-    assert_raises(RuntimeError) do
-      RubyProf.stop
+      @profile.stop
     end
   end
 
@@ -43,7 +40,7 @@ class StartStopTest < TestCase
     method1
 
     # Ruby prof should be stopped
-    assert_equal(false, RubyProf.running?)
+    assert_equal(false, @profile.running?)
 
     methods = @result.threads.first.methods.sort.reverse
     assert_equal(4, methods.length)

data/test/thread_test.rb

@@ -8,11 +8,6 @@ require_relative './call_tree_builder'
 
 # --  Tests ----
 class ThreadTest < TestCase
-  def setup
-    # Need to use wall time for this test due to the sleep calls
-    RubyProf::measure_mode = RubyProf::WALL_TIME
-  end
-
   def test_initialize
     method_info = RubyProf::MethodInfo.new(Array, :size)
     call_tree = RubyProf::CallTree.new(method_info)
@@ -39,24 +34,25 @@ class ThreadTest < TestCase
   end
 
   def test_thread_count
-    RubyProf.start
+    result = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) do
+      thread = Thread.new do
+        sleep(1)
+      end
 
-    thread = Thread.new do
-      sleep(1)
+      thread.join
     end
-
-    thread.join
-    result = RubyProf.stop
     assert_equal(2, result.threads.length)
   end
 
   def test_thread_identity
-    RubyProf.start
+    profile = RubyProf::Profile.new(measure_mode: RubyProf::WALL_TIME)
+    profile.start
+
     sleep_thread = Thread.new do
       sleep(1)
     end
     sleep_thread.join
-    result = RubyProf.stop
+    result = profile.stop
 
     thread_ids = result.threads.map {|thread| thread.id}.sort
     threads = [Thread.current, sleep_thread]
@@ -73,7 +69,9 @@ class ThreadTest < TestCase
   end
 
   def test_thread_timings
-    RubyProf.start
+    profile = RubyProf::Profile.new(measure_mode: RubyProf::WALL_TIME)
+    profile.start
+
     thread = Thread.new do
       sleep 0
       # force it to hit thread.join, below, first
@@ -83,7 +81,7 @@ class ThreadTest < TestCase
       sleep(1)
     end
     thread.join
-    result = RubyProf.stop
+    result = profile.stop
 
     # Check background thread
     assert_equal(2, result.threads.length)

data/test/unique_call_path_test.rb

@@ -30,7 +30,7 @@ class UniqueCallPathTest < TestCase
   def test_root
     unique_call_path = UniqueCallPath.new
 
-    result = RubyProf.profile do
+    result = RubyProf::Profile.profile do
       unique_call_path.method_a(1)
     end
 
@@ -41,7 +41,7 @@ class UniqueCallPathTest < TestCase
   def test_root_children
     unique_call_path = UniqueCallPath.new
 
-    result = RubyProf.profile do
+    result = RubyProf::Profile.profile do
       unique_call_path.method_a(1)
       unique_call_path.method_k(2)
     end
@@ -59,7 +59,7 @@ class UniqueCallPathTest < TestCase
   def test_children_of
     unique_call_path = UniqueCallPath.new
 
-    result = RubyProf.profile do
+    result = RubyProf::Profile.profile do
       unique_call_path.method_a(1)
       unique_call_path.method_k(2)
     end
@@ -92,7 +92,7 @@ class UniqueCallPathTest < TestCase
   def test_unique_path
     unique_call_path = UniqueCallPath.new
 
-    result = RubyProf.profile do
+    result = RubyProf::Profile.profile do
       unique_call_path.method_a(1)
       unique_call_path.method_k(1)
     end

data/test/yarv_test.rb

@@ -6,13 +6,13 @@ require File.expand_path('../test_helper', __FILE__)
 # tests for bugs reported by users
 class YarvTest < TestCase
   def setup
-    RubyProf::measure_mode = RubyProf::WALL_TIME
+    super
     define_methods
   end
 
   def test_array_push_unoptimized
     a = nil
-    result = RubyProf.profile do
+    result = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) do
       a = self.array_push_unoptimized
     end
     assert_equal 2, a.length
@@ -21,7 +21,7 @@ class YarvTest < TestCase
 
   def test_array_push_optimized
     a = nil
-    result = RubyProf.profile do
+    result = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) do
       a = self.array_push_optimized
     end
     assert_equal(2, a.length)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-prof
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Shugo Maeda, Charlie Savage, Roger Pack, Stefan Kaes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-07 00:00:00.000000000 Z
+date: 2023-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -112,11 +112,11 @@ files:
 - ruby-prof.gemspec
 - test/abstract_printer_test.rb
 - test/alias_test.rb
-- test/basic_test.rb
 - test/call_tree_builder.rb
 - test/call_tree_test.rb
 - test/call_tree_visitor_test.rb
 - test/call_trees_test.rb
+- test/compatibility_test.rb
 - test/duplicate_names_test.rb
 - test/dynamic_method_test.rb
 - test/enumerable_test.rb
@@ -166,7 +166,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.5.0
+  source_code_uri: https://github.com/ruby-prof/ruby-prof/tree/v1.6.1
 post_install_message:
 rdoc_options: []
 require_paths: