sender 1.1.4 → 1.2

data/CHANGELOG.rdoc

@@ -6,12 +6,19 @@ Initial release
 
 Minor detail changes
 
-=== 1.1.0 2010-06-24
+=== 1.1.0 2010-06-23
 
 Added :Kernel.backtrace.
 Added :Kernel.backtrace_includes?.
 Fixed external requirement of Ruby source directory. Gem should now install transparently and painlessly.
 
-=== 1.1.1-4 2010-06-24
+=== 1.1.1-4 2010-06-23
 
 Minor detail changes
+
+=== 1.1.2 2010-06-24
+
+Fixed __caller__.
+Observed that no backtrace is available for :initialize. For now this can be circumvented by subclassing new (make sure you call super);
+in the long term, I am investing what needs to be done for the special case. 
+

data/Manifest.txt

@@ -39,6 +39,5 @@ ext/sender/vm_insnhelper.h
 ext/sender/vm_opts.h
 lib/sender.rb
 lib/sender/sender.bundle
-mkmf.log
 sender.gemspec
 test/test_sender.rb

data/Rakefile

@@ -11,7 +11,7 @@ Hoe.spec 'sender' do
   self.spec_extras			= { :extensions => ["ext/sender/extconf.rb"] }
   self.extra_dev_deps << ['rake-compiler', '>= 0']  
 
-  self.version="1.1.4"
+  self.version="1.2"
 
   Rake::ExtensionTask.new( 'sender', spec ) do |ext|
     ext.lib_dir = File.join('lib', 'sender')

data/ext/sender/RPSender_internal.c

@@ -6,30 +6,32 @@
  *  framePriorToCurrent  *
  ************************/
 
