pry-exception_explorer 0.1.1pre7 → 0.1.1pre8

data/Rakefile

@@ -53,6 +53,20 @@ task :example_inline do
   sh "ruby -I#{direc}/lib/ #{direc}/examples/example_inline.rb "
 end
 
+desc "Run example C inline"
+task :example_c_inline do
+  require 'pry-exception_explorer/shim_builder'
+  binary_name = "lib_overrides.#{PryExceptionExplorer::ShimBuilder::Dyname}"
+  if RUBY_PLATFORM =~ /darwin/
+    ENV['DYLD_FORCE_FLAT_NAMESPACE'] = "1"
+    ENV['DYLD_INSERT_LIBRARIES'] = File.join PryExceptionExplorer::ShimBuilder.dir, binary_name
+  else
+    ENV['LD_PRELOAD'] = File.join PryExceptionExplorer::ShimBuilder.dir, binary_name
+  end
+
+  sh "ruby -I#{direc}/lib/ #{direc}/examples/example_c_inline.rb "
+end
+
 task :default => :test
 
 desc "Show version"

data/examples/example_c_inline.rb

@@ -0,0 +1,27 @@
+unless Object.const_defined? :PryExceptionExplorer
+  $:.unshift File.expand_path '../../lib', __FILE__
+  require 'pry'
+end
+
+require 'pry-exception_explorer'
+
+PryExceptionExplorer.enabled = true
+PryExceptionExplorer.intercept(NameError)
+
+def alpha
+  name = "john"
+  beta
+  puts name
+end
+
+def beta
+  x = 20
+  gamma
+  puts x
+end
+
+def gamma
+  UnknownConstant
+end
+
+alpha

data/lib/pry-exception_explorer.rb

@@ -99,13 +99,11 @@ module PryExceptionExplorer
     def intercept(*exceptions, &block)
       return if exceptions.empty? && block.nil?
 
-      options = (exceptions.pop if exceptions.last.is_a?(Hash)) || {}
-
       if !exceptions.empty?
         block = proc { |_, ex| exceptions.any? { |v| v === ex } }
       end
 
-      local_hash[:intercept_object] = Intercept.new(block, options)
+      local_hash[:intercept_object] = Intercept.new(block)
     end
 
     # @return [PryExceptionExplorer::Intercept] The object defined earlier by a call to `PryExceptionExplorer.intercept`.
@@ -131,6 +129,28 @@ module PryExceptionExplorer
       end
     end
 
+    # Amends (destructively) an exception call stack according to the info in
+    # `PryExceptionExplorer.intercept_object`, specifically
+    # `PryExceptionExplorer::Intercept#skip_until_block` and `PryExceptionExplorer::Intercept#skip_while_block`.
+    # @param [Exception] ex The exception whose call stack will be amended.
+    def amend_exception_call_stack!(ex)
+      call_stack = ex.exception_call_stack
+
+      if intercept_object.skip_until_block
+        idx = call_stack.each_with_index.find_index do |frame, idx|
+          intercept_object.skip_until_block.call(LazyFrame.new(frame, idx, call_stack))
+        end
+        call_stack = call_stack.drop(idx) if idx
+      elsif intercept_object.skip_while_block
+        idx = call_stack.each_with_index.find_index do |frame, idx|
+          intercept_object.skip_while_block.call(LazyFrame.new(frame, idx, call_stack)) == false
+        end
+        call_stack = call_stack.drop(idx) if idx
+      end
+
+      ex.exception_call_stack = call_stack
+    end
+
     # Prepare the `Pry` instance and associated call-stack when entering
     # into an exception context.
     # @param [Exception] ex The exception.
@@ -154,7 +174,7 @@ module PryExceptionExplorer
     def enter_exception(ex, options={})
       hooks = Pry.config.hooks.dup.add_hook(:before_session, :set_exception_flag) do |_, _, _pry_|
         setup_exception_context(ex, _pry_, options)
-      end.add_hook(:before_session, :manage_intercept_recurse) do 
+      end.add_hook(:before_session, :manage_intercept_recurse) do
         PryExceptionExplorer.intercept_object.disable! if !PryExceptionExplorer.intercept_object.intercept_recurse?
       end.add_hook(:after_session, :manage_intercept_recurse) do
         PryExceptionExplorer.intercept_object.enable! if !PryExceptionExplorer.intercept_object.active?

