ruby-prof 0.15.9 → 0.16.0

data/test/multi_printer_test.rb

@@ -63,6 +63,7 @@ class MultiPrinterTest < TestCase
   end
 
   private
+
   def print(result)
     test = caller.first =~ /in `(.*)'/ ? $1 : "test"
     path = RubyProf.tmpdir
@@ -73,10 +74,10 @@ class MultiPrinterTest < TestCase
     if RUBY_PLATFORM =~ /darwin/ && ENV['SHOW_RUBY_PROF_PRINTER_OUTPUT']=="1"
       system("open '#{printer.stack_profile}'")
     end
-    if GC.respond_to?(:dump_file_and_line_info)
-      GC.start
-      GC.dump_file_and_line_info("heap.dump")
-    end
+    # if GC.respond_to?(:dump_file_and_line_info)
+    #   GC.start
+    #   GC.dump_file_and_line_info("heap.dump")
+    # end
     [File.read(printer.stack_profile), File.read(printer.graph_profile)]
   end
 end

data/test/pause_resume_test.rb

@@ -58,7 +58,7 @@ class PauseResumeTest < TestCase
 
   # pause/resume in the same frame
   def test_pause_resume_1
-    profile = RubyProf::Profile.new(RubyProf::WALL_TIME,[])
+    profile = RubyProf::Profile.new
 
     profile.start
     method_1a
@@ -78,7 +78,7 @@ class PauseResumeTest < TestCase
 
   # pause in parent frame, resume in child
   def test_pause_resume_2
-    profile = RubyProf::Profile.new(RubyProf::WALL_TIME,[])
+    profile = RubyProf::Profile.new
 
     profile.start
     method_2a
@@ -95,7 +95,7 @@ class PauseResumeTest < TestCase
 
   # pause in child frame, resume in parent
   def test_pause_resume_3
-    profile = RubyProf::Profile.new(RubyProf::WALL_TIME,[])
+    profile = RubyProf::Profile.new
 
     profile.start
     method_3a(profile)
@@ -111,7 +111,7 @@ class PauseResumeTest < TestCase
   def method_3b; sleep 0.4 end
 
   def test_pause_seq
-    profile = RubyProf::Profile.new(RubyProf::WALL_TIME,[])
+    profile = RubyProf::Profile.new
     profile.start ; assert !profile.paused?
     profile.pause ; assert profile.paused?
     profile.resume; assert !profile.paused?
@@ -123,7 +123,7 @@ class PauseResumeTest < TestCase
   end
 
   def test_pause_block
-    profile = RubyProf::Profile.new(RubyProf::WALL_TIME,[])
+    profile = RubyProf::Profile.new
     profile.start
     profile.pause
     assert profile.paused?
@@ -142,7 +142,7 @@ class PauseResumeTest < TestCase
   end
 
   def test_pause_block_with_error
-    profile = RubyProf::Profile.new(RubyProf::WALL_TIME,[])
+    profile = RubyProf::Profile.new
     profile.start
     profile.pause
     assert profile.paused?
@@ -158,7 +158,7 @@ class PauseResumeTest < TestCase
   end
 
   def test_resume_when_not_paused
-    profile = RubyProf::Profile.new(RubyProf::WALL_TIME,[])
+    profile = RubyProf::Profile.new
     profile.start ; assert !profile.paused?
     profile.resume; assert !profile.paused?
     profile.stop  ; assert !profile.paused?

data/test/printers_test.rb

@@ -23,7 +23,7 @@ class PrintersTest < TestCase
       printer.print(output)
 
       printer = RubyProf::CallTreePrinter.new(@result)
-      printer.print(output)
+      printer.print()
 
       printer = RubyProf::FlatPrinter.new(@result)
       printer.print(output)
@@ -56,7 +56,7 @@ class PrintersTest < TestCase
 
       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.grind.dat', 'multi.stack.html', 'stack.html']
+      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
@@ -115,9 +115,11 @@ class PrintersTest < TestCase
   end
 
   def test_call_tree_string
-    output = ''
     printer = RubyProf::CallTreePrinter.new(@result)
-    printer.print(output)
+    printer.print(:profile => "lolcat", :path => RubyProf.tmpdir)
+    main_output_file_name = File.join(RubyProf.tmpdir, "lolcat.callgrind.out.#{$$}")
+    assert(File.exist?(main_output_file_name))
+    output = File.read(main_output_file_name)
     assert_match(/fn=Object#find_primes/i, output)
     assert_match(/events: wall_time/i, output)
     refute_match(/d\d\d\d\d\d/, output) # old bug looked [in error] like Object::run_primes(d5833116)

data/test/rack_test.rb

@@ -11,9 +11,15 @@ end
 module Rack
   class Request
     def initialize(env)
+      if env == :fake_env
+        @env = {}
+      else
+        @env = env
+      end
     end
+
     def path
-      '/path/to/resource.json'
+      @env[:path] || '/path/to/resource.json'
     end
   end
 end
@@ -54,6 +60,25 @@ class RackTest < TestCase
     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
 

data/test/test_helper.rb

@@ -28,9 +28,22 @@ require 'ruby-prof'
 require 'minitest/autorun'
 
 class TestCase < Minitest::Test
+  # I know this sucks, but ...
   def assert_nothing_raised(*)
     yield
   end
+
+  def before_setup
+    # make sure to exclude all threads except the one running the test
+    # minitest allocates a thread pool and they would otherwise show
+    # up in the profile data, breaking tests randomly
+    RubyProf.exclude_threads = Thread.list.select{|t| t != Thread.current}
+  end
+
+  def after_teardown
+    # reset exclude threads after testing
+    RubyProf.exclude_threads = nil
+  end
 end
 
 require File.expand_path('../prime', __FILE__)
@@ -85,22 +98,34 @@ module RubyProf
   end
 
   class C7
-    def self.hello
+    def self.busy_wait
       t = Time.now.to_f
       while Time.now.to_f - t < 0.1; end
     end
 
-    def hello
+    def self.sleep_wait
+      sleep 0.1
+    end
+
+    def busy_wait
       t = Time.now.to_f
       while Time.now.to_f - t < 0.2; end
     end
+
+    def sleep_wait
+      sleep 0.2
+    end
   end
 
   module M7
-    def hello
+    def busy_wait
       t = Time.now.to_f
       while Time.now.to_f - t < 0.3; end
     end
+
+    def sleep_wait
+      sleep 0.3
+    end
   end
 
   class C8

data/test/thread_test.rb

@@ -171,6 +171,7 @@ class ThreadTest < TestCase
     assert(timings[-1].total_time < seconds)
   end
 
+  # useless test: what does it test?
   def test_thread
     RubyProf.profile do
       begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-prof
 version: !ruby/object:Gem::Version
-  version: 0.15.9
+  version: 0.16.0
 platform: ruby
 authors:
 - Shugo Maeda, Charlie Savage, Roger Pack, Stefan Kaes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2016-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -144,6 +144,8 @@ files:
 - doc/js/searcher.js
 - doc/js/searcher.js.gz
 - doc/table_of_contents.html
+- examples/cachegrind.out.1
+- examples/cachegrind.out.1.32313213
 - examples/flat.txt
 - examples/graph.dot
 - examples/graph.html
@@ -261,7 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Fast Ruby profiler