rb-threadframe 0.32 → 0.33

data/Makefile

@@ -0,0 +1,14 @@
+# I'll admit it -- I'm an absent-minded old-timer who has trouble
+# learning new tricks.
+.PHONY: all test
+
+all: test
+	rake $@
+
+check: 
+	rake test
+test: 
+	rake test
+
+%: 
+	rake $@

data/NEWS

@@ -1,2 +1,7 @@
+October 27 2010 (0.33)
+- Revise rvm install script to be more roboust
+- Change bug report location so we don't spam Ruby's redmine 
+- Add RubyVM::InstructionSequence#parent and #local_iseq fields
+
 September 12 2010 (0.32)
-  First release on gemcutter
+-  First release on gemcutter

data/Rakefile

@@ -1,30 +1,35 @@
 #!/usr/bin/env rake
 # -*- Ruby -*-
 require 'rubygems'
-require 'rake'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
-require 'rake/testtask'
+require 'fileutils'
 
-rake_dir = File.dirname(__FILE__)
+ROOT_DIR = File.dirname(__FILE__)
 
 require 'rbconfig'
 RUBY_PATH = File.join(RbConfig::CONFIG['bindir'],  
                       RbConfig::CONFIG['RUBY_INSTALL_NAME'])
 
-SO_NAME = 'thread_frame.so'
+def gemspec
+  @gemspec ||= eval(File.read('.gemspec'), binding, '.gemspec')
+end
 