data/lib/pry-exception_explorer/cli.rb

@@ -26,6 +26,6 @@ Pry::CLI.add_options do
       ENV['LD_PRELOAD'] = File.join PryExceptionExplorer::ShimBuilder.dir, binary_name
     end
 
-    exec("pry")
+    exec("pry #{(ARGV - ["--c-exceptions"]).join(' ')}")
   end
 end

data/lib/pry-exception_explorer/commands.rb

@@ -16,6 +16,16 @@ module PryExceptionExplorer
     def enterable_exception?
       last_exception && last_exception.exception_call_stack
     end
+
+    def inline_exception?
+      frame_manager && frame_manager.user[:exception] &&
+        frame_manager.user[:inline_exception]
+    end
+
+    def normal_exception?
+      frame_manager && frame_manager.user[:exception] &&
+        frame_manager.user[:exception].continuation
+    end
   end
 
   Commands = Pry::CommandSet.new do
@@ -84,15 +94,6 @@ module PryExceptionExplorer
           raise Pry::CommandError, "No exception to continue!"
         end
       end
-
-      private
-      def inline_exception?
-        frame_manager && frame_manager.user[:exception] && frame_manager.user[:inline_exception]
-      end
-
-      def normal_exception?
-        frame_manager && frame_manager.user[:exception] && frame_manager.user[:exception].continuation
-      end
     end
 
   end

data/lib/pry-exception_explorer/core_ext.rb

@@ -31,12 +31,16 @@ class Object
     ex.set_backtrace(array)
 
     # revert to normal exception behaviour if EE not enabled.
-    if !PryExceptionExplorer.enabled?
+    if !PryExceptionExplorer.enabled? 
       return super(ex)
     end
 
+    intercept_object = PryExceptionExplorer.intercept_object
+    
     if PryExceptionExplorer.should_intercept_exception?(binding.of_caller(1), ex)
-      ex.exception_call_stack = binding.callers.tap { |v| v.shift(1 + PryExceptionExplorer.intercept_object.skip) }
+      ex.exception_call_stack = binding.callers.tap { |v| v.shift(1 + intercept_object.skip_num) }      
+      PryExceptionExplorer.amend_exception_call_stack!(ex)
+      
       ex.should_intercept     = true
 
       if !PryExceptionExplorer.wrap_active?

data/lib/pry-exception_explorer/intercept.rb

@@ -1,41 +1,75 @@
 module PryExceptionExplorer
   class Intercept
 
+    # @return [Proc] The predicate block that determines if
+    #   interception takes place.
+    attr_reader :block
+
     # @return [Fixnum] Number of frames to skip when session starts.
-    attr_accessor :skip
+    attr_reader :skip_num
+
+    # @return [Proc] The block that defines the frames to skip.
+    attr_reader :skip_while_block
 
-    # @return [Boolean] Whether to intercept exceptions raised inside the session.
-    attr_accessor :intercept_recurse
-    alias_method :intercept_recurse?, :intercept_recurse
+    # @return [Proc] The block that determines when to stop skipping frames.
+    attr_reader :skip_until_block
 
     # @return [Boolean] Whether this intercept object is active
     #   If it's inactive then calling it will always return `false`
     #   regardless of content inside block.
-    def active?() @active end
+    def active?() !!@active end
 
     # Disable the intercept object.
-    def disable!() @active = false end
+    # @return [PryExceptionExplorer::Intercept] The receiver
+    def disable!() tap { @active = false } end
 
     # Enable if the intercept object.
