rb-trace 0.5 → 0.6

data/.gitignore

@@ -1,2 +1,2 @@
-/*~
+*~
 /pkg

data/NEWS

@@ -1,4 +1,7 @@
-March 28 2011 (0.5)
+November 25, 2012 (0.6)
+  Revise for Ruby 1.9.3 p327. Stub C extension is used for 1.9.3.
+
+March 28, 2011 (0.5)
   Add YIELD event names
   Go over packaging
 

data/README.textile

@@ -1,2 +1,3 @@
-rb-trace adds a trace_hook object, translates hooks bitmasks to sets and vice versa, and extends set_trace_func to ignore frames or
-functions.
+_rb-trace_ adds a trace_hook object, translates hooks bitmasks to Ruby sets and vice versa, and extends _set_trace_func()_ to allow ignore specified frames or functions.
+
+See "this":https://github.com/rocky/rb-trace/wiki/irb-method%2C-class%2C-and-definition-capturing for a cool non-debugger use of this.

data/Rakefile

@@ -1,6 +1,7 @@
 #!/usr/bin/env rake
 # -*- Ruby -*-
 require 'rubygems'
+require 'fileutils'
 
 ROOT_DIR = File.dirname(__FILE__)
 Gemspec_filename='rb-trace.gemspec'
@@ -9,7 +10,7 @@ def gemspec
   @gemspec ||= eval(File.read(Gemspec_filename), binding, Gemspec_filename)
 end
 
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 desc "Build the gem"
 task :package=>:gem
 task :gem=>:gemspec do
@@ -45,11 +46,11 @@ Rake::TestTask.new(:'test:unit') do |t|
   t.options = '--verbose' if $VERBOSE
 end
 
-desc "Create the core ruby-debug shared library extension"
+desc "Create the core rb-trace shared library extension"
 task :ext do
   Dir.chdir('ext') do
     system("#{Gem.ruby} extconf.rb && make")
-  end
+  end if '1.9.2' == RUBY_VERSION
 end
 
 desc 'Remove built files'

data/ext/1.9.2/thread_pthread.h

@@ -0,0 +1,24 @@
+/**********************************************************************
+
+  thread_pthread.h -
+
+  $Author$
+
+  Copyright (C) 2004-2007 Koichi Sasada
+
+**********************************************************************/
+
+#ifndef RUBY_THREAD_PTHREAD_H
+#define RUBY_THREAD_PTHREAD_H
+
+#include <pthread.h>
+typedef pthread_t rb_thread_id_t;
+typedef pthread_mutex_t rb_thread_lock_t;
+typedef pthread_cond_t rb_thread_cond_t;
+
+typedef struct native_thread_data_struct {
+    void *signal_thread_list;
+    pthread_cond_t sleep_cond;
+} native_thread_data_t;
+
+#endif /* RUBY_THREAD_PTHREAD_H */

data/ext/{trace.c → 1.9.2/trace.c}

@@ -1,8 +1,6 @@
+#include "../version.h"
 #include "vm_core_mini.h"  /* Pulls in ruby.h */
 
-/* What release we got? */
-#define TRACE_VERSION "0.5"  
-
 extern VALUE rb_cRubyVM;   /* RubyVM class */
 extern rb_vm_t *ruby_current_vm;
 extern VALUE rb_obj_is_proc(VALUE proc);

data/ext/1.9.3/trace.c

@@ -0,0 +1,22 @@
+/* Ruby 1.9.3 doesn't need a C extension while 1.9.2 does. I can't figure
+   out a way build a gem so that it loads the C extension conditionally.
+   So instead we have a simple stupid stub extension. 
+
+   This as it is not elegant. 
+*/
+   
+#include <ruby.h>
+#include <ruby/version.h>
+#include <string.h>
+void
+Init_trace(void)
+{
+    if (0 == strncmp("1.9.2", ruby_version, sizeof("1.9.2")))
+    {
+	rb_raise(rb_eLoadError, 
+		 "Gem installed under Ruby 1.9.3 but this Ruby 1.9.2. Please reinstall 'rb-trace' gem under 1.9.2.");
+    } else if (0 == strncmp("1.9.3", ruby_version, sizeof("1.9.3"))) {
+	rb_raise(rb_eLoadError, 
+		 "Under Ruby 1.9.3 there is no reason to load this trace C extension.");
+    }
+}