-rb_control_frame_t* RPRuby_internal_framePriorTo( rb_control_frame_t* control_frame )	{
+rb_control_frame_t* RPRuby_internal_framePriorTo( rb_control_frame_t* c_control_frame )	{
 	
-	rb_thread_t*			c_thread				= GET_THREAD();
-	rb_control_frame_t*		prior_control_frame		= NULL;
+	rb_thread_t*			c_thread					= GET_THREAD();
+	rb_control_frame_t*		c_prior_control_frame		= NULL;
 	//	get the current frame pointer
-	if ( control_frame == NULL )	{
-		control_frame	= c_thread->cfp;
+	if ( c_control_frame == NULL )	{
+		c_control_frame	= c_thread->cfp;
 	}
 	
-    if ( ( prior_control_frame = rb_vm_get_ruby_level_next_cfp( c_thread, control_frame ) ) != 0) {
+    if ( ( c_prior_control_frame = rb_vm_get_ruby_level_next_cfp( c_thread, c_control_frame ) ) != 0) {
 		
-		prior_control_frame = RUBY_VM_PREVIOUS_CONTROL_FRAME( prior_control_frame );
+		//	not sure why we have to call this a second time after it was called at the end of rb_vm_get_ruby_level_next_cfp,
+		//	but for some reason it seems to be necessary
+		c_prior_control_frame = RUBY_VM_PREVIOUS_CONTROL_FRAME( c_prior_control_frame );
 
     }
 	else {
-		prior_control_frame = NULL;
+		c_prior_control_frame = NULL;
 	}
 	
 	//	if we have a nil object we've passed main, we're done
-	if ( prior_control_frame->self == Qnil )	{
+	if ( c_prior_control_frame->self == Qnil )	{
 		return NULL;
 	}
 
-	return prior_control_frame;
+	return c_prior_control_frame;
 	
 }
 

data/ext/sender/rb_Global.c

@@ -59,6 +59,14 @@ VALUE rb_RPRuby_Sender___sender__()	{
  */
 VALUE rb_RPRuby_Sender___caller__()	{
 
-	return ID2SYM( rb_frame_caller() );
+	//	get the frame prior to current frame
+	rb_control_frame_t*		c_sending_frame	=	RPRuby_internal_framePriorTo( NULL );
+	
+	//	make sure the current frame wasn't the first frame or return nil
+	if ( c_sending_frame == NULL )	{
+		return Qnil;
+	}
+	
+	return ID2SYM( frame_func_id( c_sending_frame ) );
 }
 

data/sender.gemspec

@@ -2,18 +2,18 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sender}
-  s.version = "1.1.4"
+  s.version = "1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Asher"]
-  s.date = %q{2010-06-23}
+  s.date = %q{2010-06-24}
   s.description = %q{Adds :__sender__ and :__caller__ to the built-in :__callee__ and :__method__ methods in Ruby 1.9.1, as well
 as providing object-oriented :backtrace supporting n-levels backward, and :backtrace_includes?,
 which allows contents of the backtrace to be queried.}
   s.email = ["asher@ridiculouspower.com"]
   s.extensions = ["ext/sender/extconf.rb"]
   s.extra_rdoc_files = ["Manifest.txt", "CHANGELOG.rdoc", "README.rdoc"]
-  s.files = [".autotest", "CHANGELOG.rdoc", "Makefile", "Manifest.txt", "README.rdoc", "Rakefile", "ext/sender/RPSender_internal.c", "ext/sender/RPSender_internal.h", "ext/sender/RubySourceSupport.c", "ext/sender/RubySourceSupport.h", "ext/sender/debug.h", "ext/sender/dln.h", "ext/sender/encdb.h", "ext/sender/eval_intern.h", "ext/sender/extconf.rb", "ext/sender/gc.h", "ext/sender/id.h", "ext/sender/iseq.h", "ext/sender/main.c", "ext/sender/node.h", "ext/sender/parse.h", "ext/sender/rb_Global.c", "ext/sender/rb_Global.h", "ext/sender/rb_Global_internal.h", "ext/sender/rb_Kernel.c", "ext/sender/rb_Kernel.h", "ext/sender/regenc.h", "ext/sender/regint.h", "ext/sender/regparse.h", "ext/sender/revision.h", "ext/sender/thread_pthread.h", "ext/sender/thread_win32.h", "ext/sender/transcode_data.h", "ext/sender/transdb.h", "ext/sender/version.h", "ext/sender/vm_core.h", "ext/sender/vm_exec.h", "ext/sender/vm_insnhelper.h", "ext/sender/vm_opts.h", "lib/sender.rb", "lib/sender/sender.bundle", "mkmf.log", "sender.gemspec", "test/test_sender.rb"]
+  s.files = [".autotest", "CHANGELOG.rdoc", "Makefile", "Manifest.txt", "README.rdoc", "Rakefile", "ext/sender/RPSender_internal.c", "ext/sender/RPSender_internal.h", "ext/sender/RubySourceSupport.c", "ext/sender/RubySourceSupport.h", "ext/sender/debug.h", "ext/sender/dln.h", "ext/sender/encdb.h", "ext/sender/eval_intern.h", "ext/sender/extconf.rb", "ext/sender/gc.h", "ext/sender/id.h", "ext/sender/iseq.h", "ext/sender/main.c", "ext/sender/node.h", "ext/sender/parse.h", "ext/sender/rb_Global.c", "ext/sender/rb_Global.h", "ext/sender/rb_Global_internal.h", "ext/sender/rb_Kernel.c", "ext/sender/rb_Kernel.h", "ext/sender/regenc.h", "ext/sender/regint.h", "ext/sender/regparse.h", "ext/sender/revision.h", "ext/sender/thread_pthread.h", "ext/sender/thread_win32.h", "ext/sender/transcode_data.h", "ext/sender/transdb.h", "ext/sender/version.h", "ext/sender/vm_core.h", "ext/sender/vm_exec.h", "ext/sender/vm_insnhelper.h", "ext/sender/vm_opts.h", "lib/sender.rb", "lib/sender/sender.bundle", "sender.gemspec", "test/test_sender.rb"]
   s.homepage = %q{http://rubygems.org/gems/sender}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]

data/test/test_sender.rb

@@ -8,7 +8,7 @@ class TestSender < Test::Unit::TestCase
   end
 
   def test___caller__
-    assert_equal :test___caller__, __caller__
+    assert_equal :run, __caller__
   end
 
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: sender
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 11
   prerelease: false
   segments: 
   - 1
-  - 1
-  - 4
-  version: 1.1.4
+  - 2
+  version: "1.2"
 platform: ruby
 authors: 
 - Asher
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-23 00:00:00 -04:00
+date: 2010-06-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -120,7 +119,6 @@ files:
 - ext/sender/vm_opts.h
 - lib/sender.rb
 - lib/sender/sender.bundle
-- mkmf.log
 - sender.gemspec
 - test/test_sender.rb
 has_rdoc: true

data/mkmf.log

@@ -1,41 +0,0 @@
-find_header: checking for eval_intern.h in /usr/src/ruby... -------------------- yes
-
-"gcc -o conftest -I/usr/local/include/ruby-1.9.1/i386-darwin10.4.0 -I/usr/local/include/ruby-1.9.1/ruby/backward -I/usr/local/include/ruby-1.9.1 -Iext/sender -I/usr/src/ruby/include  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE    -O2 -g -Wall -Wno-parentheses  -fno-common -pipe -fno-common conftest.c  -L. -L/usr/local/lib -L/usr/src/ruby/lib -L. -L/usr/local/lib     -lruby-static  -lpthread -ldl -lobjc  "
-checked program was:
-/* begin */
-1: #include "ruby.h"
-2: 
-3: int main() {return 0;}
-/* end */
-
-"gcc -E -I/usr/local/include/ruby-1.9.1/i386-darwin10.4.0 -I/usr/local/include/ruby-1.9.1/ruby/backward -I/usr/local/include/ruby-1.9.1 -Iext/sender -I/usr/src/ruby/include  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE    -O2 -g -Wall -Wno-parentheses  -fno-common -pipe -fno-common  conftest.c -o conftest.i"
-conftest.c:3:25: error: eval_intern.h: No such file or directory
-checked program was:
-/* begin */
-1: #include "ruby.h"
-2: 
-3: #include <eval_intern.h>
-/* end */
-
-"gcc -E -I/usr/local/include/ruby-1.9.1/i386-darwin10.4.0 -I/usr/local/include/ruby-1.9.1/ruby/backward -I/usr/local/include/ruby-1.9.1 -Iext/sender -I/usr/src/ruby/include  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE    -O2 -g -Wall -Wno-parentheses  -fno-common -pipe -fno-common -I/usr/src/ruby conftest.c -o conftest.i"
-checked program was:
-/* begin */
-1: #include "ruby.h"
-2: 
-3: #include <eval_intern.h>
-/* end */
-
---------------------
-
-find_header: checking for vm_exec.h in /usr/src/ruby... -------------------- yes
-
-"gcc -E -I/usr/local/include/ruby-1.9.1/i386-darwin10.4.0 -I/usr/local/include/ruby-1.9.1/ruby/backward -I/usr/local/include/ruby-1.9.1 -Iext/sender -I/usr/src/ruby -I/usr/src/ruby/include  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE    -O2 -g -Wall -Wno-parentheses  -fno-common -pipe -fno-common  conftest.c -o conftest.i"
-checked program was:
-/* begin */
-1: #include "ruby.h"
-2: 
-3: #include <vm_exec.h>
-/* end */
-
---------------------
-