-    def enable!() @active = true end
-    
-    # @return [Proc] The predicate block that determines if
-    #   interception takes place.
-    attr_reader :block
+    # @return [PryExceptionExplorer::Intercept] The receiver
+    def enable!() tap { @active = true } end
+
+    # @param [Fixnum] num Number of frames to skip when session
+    #   starts.
+    # @return [PryExceptionExplorer::Intercept] The receiver
+    def skip(num) tap { @skip_num = num } end
+
+    # @yield [lazy_frame] The block that defines the frames to
+    #  skip. The Pry session will start on the first frame for which
+    #  this block evalutes to `false`.
+    # @yieldparam [PryExceptionExplorer::LazyFrame] lazy_frame
+    # @yieldreturn [Boolean]
+    # @return [PryExceptionExplorer::Intercept] The receiver
+    def skip_while(&block) tap { @skip_while_block = block } end
+
+    # @yield [lazy_frame] The block that determines when to stop skipping frames.
+    #  The Pry session will start on the first frame for which
+    #  this block evalutes to `true`.
+    # @yieldparam [PryExceptionExplorer::LazyFrame] lazy_frame
+    # @yieldreturn [Boolean]
+    # @return [PryExceptionExplorer::Intercept] The receiver
+    def skip_until(&block) tap { @skip_until_block = block } end
+
+    # @param [Boolean] should_recurse Whether to intercept exceptions
+    #   raised inside the session.
+    # @return [PryExceptionExplorer::Intercept] The receiver
+    def intercept_recurse(should_recurse) tap { @intercept_recurse = should_recurse } end
 
-    def initialize(block, options={})
-      options = {
-        :skip              => 0,
-        :intercept_recurse => false
-      }.merge!(options)
+    # @return [Boolean] Whether exceptions raised inside the session
+    #   will be intercepted.
+    def intercept_recurse?() !!@intercept_recurse end
 
-      @block = block
-      @skip  = options[:skip]
-      @intercept_recurse = options[:intercept_recurse]
+    def initialize(block)
+      skip(0)
+      intercept_recurse(false)
 
+      @block  = block
       @active = true
     end
 
+    # Invoke the associated block for this
+    # `PryExceptionExplorer::Intercept` object. Note that the block is
+    # not invoked if the intercept object is inactive.
+    # @param [Array] args The parameters to
+    # @return [Boolean] Determines whether a given exception should be intercepted.
     def call(*args)
       active? && @block.call(*args)
     end

data/lib/pry-exception_explorer/lazy_frame.rb

@@ -1,17 +1,19 @@
 module PryExceptionExplorer
   class LazyFrame
+    class NullFrame
+      def klass() nil end
+      def self() nil end
+      def method_name() nil end
+      def prev() self end
+    end
 
     # we need to jump over a few irrelevant frames to begin with
     START_FRAME_OFFSET = 6
 
-    def initialize(frame, frame_counter = 0)
+    def initialize(frame, frame_counter = 0, call_stack = nil)
       @frame         = frame
       @frame_counter = frame_counter
-    end
-
-    # @return [Binding] The `Binding` object that represents the frame.
-    def raw_frame
-      @frame
+      @call_stack    = call_stack
     end
 
     # @return [Class] The class of the `self` of the frame.
@@ -31,7 +33,15 @@ module PryExceptionExplorer
 
     # @return [LazyFrame] The caller frame.
     def prev
-      LazyFrame.new(binding.of_caller(@frame_counter + START_FRAME_OFFSET), @frame_counter + 1)
+      if @call_stack
+        if @frame_counter < (@call_stack.size - 1)
+          LazyFrame.new(@call_stack[@frame_counter + 1], @frame_counter + 1, @call_stack)
+        else
+          NullFrame.new
+        end
+      else
+        LazyFrame.new(binding.of_caller(@frame_counter + START_FRAME_OFFSET), @frame_counter + 1)
+      end
     end
   end
 end

data/lib/pry-exception_explorer/shim_builder.rb

@@ -2,12 +2,14 @@ require 'rbconfig'
 require 'fileutils'
 
 module PryExceptionExplorer
+  CompileError = Class.new(StandardError)
+
   module ShimBuilder
     class << self
       attr_reader :dir, :file
     end
 
-    @dir = File.expand_path('~/.pry-exception_explorer')
+    @dir = File.expand_path("~/.pry-exception_explorer/#{RUBY_VERSION}")
     @file = File.join(@dir, "raise_shim.c")
 
     if RUBY_PLATFORM =~ /darwin/