data/ext/extconf.rb

@@ -1,8 +1,16 @@
 require "mkmf"
 
+fail "You need to install a threadframe-patched Ruby.
+See http://github.com/rocky/rb-threadframe/wiki/How-to-Install" unless 
+  RbConfig::CONFIG.member?('rb-threadframe')
+
+# Allow use customization of compile options. For example, the 
+# following lines could be put in config_options:
+# CONFIG['optflags'] = ''   # Or -O3
+# CONFIG['debugflags'] = '-g3 -ggdb' 
 config_file = File.join(File.dirname(__FILE__), 'config_options')
 load config_file if File.exist?(config_file)
 
 # Temporary: to turn off optimization
 # $CFLAGS='-fno-strict-aliasing -g -fPIC'
-create_makefile("trace")
+create_makefile('trace', RUBY_VERSION)

data/ext/version.h

@@ -0,0 +1,2 @@
+/* What release we got? */
+#define TRACE_VERSION "0.6"

data/lib/eventbuffer.rb

@@ -1,3 +1,4 @@
+#   Copyright (C) 2011 Rocky Bernstein <rockyb@rubyforge.net>
 module Trace
 
   class EventBuffer

data/lib/trace_mod.rb

@@ -1,4 +1,4 @@
-require_relative '../ext/trace'
+require_relative '../ext/trace' if '1.9.2' == RUBY_VERSION
 
 # A module for interfacing with Kernel::set_trace which adds
 # filtering of events inside Ruby (as opposed to inside your trace

data/lib/tracefilter.rb

@@ -1,3 +1,4 @@
+#  Copyright (C) 2011 Rocky Bernstein <rockyb@rubyforge.net>
 require 'set'
 # require '/src/external-vcs/rb-threadframe/ext/thread_frame'
 require 'thread_frame'
@@ -19,7 +20,7 @@ module Trace
       @excluded = Set.new(excluded_meths.map{|m| m.to_s})
     end
 
-    # +fn+ should be a RubyVM::ThreadFrame object or a Proc which has an
+    # +fn+ should be a RubyVM::Frame object or a Proc which has an
     # instruction sequence
     def valid_meth?(fn)
       fn.is_a?(Method)
@@ -56,10 +57,10 @@ module Trace
     end
 
     # A shim to convert between older-style trace hook call to newer
-    # style trace hook using RubyVM::ThreadFrame. Methods stored in 
+    # style trace hook using RubyVM::Frame. Methods stored in 
     # @+excluded+ are ignored.
     def trace_hook(event, file, line, id, binding, klass)
-      tf = RubyVM::ThreadFrame::current.prev
+      tf = RubyVM::Frame::current.prev
 
       # FIXME: Clean this mess up. And while your at it, understand
       # what's going on better.
@@ -81,7 +82,7 @@ module Trace
             # turning it off in the frame and frames called from that.
             # Example: if a trace hook yields to or calls a block
             # outside not derived from the frame, then tracing should
-            # start again.  But either way, since RubyVM::ThreadFrame
+            # start again.  But either way, since RubyVM::Frame
             # allows control over tracing *any* decision is not
             # irrevocable, just possibly unhelpful.
             tf_check.trace_off = true

data/rb-trace.gemspec