-PACKAGE_VERSION = open("ext/thread_frame.c") do |f| 
-  f.grep(/^#define THREADFRAME_VERSION/).first[/"(.+)"/,1]
+require 'rake/gempackagetask'
+desc "Build the gem"
+task :package=>:gem
+task :gem=>:gemspec do
+  Dir.chdir(ROOT_DIR) do
+    sh "gem build .gemspec"
+    FileUtils.mkdir_p 'pkg'
+    FileUtils.mv "#{gemspec.name}-#{gemspec.version}.gem", 'pkg'
+  end
 end
 
-EXT_FILES     = FileList[%w(ext/*.c ext/*.h)]
-INCLUDE_FILES = FileList['include/*.h']
-LIB_FILES     = FileList['lib/*.rb']
-TEST_FILES    = FileList['test/**/*.rb']
-COMMON_FILES  = FileList[%w(README.md Rakefile LICENSE NEWS)]
-ALL_FILES     = COMMON_FILES + INCLUDE_FILES + LIB_FILES + EXT_FILES + 
-  TEST_FILES
+desc "Install the gem locally"
+task :install => :gem do
+  Dir.chdir(ROOT_DIR) do
+    sh %{gem install --local pkg/#{gemspec.name}-#{gemspec.version}}
+  end
+end
 
 desc 'Create the core thread-frame shared library extension'
 task :ext do
@@ -35,7 +40,7 @@ end
 
 desc 'Remove built files'
 task :clean do
-  cd 'ext' do
+  Dir.chdir File.join(ROOT_DIR, 'ext') do
     if File.exist?('Makefile')
       sh 'make clean'
       rm 'Makefile'
@@ -62,6 +67,7 @@ end
 
 task :default => [:test]
 
+require 'rake/testtask'
 desc 'Test units - the smaller tests'
 task :'test:unit' => [:ext] do |t|
   Rake::TestTask.new(:'test:unit') do |t|
@@ -87,76 +93,39 @@ task :test do
   raise "Test failures" unless exceptions.empty?
 end
 
-desc "Test everything - same as test."
-
+desc "test in isolation."
 task :'check' do
-  run_standalone_ruby_file(File.join(%W(#{rake_dir} test unit)))
+  run_standalone_ruby_file(File.join(%W(#{ROOT_DIR} test unit)))
+end
+
+desc "Generate the gemspec"
+task :generate do
+  puts gemspec.to_ruby
+end
+
+desc "Validate the gemspec"
+task :gemspec do
+  gemspec.validate
 end
 
 # ---------  RDoc Documentation ------
+require 'rake/rdoctask'
 desc 'Generate rdoc documentation'
 Rake::RDocTask.new('rdoc') do |rdoc|
-  rdoc.rdoc_dir = 'doc/rdoc'
+  rdoc.rdoc_dir = 'doc'
   rdoc.title    = 'rb-threadframe'
-  # Show source inline with line numbers
-  rdoc.options << '--inline-source' << '--line-numbers'
   # Make the readme file the start page for the generated html
-  rdoc.options << '--main' << 'README.md'
+  rdoc.options += %w(--main  README.md)
   rdoc.rdoc_files.include('ext/**/*.c',
                           'README.md')
 end
+desc "Same as rdoc"
+task :doc => :rdoc
 
-# Base GEM Specification
-spec = Gem::Specification.new do |spec|
-  spec.name = "rb-threadframe"
-  
-  spec.homepage = "http://github.com/rocky/rb-threadframe/tree/master"
-  spec.summary = "Frame introspection"
-  spec.description = <<-EOF
-
-rb-threadframe gives introspection access for frames of a thread.
-EOF
-
-  spec.version = PACKAGE_VERSION
-  spec.require_path = 'lib'
-  spec.extensions = ["ext/extconf.rb"]
-
-  spec.author = "R. Bernstein"
-  spec.email = "rocky@gnu.org"
-  spec.platform = Gem::Platform::RUBY
-  spec.files = ALL_FILES.to_a  
-
-  spec.required_ruby_version = '>= 1.9.2'
-  spec.date = Time.now
-  # spec.rubyforge_project = 'rocky-hacks'
-  
-  # rdoc
-  spec.has_rdoc = true
-  spec.extra_rdoc_files = ['README.md', 'threadframe.rd'] + 
-                           FileList['ext/*.c']
-end
-
-# Rake task to build the default package
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.need_tar = true
+task :clobber_package do
+  FileUtils.rm_rf File.join(ROOT_DIR, 'pkg')
 end
 
-def install(spec, *opts)
-  args = ['gem', 'install', "pkg/#{spec.name}-#{spec.version}.gem"] + opts
-  system(*args)
+task :clobber_rdoc do
+  FileUtils.rm_rf File.join(ROOT_DIR, 'doc')
 end
-
-desc 'Install locally'
-task :install => :package do
-  Dir.chdir(File::dirname(__FILE__)) do
-    # ri and rdoc take lots of time
-    install(spec, '--no-ri', '--no-rdoc')
-  end
-end    
-
-task :install_full => :package do
-  Dir.chdir(File::dirname(__FILE__)) do
-    install(spec)
-  end
-end    
-

data/ext/iseq_extra.c

@@ -5,7 +5,8 @@
 /* 
  *  Additions to the RubyVM::InstructionSequence class
  */
-VALUE rb_cIseq = rb_define_class_under(rb_cRubyVM, "InstructionSequence", ...)
+VALUE rb_cIseq = rb_define_class_under(rb_cRubyVM, "InstructionSequence", 
+				       rb_cObject);
 #endif
 
 #include "../include/vm_core_mini.h"   /* Pulls in ruby.h and node.h */
@@ -103,6 +104,35 @@ iseq_equal(VALUE iseqval1, VALUE iseqval2)
 	return Qfalse;
 }
 
+VALUE 
+iseq_parent(VALUE self)
+{
+    rb_iseq_t *piseq;
+    rb_iseq_t *parent_iseq;
+    VALUE parent_iseqval;
+    GetISeqPtr(self, piseq);
+
+    if (!RTEST(piseq->parent_iseq)) return Qnil;
+    parent_iseqval = iseq_alloc_shared(rb_cISeq);
+    GetISeqPtr(parent_iseqval, parent_iseq);
+    memcpy(parent_iseq, piseq->parent_iseq, sizeof(struct rb_iseq_struct));
+    return parent_iseqval;
+}
+
+VALUE 
+iseq_local_iseq(VALUE self)
+{
+    rb_iseq_t *piseq;
+    rb_iseq_t *local_iseq;
+    VALUE local_iseqval;
+    GetISeqPtr(self, piseq);
+
+    if (!RTEST(piseq->local_iseq)) return Qnil;
+    local_iseqval = iseq_alloc_shared(rb_cISeq);
+    GetISeqPtr(local_iseqval, local_iseq);
+    memcpy(local_iseq, piseq->local_iseq, sizeof(struct rb_iseq_struct));
+    return local_iseqval;
+}
 
 /* 
  * call-seq:
@@ -390,12 +420,14 @@ Init_iseq_extra(void)
     rb_define_method(rb_cISeq, "klass",            iseq_klass, 0) ;
     rb_define_method(rb_cISeq, "lineno",           iseq_line_no, 0) ;
     rb_define_method(rb_cISeq, "line_range",       iseq_line_range, 0) ;
+    rb_define_method(rb_cISeq, "local_iseq",       iseq_local_iseq, 0) ;
     rb_define_method(rb_cISeq, "local_name",       iseq_local_name, 1) ;
     rb_define_method(rb_cISeq, "local_size",       iseq_local_size, 0) ;
     rb_define_method(rb_cISeq, "local_table_size", iseq_local_table_size, 0) ;
     rb_define_method(rb_cISeq, "offset2lines",     iseq_offset2lines, 1) ;
     rb_define_method(rb_cISeq, "offsetlines",      iseq_offsetlines, 0) ;
     rb_define_method(rb_cISeq, "orig",             iseq_orig, 0) ;
+    rb_define_method(rb_cISeq, "parent",           iseq_parent, 0) ;
     rb_define_method(rb_cISeq, "name",             iseq_name, 0) ;
     rb_define_method(rb_cISeq, "self",             iseq_self, 0) ;
     rb_define_method(rb_cISeq, "source_container", iseq_source_container, 0) ;

data/ext/thread_frame.c

@@ -6,7 +6,7 @@
  */
 
 /* What release we got? */
-#define THREADFRAME_VERSION "0.32"  
+#define THREADFRAME_VERSION "0.33"
 
 #include <string.h>
 #include "../include/vm_core_mini.h"   /* Pulls in ruby.h and node.h */

data/include/vm_core_mini.h

@@ -134,7 +134,7 @@ typedef struct rb_iseq_struct {
      *  arg_block      = M+N + 1 + O + 1 // -1 if no block arg
      *  arg_simple     = 0 if not simple arguments.
      *                 = 1 if no opt, rest, post, block.
-     *                 = 2 if ambiguos block parameter ({|a|}).
+     *                 = 2 if ambiguous block parameter ({|a|}).
      *  arg_size       = argument size.
      */
 

data/test/unit/test-lib-iseq-extra.rb

@@ -54,4 +54,12 @@ class TestLibISeqExtra < Test::Unit::TestCase
     assert_equal(0, sha1 =~ /^[0-9a-f]+$/)
   end
 
+  def test_iseq_parent
+    parent_iseq = RubyVM::ThreadFrame::current.iseq
+    1.times do 
+      tf = RubyVM::ThreadFrame::current
+      assert_equal(true, tf.iseq.parent.equal?(parent_iseq))
+    end
+  end
+
 end

metadata

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 32
-  version: "0.32"
+  - 33
+  version: "0.33"
 platform: ruby
 authors: 
 - R. Bernstein
@@ -13,13 +13,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-12 00:00:00 -04:00
+date: 2010-10-27 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
 description: "\n\
   rb-threadframe gives introspection access for frames of a thread.\n"
-email: rocky@gnu.org
+email: rockyb@rubyforge.net
 executables: []
 
 extensions: 
@@ -27,13 +27,10 @@ extensions:
 extra_rdoc_files: 
 - README.md
 - threadframe.rd
-- ext/iseq_extra.c
-- ext/thread_frame.c
-- ext/proc_extra.c
-- ext/thread_extra.c
 files: 
 - README.md
 - Rakefile
+- Makefile
 - LICENSE
 - NEWS
 - include/thread_pthread.h
@@ -74,17 +71,20 @@ files:
 - ext/extconf.rb
 has_rdoc: true
 homepage: http://github.com/rocky/rb-threadframe/tree/master
-licenses: []
-
+licenses: 
+- MIT
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --main
+- README.md
+- --title
+- ThreadFrame 0.33 Documentation
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - "="
     - !ruby/object:Gem::Version 
       segments: 
       - 1