ruby-prof 1.7.2 → 2.0.0

data/lib/unprof.rb

@@ -1,10 +1,10 @@
-# encoding: utf-8
-
-require "ruby-prof"
-
-at_exit {
-  result = RubyProf.stop
-  printer = RubyProf::FlatPrinter.new(result)
-  printer.print(STDOUT)
-}
-RubyProf.start
+# encoding: utf-8
+
+require "ruby-prof"
+
+at_exit {
+  result = RubyProf.stop
+  printer = RubyProf::FlatPrinter.new(result)
+  printer.print(STDOUT)
+}
+RubyProf.start

data/ruby-prof.gemspec

@@ -21,7 +21,7 @@ EOF
 
   spec.metadata = {
     "bug_tracker_uri"   => "https://github.com/ruby-prof/ruby-prof/issues",
-    "changelog_uri"     => "https://github.com/ruby-prof/ruby-prof/blob/master/CHANGES",
+    "changelog_uri"     => "https://github.com/ruby-prof/ruby-prof/blob/master/CHANGELOG.md",
     "documentation_uri" => "https://ruby-prof.github.io/",
     "source_code_uri"   => "https://github.com/ruby-prof/ruby-prof/tree/v#{spec.version}",
   }
@@ -33,15 +33,14 @@ EOF
   spec.bindir = "bin"
   spec.executables = ["ruby-prof", "ruby-prof-check-trace"]
   spec.extensions = ["ext/ruby_prof/extconf.rb"]