@@ -0,0 +1,38 @@
+# -*- Ruby -*-
+# -*- encoding: utf-8 -*-
+require 'rake'
+require 'rubygems' unless 
+  Object.const_defined?(:Gem)
+
+PACKAGE_VERSION = open('ext/version.h') do |f| 
+  f.grep(/^#define TRACE_VERSION/).first[/"(.+)"/,1]
+end
+
+spec = Gem::Specification.new do |spec|
+  spec.authors      = ['R. Bernstein']
+  spec.name         = 'rb-trace'
+  
+  spec.homepage     = 'https://github.com/rocky/rb-trace/wiki'
+  spec.summary      = 'Trace hook extensions'
+  spec.description  = <<-EOF
+
+rb-trace adds a trace_hook object, translates hooks bitmasks to Ruby sets and vice versa, and extends set_trace_func() to allow ignore specified frames or functions.
+EOF
+
+  spec.version      = PACKAGE_VERSION
+  spec.extensions   = ['ext/extconf.rb']
+
+  spec.email        = 'rockyb@rubyforge.org'
+  spec.platform     = Gem::Platform::RUBY
+  spec.files        = `git ls-files`.split("\n")
+  spec.add_dependency('rb-threadframe', '>= 0.39.9')
+
+  # spec.required_ruby_version = '~> 1.9.2frame'
+  spec.date = Time.now
+  # spec.rubyforge_project = 'rocky-hacks'
+  
+  # rdoc
+  spec.has_rdoc = true
+  # spec.extra_rdoc_files = ['README', 'threadframe.rd']
+end
+

data/test/unit/test-trace-hook.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 require 'test/unit'
-require_relative '../../ext/trace'
+require_relative '../../ext/trace' if '1.9.2' == RUBY_VERSION
 
 # Testing RubyVM::TraceHook
 class TestTraceHook < Test::Unit::TestCase

data/test/unit/test-trace_mod.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 require 'test/unit'
-require_relative '../../lib/trace_mod'
+require_relative '../../lib/trace_mod' if '1.9.2' == RUBY_VERSION
 
 # Testing Trace Module
 class TestTrace < Test::Unit::TestCase

data/test/unit/test-tracefilter.rb

@@ -60,7 +60,12 @@ class TestTraceFilter < Test::Unit::TestCase
 
     assert_equal(false, $events.empty?, 
                  'We should have gotting some trace output')
-    assert_equal([Kernel], $args,
+    if '1.9.3' == RUBY_VERSION
+      expected = [Kernel, Kernel]
+    else
+      expected = [Kernel]
+    end
+    assert_equal(expected, $args,
                  'C call/returns set $args')
 
     $line_nos.each_with_index do 

metadata

@@ -1,47 +1,44 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rb-trace
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 5
-  version: "0.5"
+version: !ruby/object:Gem::Version
+  version: '0.6'
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - R. Bernstein
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-28 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rb-threadframe
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 38
-        version: "0.38"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.39.9
   type: :runtime
-  version_requirements: *id001
-description: "\n\
-  rb-trace adds a trace_hook object, translates hooks bitmasks to sets\n\
-  and vice versa, and extends set_trace_func to ignore frames or\n\
-  functions.\n"
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.39.9
+description: ! '
+
+  rb-trace adds a trace_hook object, translates hooks bitmasks to Ruby sets and vice
+  versa, and extends set_trace_func() to allow ignore specified frames or functions.
+
+'
 email: rockyb@rubyforge.org
 executables: []
-
-extensions: 
+extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - ChangeLog
 - LICENSE
@@ -49,53 +46,46 @@ files:
 - README.textile
 - Rakefile
 - ext/.gitignore
+- ext/1.9.2/thread_pthread.h
+- ext/1.9.2/trace.c
+- ext/1.9.2/vm_core_mini.h
+- ext/1.9.3/trace.c
 - ext/extconf.rb
 - ext/thread_pthread.h
-- ext/trace.c
-- ext/vm_core_mini.h
+- ext/version.h
 - lib/.gitignore
 - lib/eventbuffer.rb
 - lib/trace.rb
 - lib/trace_mod.rb
 - lib/tracefilter.rb
+- rb-trace.gemspec
 - test/unit/.gitignore
 - test/unit/test-event2bitmask.rb
 - test/unit/test-trace-hook.rb
 - test/unit/test-trace_mod.rb
 - test/unit/test-tracefilter.rb
-has_rdoc: true
-homepage: http://github.com/rocky/rb-trace/tree/master
+homepage: https://github.com/rocky/rb-trace/wiki
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ~>
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 9
-      - 2frame
-      version: 1.9.2frame
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Trace hook extensions
 test_files: []
-