@@ -26,27 +28,15 @@ module PryExceptionExplorer
 void
 rb_raise(unsigned long exc, const char *fmt, ...)
 {
-  static void (*libruby_rb_raise)
-    (unsigned long exc, const char *fmt, ...) = NULL;
-
-  void * handle;
-  char * error;
-
-  if (!libruby_rb_raise) {
-    handle = dlopen("#{RbConfig::CONFIG['libdir']}/libruby.#{Dyname}", RTLD_LAZY);
-    if (!handle) {
-      fputs(dlerror(), stderr);
-      exit(1);
-    }
-    libruby_rb_raise = dlsym(handle, "rb_raise");
-    if ((error = dlerror()) != NULL) {
-      fprintf(stderr, "%s", error);
-      exit(1);
-    }
-  }
-
   rb_funcall(rb_cObject, rb_intern("raise"), 2, exc, rb_str_new2("hooked exception (pry)"));
 }
+
+void
+rb_name_error(ID id, const char *fmt, ...)
+{
+  rb_funcall(rb_cObject, rb_intern("raise"), 2, rb_eNameError, rb_str_new2("hooked exception (pry)"));
+}
+
 EOF
 
     def self.create_directory_and_source_file
@@ -74,7 +64,9 @@ EOF
       end
 
       FileUtils.chdir @dir do
-        system(compile_line)
+        if !system(compile_line)
+          raise CompileError, "There was a problem building the shim, aborted!"
+        end
       end
 
     end

data/lib/pry-exception_explorer/version.rb

@@ -1,3 +1,3 @@
 module PryExceptionExplorer
-  VERSION = "0.1.1pre7"
+  VERSION = "0.1.1pre8"
 end

data/pry-exception_explorer.gemspec

@@ -2,14 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name = "pry-exception_explorer"
-  s.version = "0.1.1pre6"
+  s.version = "0.1.1pre8"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Mair (banisterfiend)"]
-  s.date = "2012-01-28"
+  s.date = "2012-01-31"
   s.description = "Enter the context of exceptions"
   s.email = "jrmair@gmail.com"
-  s.files = [".gemtest", ".gitignore", ".travis.yml", ".yardopts", "CHANGELOG", "Gemfile", "LICENSE", "README.md", "Rakefile", "examples/example_inline.rb", "examples/example_wrap.rb", "lib/pry-exception_explorer.rb", "lib/pry-exception_explorer/cli.rb", "lib/pry-exception_explorer/commands.rb", "lib/pry-exception_explorer/core_ext.rb", "lib/pry-exception_explorer/intercept.rb", "lib/pry-exception_explorer/lazy_frame.rb", "lib/pry-exception_explorer/shim_builder.rb", "lib/pry-exception_explorer/version.rb", "pry-exception_explorer.gemspec", "test/helper.rb", "test/test_exceptions_in_pry.rb", "test/test_inline_exceptions.rb", "test/test_wrapped_exceptions.rb"]
+  s.files = [".gemtest", ".gitignore", ".travis.yml", ".yardopts", "CHANGELOG", "Gemfile", "LICENSE", "README.md", "Rakefile", "examples/example_c_inline.rb", "examples/example_inline.rb", "examples/example_wrap.rb", "lib/pry-exception_explorer.rb", "lib/pry-exception_explorer/cli.rb", "lib/pry-exception_explorer/commands.rb", "lib/pry-exception_explorer/core_ext.rb", "lib/pry-exception_explorer/intercept.rb", "lib/pry-exception_explorer/lazy_frame.rb", "lib/pry-exception_explorer/shim_builder.rb", "lib/pry-exception_explorer/version.rb", "pry-exception_explorer.gemspec", "test/helper.rb", "test/test_exceptions_in_pry.rb", "test/test_inline_exceptions.rb", "test/test_wrapped_exceptions.rb"]
   s.homepage = "https://github.com/banister/pry-exception_explorer"
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.11"

data/test/test_inline_exceptions.rb

@@ -69,31 +69,31 @@ describe PryExceptionExplorer do
                                         "O.after_self = self",
                                         "continue-exception",
                                         "continue-exception")) do
-          Ratty.new.ratty 
+          Ratty.new.ratty
         end
 
         O.before_self.should == O.after_self
       end
 
       it 'should allow recursive (in-session) interceptions when :intercept_recurse => true' do
-        EE.intercept(:intercept_recurse => true) { |frame, ex| frame.klass == Toad }
+        EE.intercept { |frame, ex| frame.klass == Toad }.intercept_recurse(true)
 
         redirect_pry_io(InputTester.new("O.before_self = self",
                                         "Ratty.new.ratty",
                                         "O.after_self = self",
                                         "continue-exception",
                                         "continue-exception")) do