-  spec.files = Dir['CHANGES',
+  spec.files = Dir['CHANGELOG.md',
                    'LICENSE',
                    'Rakefile',
                    'README.md',
                    'ruby-prof.gemspec',
                    'bin/ruby-prof',
                    'bin/ruby-prof-check-trace',
-                   'doc/**/*',
-                   'examples/*',
+                   'docs/**/*',
                    'ext/ruby_prof/extconf.rb',
                    'ext/ruby_prof/*.c',
                    'ext/ruby_prof/*.h',
@@ -56,10 +55,11 @@ EOF
                    'test/*.rb']
 
   spec.test_files = Dir["test/test_*.rb"]
-  spec.required_ruby_version = '>= 3.0.0'
+  spec.required_ruby_version = '>= 3.2.0'
   spec.date = Time.now.strftime('%Y-%m-%d')
   spec.homepage = 'https://github.com/ruby-prof/ruby-prof'
   spec.add_dependency('base64')
+  spec.add_dependency('ostruct')
   spec.add_development_dependency('minitest')
   spec.add_development_dependency('rake-compiler')
   spec.add_development_dependency('rdoc')

data/test/abstract_printer_test.rb

@@ -1,27 +1,25 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-require File.expand_path('../test_helper', __FILE__)
-
-class AbstractPrinterTest < TestCase
-  def setup
-    super
-    @result = {}
-    @printer = RubyProf::AbstractPrinter.new(@result)
-    @options = {}
-    @printer.setup_options(@options)
-  end
-
-  private
-
-  def with_const_stubbed(name, value)
-    old_verbose, $VERBOSE = $VERBOSE, nil
-    old_value = Object.const_get(name)
-
-    Object.const_set(name, value)
-    yield
-    Object.const_set(name, old_value)
-
-    $VERBOSE = old_verbose
-  end
-end
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require File.expand_path('../test_helper', __FILE__)
+
+class AbstractPrinterTest < TestCase
+  def setup
+    super
+    @result = {}
+    @printer = RubyProf::AbstractPrinter.new(@result)
+  end
+
+  private
+
+  def with_const_stubbed(name, value)
+    old_verbose, $VERBOSE = $VERBOSE, nil
+    old_value = Object.const_get(name)
+
+    Object.const_set(name, value)
+    yield
+    Object.const_set(name, old_value)
+
+    $VERBOSE = old_verbose
+  end
+end

data/test/alias_test.rb

@@ -1,117 +1,203 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-require File.expand_path("../test_helper", __FILE__)
-
-class AliasTest < TestCase
-  class TestMe
-    def some_method
-      sleep(0.1)
-    end
-
-    alias :some_method_original :some_method
-    def some_method
-      some_method_original
-    end
-  end
-
-  def test_alias
-    result = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) do
-      TestMe.new.some_method
-    end
-
-    methods = result.threads.first.methods
-    assert_equal(6, methods.count)
-
-    # Method 0
-    method = methods[0]
-    assert_equal('AliasTest#test_alias', method.full_name)
-    assert_equal(20, method.line)
-    refute(method.recursive?)
-
-    assert_equal(0, method.call_trees.callers.count)
-
-    assert_equal(2, method.call_trees.callees.count)
-    call_tree = method.call_trees.callees[0]
-    assert_equal('Class#new', call_tree.target.full_name)
-    assert_equal(20, call_tree.line)
-
-    call_tree = method.call_trees.callees[1]
-    assert_equal('AliasTest::TestMe#some_method', call_tree.target.full_name)
-    assert_equal(20, call_tree.line)
-
-    # Method 1
-    method = methods[1]
-    assert_equal('Class#new', method.full_name)
-    assert_equal(0, method.line)
-    refute(method.recursive?)
-
-    assert_equal(1, method.call_trees.callers.count)
-    call_tree = method.call_trees.callers[0]
-    assert_equal('AliasTest#test_alias', call_tree.parent.target.full_name)
-    assert_equal(20, call_tree.line)
-
-    assert_equal(1, method.call_trees.callees.count)
-    call_tree = method.call_trees.callees[0]
-    assert_equal('BasicObject#initialize', call_tree.target.full_name)
-    assert_equal(0, call_tree.line)
-
-    # Method 2
-    method = methods[2]
-    assert_equal('BasicObject#initialize', method.full_name)
-    assert_equal(0, method.line)
-    refute(method.recursive?)
-
-    assert_equal(1, method.call_trees.callers.count)
-    call_tree = method.call_trees.callers[0]
-    assert_equal('Class#new', call_tree.parent.target.full_name)
-    assert_equal(0, call_tree.line)
-
-    assert_equal(0, method.call_trees.callees.count)
-
-    # Method 3
-    method = methods[3]
-    assert_equal('AliasTest::TestMe#some_method', method.full_name)
-    assert_equal(13, method.line)
-    refute(method.recursive?)
-
-    assert_equal(1, method.call_trees.callers.count)
-    call_tree = method.call_trees.callers[0]
-    assert_equal('AliasTest#test_alias', call_tree.parent.target.full_name)
-    assert_equal(20, call_tree.line)
-
-    assert_equal(1, method.call_trees.callees.count)
-    call_tree = method.call_trees.callees[0]
-    assert_equal('AliasTest::TestMe#some_method_original', call_tree.target.full_name)
-    assert_equal(14, call_tree.line)
-
-    # Method 4
-    method = methods[4]
-    assert_equal('AliasTest::TestMe#some_method_original', method.full_name)
-    assert_equal(8, method.line)
-    refute(method.recursive?)
-
-    assert_equal(1, method.call_trees.callers.count)
-    call_tree = method.call_trees.callers[0]
-    assert_equal('AliasTest::TestMe#some_method', call_tree.parent.target.full_name)
-    assert_equal(14, call_tree.line)
-
-    assert_equal(1, method.call_trees.callees.count)
-    call_tree = method.call_trees.callees[0]
-    assert_equal('Kernel#sleep', call_tree.target.full_name)
-    assert_equal(9, call_tree.line)
-
-    # Method 5
-    method = methods[5]
-    assert_equal('Kernel#sleep', method.full_name)
-    assert_equal(0, method.line)
-    refute(method.recursive?)
-
-    assert_equal(1, method.call_trees.callers.count)
-    call_tree = method.call_trees.callers[0]
-    assert_equal('AliasTest::TestMe#some_method_original', call_tree.parent.target.full_name)
-    assert_equal(9, call_tree.line)
-
-    assert_equal(0, method.call_trees.callees.count)
-  end
-end
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require File.expand_path("../test_helper", __FILE__)
+
+class AliasTest < TestCase
+  class TestMe
+    def some_method
+      sleep(0.1)
+    end
+
+    alias :some_method_original :some_method
+    def some_method
+      some_method_original
+    end
+  end
+
+  if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('4.0')
+    def test_alias
+      result = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) do
+        TestMe.new.some_method
+      end
+
+      methods = result.threads.first.methods
+      assert_equal(6, methods.count)
+
+      # Method 0
+      method = methods[0]
+      assert_equal('AliasTest#test_alias', method.full_name)
+      assert_equal(21, method.line)
+      refute(method.recursive?)
+
+      assert_equal(0, method.call_trees.callers.count)
+
+      assert_equal(2, method.call_trees.callees.count)
+      call_tree = method.call_trees.callees[0]
+      assert_equal('Class#new', call_tree.target.full_name)
+      assert_equal(21, call_tree.line)
+
+      call_tree = method.call_trees.callees[1]
+      assert_equal('AliasTest::TestMe#some_method', call_tree.target.full_name)
+      assert_equal(21, call_tree.line)
+
+      # Method 1
+      method = methods[1]
+      assert_equal('Class#new', method.full_name)
+      assert_equal(0, method.line)
+      refute(method.recursive?)
+
+      assert_equal(1, method.call_trees.callers.count)
+      call_tree = method.call_trees.callers[0]
+      assert_equal('AliasTest#test_alias', call_tree.parent.target.full_name)
+      assert_equal(21, call_tree.line)
+
+      assert_equal(1, method.call_trees.callees.count)
+      call_tree = method.call_trees.callees[0]
+      assert_equal('BasicObject#initialize', call_tree.target.full_name)
+      assert_equal(0, call_tree.line)
+
+      # Method 2
+      method = methods[2]
+      assert_equal('BasicObject#initialize', method.full_name)
+      assert_equal(0, method.line)
+      refute(method.recursive?)
+
+      assert_equal(1, method.call_trees.callers.count)
+      call_tree = method.call_trees.callers[0]
+      assert_equal('Class#new', call_tree.parent.target.full_name)
+      assert_equal(0, call_tree.line)
+
+      assert_equal(0, method.call_trees.callees.count)
+
+      # Method 3
+      method = methods[3]
+      assert_equal('AliasTest::TestMe#some_method', method.full_name)
+      assert_equal(13, method.line)
+      refute(method.recursive?)
+
+      assert_equal(1, method.call_trees.callers.count)
+      call_tree = method.call_trees.callers[0]
+      assert_equal('AliasTest#test_alias', call_tree.parent.target.full_name)
+      assert_equal(21, call_tree.line)
+
+      assert_equal(1, method.call_trees.callees.count)
+      call_tree = method.call_trees.callees[0]
+      assert_equal('AliasTest::TestMe#some_method_original', call_tree.target.full_name)
+      assert_equal(14, call_tree.line)
+
+      # Method 4
+      method = methods[4]
+      assert_equal('AliasTest::TestMe#some_method_original', method.full_name)
+      assert_equal(8, method.line)
+      refute(method.recursive?)
+
+      assert_equal(1, method.call_trees.callers.count)
+      call_tree = method.call_trees.callers[0]
+      assert_equal('AliasTest::TestMe#some_method', call_tree.parent.target.full_name)
+      assert_equal(14, call_tree.line)
+
+      assert_equal(1, method.call_trees.callees.count)
+      call_tree = method.call_trees.callees[0]
+      assert_equal('Kernel#sleep', call_tree.target.full_name)
+      assert_equal(9, call_tree.line)
+
+      # Method 5
+      method = methods[5]
+      assert_equal('Kernel#sleep', method.full_name)
+      assert_equal(0, method.line)
+      refute(method.recursive?)
+
+      assert_equal(1, method.call_trees.callers.count)
+      call_tree = method.call_trees.callers[0]
+      assert_equal('AliasTest::TestMe#some_method_original', call_tree.parent.target.full_name)
+      assert_equal(9, call_tree.line)
+
+      assert_equal(0, method.call_trees.callees.count)
+    end
+  else
+    def test_alias
+      result = RubyProf::Profile.profile(measure_mode: RubyProf::WALL_TIME) do
+        TestMe.new.some_method
+      end
+
+      methods = result.threads.first.methods
+      assert_equal(5, methods.count)
+
+      # Method 0
+      method = methods[0]
+      assert_equal('AliasTest#test_alias', method.full_name)
+      assert_equal(121, method.line)
+      refute(method.recursive?)
+
+      assert_equal(0, method.call_trees.callers.count)
+
+      assert_equal(2, method.call_trees.callees.count)
+      call_tree = method.call_trees.callees[0]
+      assert_equal('BasicObject#initialize', call_tree.target.full_name)
+      assert_equal(121, call_tree.line)
+
+      call_tree = method.call_trees.callees[1]
+      assert_equal('AliasTest::TestMe#some_method', call_tree.target.full_name)
+      assert_equal(121, call_tree.line)
+
+      # Method 1
+      method = methods[1]
+      assert_equal('BasicObject#initialize', method.full_name)
+      assert_equal(0, method.line)
+      refute(method.recursive?)
+
+      assert_equal(1, method.call_trees.callers.count)
+      call_tree = method.call_trees.callers[0]
+      assert_equal('AliasTest#test_alias', call_tree.parent.target.full_name)
+      assert_equal(121, call_tree.line)
+
+      assert_equal(0, method.call_trees.callees.count)
+
+      # Method 2
+      method = methods[2]
+      assert_equal('AliasTest::TestMe#some_method', method.full_name)
+      assert_equal(13, method.line)
+      refute(method.recursive?)
+
+      assert_equal(1, method.call_trees.callers.count)
+      call_tree = method.call_trees.callers[0]
+      assert_equal('AliasTest#test_alias', call_tree.parent.target.full_name)
+      assert_equal(121, call_tree.line)
+
+      assert_equal(1, method.call_trees.callees.count)
+      call_tree = method.call_trees.callees[0]
+      assert_equal('AliasTest::TestMe#some_method_original', call_tree.target.full_name)
+      assert_equal(14, call_tree.line)
+
+      # Method 3
+      method = methods[3]
+      assert_equal('AliasTest::TestMe#some_method_original', method.full_name)
+      assert_equal(8, method.line)
+      refute(method.recursive?)
+
+      assert_equal(1, method.call_trees.callers.count)
+      call_tree = method.call_trees.callers[0]
+      assert_equal('AliasTest::TestMe#some_method', call_tree.parent.target.full_name)
+      assert_equal(14, call_tree.line)
+
+      assert_equal(1, method.call_trees.callees.count)
+      call_tree = method.call_trees.callees[0]
+      assert_equal('Kernel#sleep', call_tree.target.full_name)
+      assert_equal(9, call_tree.line)
+
+      # Method 4
+      method = methods[4]
+      assert_equal('Kernel#sleep', method.full_name)
+      assert_equal(0, method.line)
+      refute(method.recursive?)
+
+      assert_equal(1, method.call_trees.callers.count)
+      call_tree = method.call_trees.callers[0]
+      assert_equal('AliasTest::TestMe#some_method_original', call_tree.parent.target.full_name)
+      assert_equal(9, call_tree.line)
+
+      assert_equal(0, method.call_trees.callees.count)
+    end
+  end
+end