ruby-prof 0.7.8 → 0.7.9

data/Rakefile

@@ -48,8 +48,8 @@ EOF
 
   spec.version = RUBY_PROF_VERSION
 
-  spec.author = "Shugo Maeda and Charlie Savage"
-  spec.email = "shugo@ruby-lang.org and cfis@savagexi.com"
+  spec.author = "Shugo Maeda, Charlie Savage, Roger Pack"
+  spec.email = "shugo@ruby-lang.org, cfis@savagexi.com, rogerdpack@gmail.com"
   spec.platform = Gem::Platform::RUBY
   spec.require_path = "lib" 
   spec.bindir = "bin"
@@ -62,9 +62,8 @@ EOF
   spec.required_ruby_version = '>= 1.8.4'
   spec.date = DateTime.now
   spec.rubyforge_project = 'ruby-prof'
+  spec.add_development_dependency 'os'
   
-  # rdoc
-  spec.has_rdoc = true
 end
 
 # Rake task to build the default package
@@ -124,8 +123,7 @@ end
 
 require 'fileutils'
 
-
-desc 'Build ruby_prof.so with debug symbols on'
+desc 'Build ruby_prof.so with debug output on'
 task :build do
  build(true)
 end
@@ -150,7 +148,6 @@ task :build_no_debug do
  build(false)
 end
 
-desc 'clean ext'
 task :clean do
  FileUtils.rm 'lib/ruby_prof.so' if File.exist? 'lib/ruby_prof.so'
  Dir.chdir('ext') do
@@ -162,4 +159,5 @@ task :clean do
     FileUtils.rm file
   end
  end
+ system("rm -rf pkg")
 end

data/ext/ruby_prof.c

@@ -1204,8 +1204,11 @@ prof_event_hook(rb_event_flag_t event, NODE *node, VALUE self, ID mid, VALUE kla
     {
         frame = pop_frame(thread_data, now);
 #ifdef RUBY_VM
-          // we need to go up the stack to find the right one [http://redmine.ruby-lang.org/issues/show/2610] (for now)
-        while( (frame->call_info->target->key->mid != mid) || (frame->call_info->target->key->klass != klass)){
+          // we need to walk up the stack to find the right one [http://redmine.ruby-lang.org/issues/show/2610] (for now)
+          // sometimes frames don't have line and source somehow [like blank]
+          // if we hit one there's not much we can do...I guess...
+          // or maybe we don't have one because we're at the top or something.
+        while( frame->call_info->target->key->mid && frame->call_info->target->key->klass && ((frame->call_info->target->key->mid != mid) || (frame->call_info->target->key->klass != klass))){
            frame = pop_frame(thread_data, now);
          }      
 #endif

data/ext/version.h

@@ -1,4 +1,4 @@
-#define RUBY_PROF_VERSION  "0.7.8"
+#define RUBY_PROF_VERSION  "0.7.9"
 #define RUBY_PROF_VERSION_MAJ   0
 #define RUBY_PROF_VERSION_MIN   7
-#define RUBY_PROF_VERSION_MIC   8
+#define RUBY_PROF_VERSION_MIC   9

data/test/exec_test.rb

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require 'os'
+
+# --  Test for bug when it loads with no frames
+
+class EnumerableTest < Test::Unit::TestCase
+  def test_being_able_to_run_its_binary
+    Dir.chdir(File.dirname(__FILE__)) do
+      assert system(OS.ruby_bin + " ruby-prof-bin do_nothing.rb")
+    end    
+  end
+end

data/test/ruby-prof-bin

@@ -0,0 +1,20 @@
+#!E:/installs/ruby191p376/bin/ruby.exe
+#
+# This file was generated by RubyGems.
+#
+# The application 'ruby-prof' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
+  version = $1
+  ARGV.shift
+end
+
+#gem 'ruby-prof', version
+$: << File.dirname(__FILE__) + '/../lib'
+load File.dirname(__FILE__) + '/../bin/ruby-prof'

metadata

@@ -1,18 +1,27 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-prof
 version: !ruby/object:Gem::Version 
-  version: 0.7.8
+  version: 0.7.9
 platform: ruby
 authors: 
-- Shugo Maeda and Charlie Savage
+- Shugo Maeda, Charlie Savage, Roger Pack
 autorequire: 
 bindir: bin
 cert_chain: []
 
 date: 2010-01-15 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: os
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: |
   ruby-prof is a fast code profiler for Ruby. It is a C extension and
   therefore is many times faster than the standard Ruby profiler. It
@@ -21,7 +30,7 @@ description: |
   methods it called. RubyProf generate both text and html and can output
   it to standard out or to a file.
 
-email: shugo@ruby-lang.org and cfis@savagexi.com
+email: shugo@ruby-lang.org, cfis@savagexi.com, rogerdpack@gmail.com
 executables: 
 - ruby-prof
 extensions: 
@@ -72,10 +81,12 @@ files:
 - test/aggregate_test.rb
 - test/basic_test.rb
 - test/current_failures_windows
+- test/do_nothing.rb
 - test/duplicate_names_test.rb
 - test/enumerable_test.rb
 - test/exceptions_test.rb
 - test/exclude_threads_test.rb
+- test/exec_test.rb
 - test/line_number_test.rb
 - test/measurement_test.rb
 - test/module_test.rb
@@ -84,6 +95,7 @@ files:
 - test/prime_test.rb
 - test/printers_test.rb
 - test/recursive_test.rb
+- test/ruby-prof-bin
 - test/singleton_test.rb
 - test/stack_test.rb
 - test/start_stop_test.rb