-          Ratty.new.ratty 
+          Ratty.new.ratty
         end
 
         O.before_self.should.not == O.after_self
       end
-      
+
     end
 
     describe "skip" do
       it 'should skip first frame with :skip => 1' do
-        EE.intercept(:skip => 1) { |frame, ex| frame.klass == Toad }
+        EE.intercept { |frame, ex| frame.klass == Toad }.skip(1)
 
         redirect_pry_io(InputTester.new("O.method_name = __method__",
                                         "continue-exception")) do
@@ -104,7 +104,7 @@ describe PryExceptionExplorer do
       end
 
       it 'should skip first two framed with :skip => 2' do
-        EE.intercept(:skip => 2) { |frame, ex| frame.klass == Toad }
+        EE.intercept { |frame, ex| frame.klass == Toad }.skip(2)
 
         redirect_pry_io(InputTester.new("O.method_name = __method__",
                                         "continue-exception")) do
@@ -115,6 +115,54 @@ describe PryExceptionExplorer do
       end
     end
 
+    describe "skip_until" do
+      it 'should skip frames until it finds a frame that meets the predicate' do
+        EE.intercept { |frame, ex| frame.klass == Toad }.skip_until { |frame| frame.prev.method_name == :ratty }
+
+        redirect_pry_io(InputTester.new("O.method_name = __method__",
+                                        "continue-exception")) do
+          Ratty.new.ratty
+        end
+
+        O.method_name.should == :weasel
+      end
+
+      it 'should not skip any frames if predicate not met' do
+        EE.intercept { |frame, ex| frame.klass == Toad }.skip_until { |frame| frame.prev.method_name == :will_not_be_matched }
+
+        redirect_pry_io(InputTester.new("O.method_name = __method__",
+                                        "continue-exception")) do
+          Ratty.new.ratty
+        end
+
+        O.method_name.should == :toad
+      end
+    end
+
+    describe "skip_while" do
+      it 'should skip frames while no frames meets the predicate' do
+        EE.intercept { |frame, ex| frame.klass == Toad }.skip_while { |frame| frame.prev.method_name != :ratty }
+
+        redirect_pry_io(InputTester.new("O.method_name = __method__",
+                                        "continue-exception")) do
+          Ratty.new.ratty
+        end
+
+        O.method_name.should == :weasel
+      end
+
+      it 'should not skip any frames if predicate not met' do
+        EE.intercept { |frame, ex| frame.klass == Toad }.skip_while { |frame| frame.prev.method_name != :will_not_be_matched }
+
+        redirect_pry_io(InputTester.new("O.method_name = __method__",
+                                        "continue-exception")) do
+          Ratty.new.ratty
+        end
+
+        O.method_name.should == :toad
+      end
+    end
+
     describe "special case exception-only syntax" do
 
       describe "single exception" do

metadata

@@ -1,55 +1,59 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: pry-exception_explorer
-version: !ruby/object:Gem::Version
-  version: 0.1.1pre7
+version: !ruby/object:Gem::Version 
   prerelease: 5
+  version: 0.1.1pre8
 platform: ruby
-authors:
+authors: 
 - John Mair (banisterfiend)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-28 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-01-31 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: pry-stack_explorer
-  requirement: &70111600095300 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70111600095300
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: bacon
-  requirement: &70111600094500 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.1.0
   type: :development
-  prerelease: false
-  version_requirements: *70111600094500
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &70111600093540 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
+      - !ruby/object:Gem::Version 
+        version: "0.9"
   type: :development
-  prerelease: false
-  version_requirements: *70111600093540
+  version_requirements: *id003
 description: Enter the context of exceptions
 email: jrmair@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gemtest
 - .gitignore
 - .travis.yml
@@ -59,6 +63,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- examples/example_c_inline.rb
 - examples/example_inline.rb
 - examples/example_wrap.rb
 - lib/pry-exception_explorer.rb
@@ -76,29 +81,32 @@ files:
 - test/test_wrapped_exceptions.rb
 homepage: https://github.com/banister/pry-exception_explorer
 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
-      version: '0'
-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
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
       version: 1.3.1
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Enter the context of exceptions
-test_files:
+test_files: 
 - test/helper.rb
 - test/test_exceptions_in_pry.rb
 - test/test_inline_exceptions.rb