byebug 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dee4a41cee3ad39319608f90aa34ca73e6b3578
-  data.tar.gz: e2434363c37285a549aaabbd236dd7c832f460e8
+  metadata.gz: d0bd29ed7fa0a4c5e980c3f90ea5187a0723d1ea
+  data.tar.gz: 177807eb3c0b4b5bf8befb1e196457dc7fbd89ad
 SHA512:
-  metadata.gz: f2967314e28007dc029dca83fff42fad6b494483a4e14ebc6ffa4aa2f3b2433797cc113fb1f575db2cb52b7f14656dd047fef1f07550f3e772a68ffc2eb7da99
-  data.tar.gz: f8c59999bfc524f43d8b925a092f7a26831b173b85d4c1d3ab80448be02bbb95707bc9ec7e82b1cba63851c089c7fd61e9a4224c9a92c4b469a263e21f10e81d
+  metadata.gz: 379441b4bb0d2ab10d3a547757f0c3921e2043cda11883c2449243d747bb17d5cc4c81093d6f476225801fe1d41494285bf5953f642458e581673f0bc77682c4
+  data.tar.gz: 9401628eaeae78d332c03bf97d2c2e61093b79cf7bb73b23fe3658130126f6ff3321eee3c4da141340f5e387a87f93b6b08f1f149bdd6aa0cc70a4fcd63e26f7

data/.travis.yml

@@ -1,6 +1,7 @@
-before_script: rake compile
+before_script: bundle exec rake compile
 rvm:
 - 2.0.0
+- 2.1.0
 - ruby-head
 matrix:
   allow_failures:

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 2.6.0
+
+* Fix circular dependency that was affecting `pry-byebug`, thanks @andreychernih
+
+
 # 2.5.0
 
 * Support for `sublime-debugger`

data/README.md

@@ -1,7 +1,10 @@
-# Byebug [![Gem Version][1]][2] [![Build Status][3]][4] [![Code Climate][5]][6] [![Dependency Status][7]][8]
-
-<img src="https://raw.github.com/deivid-rodriguez/byebug/master/logo.png"
-     alt="Byebug logo" align="right" style="margin-left: 10px" />
+# Byebug
+[![Version][VersionBadge]][VersionURL]
+[![Build][TravisBadge]][TravisURL]
+[![Climate][CodeClimateBadge]][CodeClimateURL]
+[![Dependencies][GemnasiumBadge]][GemnasiumURL]
+[![Coverage][CoverallsBadge]][CoverallsURL]
+[![Gittip][GittipBadge]][GittipURL]
 
 _Debugging in Ruby 2_
 
@@ -148,14 +151,17 @@ software, specially:
 * Koichi Sasada, author of the new C debugging API for Ruby.
 * Dennis Ushakov, author of [debase](https://github.com/denofevil/debase), the
 starting point of this.
-* Logo by [Ivlichev Victor Petrovich](http://www.aha-soft.com/)
 * @kevjames3 for testing, bug reports and the interest in the project.
 
-[1]: https://badge.fury.io/rb/byebug.png
-[2]: http://badge.fury.io/rb/byebug
-[3]: https://secure.travis-ci.org/deivid-rodriguez/byebug.png
-[4]: http://travis-ci.org/deivid-rodriguez/byebug
-[5]: https://codeclimate.com/github/deivid-rodriguez/byebug.png
-[6]: https://codeclimate.com/github/deivid-rodriguez/byebug
-[7]: https://gemnasium.com/deivid-rodriguez/byebug.png
-[8]: https://gemnasium.com/deivid-rodriguez/byebug
+[VersionBadge]: https://badge.fury.io/rb/byebug.png
+[VersionURL]: http://badge.fury.io/rb/byebug
+[TravisBadge]: https://travis-ci.org/deivid-rodriguez/byebug.png
+[TravisURL]: http://travis-ci.org/deivid-rodriguez/byebug
+[CodeClimateBadge]: https://codeclimate.com/github/deivid-rodriguez/byebug.png
+[CodeClimateURL]: https://codeclimate.com/github/deivid-rodriguez/byebug
+[GemnasiumBadge]: https://gemnasium.com/deivid-rodriguez/byebug.png
+[GemnasiumURL]: https://gemnasium.com/deivid-rodriguez/byebug
+[CoverallsBadge]: https://coveralls.io/repos/deivid-rodriguez/byebug/badge.png
+[CoverallsURL]: https://coveralls.io/r/deivid-rodriguez/byebug
+[GittipBadge]: http://img.shields.io/gittip/deivid-rodriguez.png
+[GittipURL]: https://www.gittip.com/deivid-rodriguez

data/byebug.gemspec

@@ -23,11 +23,12 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = ['README.md']
   s.extensions       = ['ext/byebug/extconf.rb']
 
-  s.add_dependency "columnize", "~> 0.3.6"
-  s.add_dependency "debugger-linecache", '~> 1.2.0'
+  s.add_dependency 'columnize', '~> 0.3'
+  s.add_dependency 'debugger-linecache', '~> 1.2'
 
-  s.add_development_dependency 'rake', '~> 10.1.0'
-  s.add_development_dependency 'rake-compiler', '~> 0.9.2'
-  s.add_development_dependency 'mocha', '~> 0.14.0'
-  s.add_development_dependency 'minitest', '~> 5.0.8'
+  s.add_development_dependency 'rake', '~> 10.1'
+  s.add_development_dependency 'rake-compiler', '~> 0.9'
+  s.add_development_dependency 'mocha', '~> 1.0'
+  s.add_development_dependency 'minitest', '~> 5.2'
+  s.add_development_dependency 'coveralls', '~> 0.7'
 end

data/ext/byebug/byebug.c

@@ -11,7 +11,7 @@ static VALUE breakpoints = Qnil;
 static VALUE tracepoints = Qnil;
 
 /* Implements thread syncronization, we must stop threads when debugging */
-VALUE locker  = Qnil;
+VALUE locker = Qnil;
 
 /* Threads table */
 VALUE threads = Qnil;

data/ext/byebug/byebug.h

@@ -38,7 +38,7 @@ typedef struct {
   int dest_frame;
   int lines;                   /* # of lines in dest_frame before stopping    */
   int steps;                   /* # of steps before stopping                  */
-  int after_frame;             /* stop rigth after returning from this frame  */
+  int after_frame;             /* stop right after returning from this frame  */
   int before_frame;            /* stop right before returning from this frame */
 
   VALUE last_file;

data/lib/byebug.rb

@@ -2,6 +2,8 @@ require 'byebug/byebug'
 require 'byebug/version'
 require 'byebug/context'
 require 'byebug/processor'
+require 'byebug/command_processor'
+require 'byebug/control_command_processor'
 require 'byebug/remote'
 require 'stringio'
 require 'tracer'
@@ -10,8 +12,7 @@ require 'linecache19'
 module Byebug
 
   # List of files byebug will ignore while debugging
-  IGNORED_FILES = Dir[Pathname.new(__FILE__) + "../**/*.rb"].map {
-    |f| File.expand_path(f) }
+  IGNORED_FILES = Dir.glob('**/*.rb').map { |f| File.expand_path(f) }
 
   # Default options to Byebug.start
   DEFAULT_START_SETTINGS = {

data/lib/byebug/command_processor.rb

@@ -0,0 +1,255 @@
+require 'forwardable'
+require_relative 'interface'
+require_relative 'command'
+
+module Byebug
+
+  class CommandProcessor < Processor
+    attr_reader :display
+
+    def initialize(interface = LocalInterface.new)
+      super(interface)
+
+      @display = []
+      @mutex = Mutex.new
+      @last_cmd         = nil   # To allow empty (just <RET>) commands
+      @last_file        = nil   # Filename the last time we stopped
+      @last_line        = nil   # Line number the last time we stopped
+      @context_was_dead = false # Assume we haven't started.
+    end
+
+    def interface=(interface)
+      @mutex.synchronize do
+        @interface.close if @interface
+        @interface = interface
+      end
+    end
+
+    require 'pathname'  # For cleanpath
+
+    #
+    # Regularize file name.
+    #
+    # This is also used as a common funnel place if basename is desired or if we
+    # are working remotely and want to change the basename. Or we are eliding
+    # filenames.
+    def self.canonic_file(filename)
+      return filename if ['(irb)', '-e'].include?(filename)
+
+      # For now we want resolved filenames
+      if Command.settings[:basename]
+        File.basename(filename)
+      else
+        Pathname.new(filename).cleanpath.to_s
+      end
+    end
+
+    def self.protect(mname)
+      alias_method "__#{mname}", mname
+      module_eval <<-END, __FILE__, __LINE__+1
+        def #{mname}(*args)
+          @mutex.synchronize do
+            return unless @interface
+            __#{mname}(*args)
+          end
+        rescue IOError, Errno::EPIPE
+          self.interface = nil
+        rescue SignalException
+          raise
+        rescue Exception
+          print "INTERNAL ERROR!!! #\{$!\}\n" rescue nil
+          print $!.backtrace.map{|l| "\t#\{l\}"}.join("\n") rescue nil
+        end
+      END
+    end
+
+    def at_breakpoint(context, breakpoint)
+      n = Byebug.breakpoints.index(breakpoint) + 1
+      file = CommandProcessor.canonic_file(breakpoint.source)
+      line = breakpoint.pos
+      print "Stopped by breakpoint #{n} at #{file}:#{line}\n"
+    end
+    protect :at_breakpoint
+
+    def at_catchpoint(context, excpt)
+      file = CommandProcessor.canonic_file(context.frame_file(0))
+      line = context.frame_line(0)
+      print "Catchpoint at %s:%d: `%s' (%s)\n", file, line, excpt, excpt.class
+    end
+    protect :at_catchpoint
+
+    def at_tracing(context, file, line)
+      if file != @last_file || line != @last_line || Command.settings[:linetrace_plus]
+        @last_file, @last_line = file, line
+        print "Tracing: #{CommandProcessor.canonic_file(file)}:#{line} " \
+              "#{Byebug.line_at(file,line)}\n"
+      end
+      always_run(context, file, line, 2)
+    end
+    protect :at_tracing
+
+    def at_line(context, file, line)
+      Byebug.source_reload if Command.settings[:autoreload]
+      process_commands(context, file, line)
+    end
+    protect :at_line
+
+    def at_return(context, file, line)
+      process_commands(context, file, line)
+    end
+    protect :at_return
+
+    private
+      #
+      # Prompt shown before reading a command.
+      #
+      def prompt(context)
+        return "(byebug#{context.dead?  ? ':post-mortem' : ''}) "
+      end
+
+      #
+      # Run commands everytime.
+      #
+      # For example display commands or possibly the list or irb in an
+      # "autolist" or "autoirb".
+      #
+      # @return List of commands acceptable to run bound to the current state
+      #
+      def always_run(context, file, line, run_level)
+        cmds = Command.commands
+
+        # Remove some commands in post-mortem
+        cmds = cmds.find_all { |cmd| cmd.allow_in_post_mortem } if context.dead?
+
+        state = State.new(cmds, context, @display, file, @interface, line)
+
+        # Change default when in irb or code included in command line
+        Command.settings[:autolist] = 0 if ['(irb)', '-e'].include?(file)
+
+        # Bind commands to the current state.
+        commands = cmds.map { |cmd| cmd.new(state) }
+
+        commands.select { |cmd| cmd.class.always_run >= run_level }
+                .each { |cmd| cmd.execute }
+
+        return state, commands
+      end
+
+      #
+      # Splits a command line of the form "cmd1 ; cmd2 ; ... ; cmdN" into an
+      # array of commands: [cmd1, cmd2, ..., cmdN]
+      #
+      def split_commands(cmd_line)
+        cmd_line.split(/;/).inject([]) do |m, v|
+          if m.empty?
+            m << v
+          else
+            if m.last[-1] == ?\\
+              m.last[-1,1] = ''
+              m.last << ';' << v
+            else
+              m << v
+            end
+          end
+          m
+        end
+      end
+
+      #
+      # Handle byebug commands.
+      #
+      def process_commands(context, file, line)
+        state, commands = always_run(context, file, line, 1)
+
+        if Command.settings[:testing]
+          Thread.current.thread_variable_set('state', state)
+        else
+          Thread.current.thread_variable_set('state', nil)
+        end
+
+        preloop(commands, context)
+        print state.location if Command.settings[:autolist] == 0
+
+        while !state.proceed?
+          input = @interface.command_queue.empty? ?
+                  @interface.read_command(prompt(context)) :
+                  @interface.command_queue.shift
+          break unless input
+          catch(:debug_error) do
+            if input == ""
+              next unless @last_cmd
+              input = @last_cmd
+            else
+              @last_cmd = input
+            end
+            split_commands(input).each do |cmd|
+              one_cmd(commands, context, cmd)
+            end
+          end
+        end
+      end
+
+      #
+      # Executes a single byebug command
+      #
+      def one_cmd(commands, context, input)
+        if cmd = commands.find { |c| c.match(input) }
+          if context.dead? && cmd.class.need_context
+            print "Command is unavailable\n"
+          else
+            cmd.execute
+          end
+        else
+          unknown_cmd = commands.find { |c| c.class.unknown }
+          if unknown_cmd
+            unknown_cmd.execute
+          else
+            errmsg "Unknown command: \"#{input}\".  Try \"help\".\n"
+          end
+        end
+      end
+
+      #
+      # Tasks to do before processor loop
+      #
+      def preloop(commands, context)
+        @context_was_dead = true if context.dead? and not @context_was_dead
+
+        if @context_was_dead
+          print "The program finished.\n"
+          @context_was_dead = false
+        end
+      end
+
+      class State
+        attr_accessor :commands, :context, :display, :file, :frame_pos
+        attr_accessor :interface, :line, :previous_line
+
+        def initialize(commands, context, display, file, interface, line)
+          @commands, @context, @display = commands, context, display
+          @file, @interface, @line = file, interface, line
+          @frame_pos, @previous_line, @proceed = 0, nil, false
+        end
+
+        extend Forwardable
+        def_delegators :@interface, :errmsg, :print, :confirm
+
+        def proceed?
+          @proceed
+        end
+
+        def proceed
+          @proceed = true
+        end
+
+        def location
+          loc = "#{CommandProcessor.canonic_file(@file)} @ #{@line}\n"
+          loc += "#{Byebug.line_at(@file, @line)}\n" unless
+            ['(irb)', '-e'].include? @file
+          loc
+        end
+      end
+
+  end # class CommandProcessor
+  
+end

data/lib/byebug/commands/frame.rb

@@ -168,11 +168,11 @@ module Byebug
       def description
         %{w[here]|bt|backtrace\tdisplay stack frames
 
-          Print the entire stack frame. Each frame is numbered, the most recent
-          frame is 0. Frame number can be referred to in the "frame" command;
+          Print the entire stack frame. Each frame is numbered; the most recent
+          frame is 0. A frame number can be referred to in the "frame" command;
           "up" and "down" add or subtract respectively to frame numbers shown.
           The position of the current frame is marked with -->. C-frames hang
-          from their most inmediate ruby frame to indicate that they are not
+          from their most immediate Ruby frame to indicate that they are not
           navigable}
       end
     end

data/lib/byebug/context.rb

@@ -6,7 +6,7 @@ module Byebug
       def stack_size
         if backtrace = Thread.current.backtrace_locations(0)
           backtrace.drop_while { |l| !ignored(l.path) }
-                   .drop_while { |l| ignored(l.path) || l.path == '(eval)' }
+                   .drop_while { |l|  ignored(l.path) }
                    .take_while { |l| !ignored(l.path) }
                    .size
         else
@@ -16,7 +16,7 @@ module Byebug
       end
 
       def real_stack_size
-        if backtrace = Thread.current.backtrace_locations(1)
+        if backtrace = Thread.current.backtrace_locations(0)
           backtrace.size
         end
       end
@@ -75,15 +75,15 @@ module Byebug
     end
 
     def at_tracing(file, line)
-      handler.at_tracing(self, file, line) unless IGNORED_FILES.include?(file)
+      handler.at_tracing(self, file, line)
     end
 
     def at_line(file, line)
-      handler.at_line(self, file, line) unless IGNORED_FILES.include?(file)
+      handler.at_line(self, file, line)
     end
 
     def at_return(file, line)
-      handler.at_return(self, file, line) unless IGNORED_FILES.include?(file)
+      handler.at_return(self, file, line)
     end
   end
 end

data/lib/byebug/control_command_processor.rb

@@ -0,0 +1,79 @@
+require 'forwardable'
+require_relative 'interface'
+require_relative 'command'
+
+module Byebug
+
+  class ControlCommandProcessor < Processor
+    def initialize(interface)
+      super(interface)
+      @context_was_dead = false # Assume we haven't started.
+    end
+
+    def process_commands(verbose=false)
+      control_cmds = Command.commands.select do |cmd|
+        cmd.allow_in_control
+      end
+      state = State.new(@interface, control_cmds)
+      commands = control_cmds.map{|cmd| cmd.new(state) }
+
+      if @context_was_dead
+        print "The program finished.\n"
+        @context_was_dead = false
+      end
+
+      while input = @interface.read_command(prompt(nil))
+        print "+#{input}" if verbose
+        catch(:debug_error) do
+          if cmd = commands.find{|c| c.match(input) }
+            cmd.execute
+          else
+            errmsg "Unknown command\n"
+          end
+        end
+      end
+    rescue IOError, Errno::EPIPE
+    rescue Exception
+      print "INTERNAL ERROR!!! #{$!}\n" rescue nil
+      print $!.backtrace.map{|l| "\t#{l}"}.join("\n") rescue nil
+    ensure
+      @interface.close
+    end
+
+    #
+    # Prompt shown before reading a command.
+    #
+    def prompt(context)
+      return '(byebug:ctrl) '
+    end
+
+    class State
+      attr_reader :commands, :interface
+
+      def initialize(interface, commands)
+        @interface = interface
+        @commands = commands
+      end
+
+      def proceed
+      end
+
+      extend Forwardable
+      def_delegators :@interface, :errmsg, :print
+
+      def confirm(*args)
+        'y'
+      end
+
+      def context
+        nil
+      end
+
+      def file
+        errmsg "No filename given.\n"
+        throw :debug_error
+      end
+    end
+  end
+  
+end

data/lib/byebug/processor.rb

@@ -1,6 +1,5 @@
 require 'forwardable'
 require_relative 'interface'
-require_relative 'command'
 
 module Byebug
 
@@ -16,324 +15,4 @@ module Byebug
     end
   end
 
-  class CommandProcessor < Processor
-    attr_reader :display
-
-    def initialize(interface = LocalInterface.new)
-      super(interface)
-
-      @display = []
-      @mutex = Mutex.new
-      @last_cmd         = nil   # To allow empty (just <RET>) commands
-      @last_file        = nil   # Filename the last time we stopped
-      @last_line        = nil   # Line number the last time we stopped
-      @context_was_dead = false # Assume we haven't started.
-    end
-
-    def interface=(interface)
-      @mutex.synchronize do
-        @interface.close if @interface
-        @interface = interface
-      end
-    end
-
-    require 'pathname'  # For cleanpath
-
-    #
-    # Regularize file name.
-    #
-    # This is also used as a common funnel place if basename is desired or if we
-    # are working remotely and want to change the basename. Or we are eliding
-    # filenames.
-    def self.canonic_file(filename)
-      return filename if ['(irb)', '-e'].include?(filename)
-
-      # For now we want resolved filenames
-      if Command.settings[:basename]
-        File.basename(filename)
-      else
-        Pathname.new(filename).cleanpath.to_s
-      end
-    end
-
-    def self.protect(mname)
-      alias_method "__#{mname}", mname
-      module_eval <<-END, __FILE__, __LINE__+1
-        def #{mname}(*args)
-          @mutex.synchronize do
-            return unless @interface
-            __#{mname}(*args)
-          end
-        rescue IOError, Errno::EPIPE
-          self.interface = nil
-        rescue SignalException
-          raise
-        rescue Exception
-          print "INTERNAL ERROR!!! #\{$!\}\n" rescue nil
-          print $!.backtrace.map{|l| "\t#\{l\}"}.join("\n") rescue nil
-        end
-      END
-    end
-
-    def at_breakpoint(context, breakpoint)
-      n = Byebug.breakpoints.index(breakpoint) + 1
-      file = CommandProcessor.canonic_file(breakpoint.source)
-      line = breakpoint.pos
-      print "Stopped by breakpoint #{n} at #{file}:#{line}\n"
-    end
-    protect :at_breakpoint
-
-    def at_catchpoint(context, excpt)
-      file = CommandProcessor.canonic_file(context.frame_file(0))
-      line = context.frame_line(0)
-      print "Catchpoint at %s:%d: `%s' (%s)\n", file, line, excpt, excpt.class
-    end
-    protect :at_catchpoint
-
-    def at_tracing(context, file, line)
-      if file != @last_file || line != @last_line || Command.settings[:linetrace_plus]
-        @last_file, @last_line = file, line
-        print "Tracing: #{CommandProcessor.canonic_file(file)}:#{line} " \
-              "#{Byebug.line_at(file,line)}\n"
-      end
-      always_run(context, file, line, 2)
-    end
-    protect :at_tracing
-
-    def at_line(context, file, line)
-      Byebug.source_reload if Command.settings[:autoreload]
-      process_commands(context, file, line)
-    end
-    protect :at_line
-
-    def at_return(context, file, line)
-      process_commands(context, file, line)
-    end
-    protect :at_return
-
-    private
-      #
-      # Prompt shown before reading a command.
-      #
-      def prompt(context)
-        return "(byebug#{context.dead?  ? ':post-mortem' : ''}) "
-      end
-
-      #
-      # Run commands everytime.
-      #
-      # For example display commands or possibly the list or irb in an
-      # "autolist" or "autoirb".
-      #
-      # @return List of commands acceptable to run bound to the current state
-      #
-      def always_run(context, file, line, run_level)
-        cmds = Command.commands
-
-        # Remove some commands in post-mortem
-        cmds = cmds.find_all { |cmd| cmd.allow_in_post_mortem } if context.dead?
-
-        state = State.new(cmds, context, @display, file, @interface, line)
-
-        # Change default when in irb or code included in command line
-        Command.settings[:autolist] = 0 if ['(irb)', '-e'].include?(file)
-
-        # Bind commands to the current state.
-        commands = cmds.map { |cmd| cmd.new(state) }
-
-        commands.select { |cmd| cmd.class.always_run >= run_level }
-                .each { |cmd| cmd.execute }
-
-        return state, commands
-      end
-
-      #
-      # Splits a command line of the form "cmd1 ; cmd2 ; ... ; cmdN" into an
-      # array of commands: [cmd1, cmd2, ..., cmdN]
-      #
-      def split_commands(cmd_line)
-        cmd_line.split(/;/).inject([]) do |m, v|
-          if m.empty?
-            m << v
-          else
-            if m.last[-1] == ?\\
-              m.last[-1,1] = ''
-              m.last << ';' << v
-            else
-              m << v
-            end
-          end
-          m
-        end
-      end
-
-      #
-      # Handle byebug commands.
-      #
-      def process_commands(context, file, line)
-        state, commands = always_run(context, file, line, 1)
-
-        if Command.settings[:testing]
-          Thread.current.thread_variable_set('state', state)
-        else
-          Thread.current.thread_variable_set('state', nil)
-        end
-
-        preloop(commands, context)
-        print state.location if Command.settings[:autolist] == 0
-
-        while !state.proceed?
-          input = @interface.command_queue.empty? ?
-                  @interface.read_command(prompt(context)) :
-                  @interface.command_queue.shift
-          break unless input
-          catch(:debug_error) do
-            if input == ""
-              next unless @last_cmd
-              input = @last_cmd
-            else
-              @last_cmd = input
-            end
-            split_commands(input).each do |cmd|
-              one_cmd(commands, context, cmd)
-            end
-          end
-        end
-      end
-
-      #
-      # Executes a single byebug command
-      #
-      def one_cmd(commands, context, input)
-        if cmd = commands.find { |c| c.match(input) }
-          if context.dead? && cmd.class.need_context
-            print "Command is unavailable\n"
-          else
-            cmd.execute
-          end
-        else
-          unknown_cmd = commands.find { |c| c.class.unknown }
-          if unknown_cmd
-            unknown_cmd.execute
-          else
-            errmsg "Unknown command: \"#{input}\".  Try \"help\".\n"
-          end
-        end
-      end
-
-      #
-      # Tasks to do before processor loop
-      #
-      def preloop(commands, context)
-        @context_was_dead = true if context.dead? and not @context_was_dead
-
-        if @context_was_dead
-          print "The program finished.\n"
-          @context_was_dead = false
-        end
-      end
-
-      class State
-        attr_accessor :commands, :context, :display, :file, :frame_pos
-        attr_accessor :interface, :line, :previous_line
-
-        def initialize(commands, context, display, file, interface, line)
-          @commands, @context, @display = commands, context, display
-          @file, @interface, @line = file, interface, line
-          @frame_pos, @previous_line, @proceed = 0, nil, false
-        end
-
-        extend Forwardable
-        def_delegators :@interface, :errmsg, :print, :confirm
-
-        def proceed?
-          @proceed
-        end
-
-        def proceed
-          @proceed = true
-        end
-
-        def location
-          loc = "#{CommandProcessor.canonic_file(@file)} @ #{@line}\n"
-          loc += "#{Byebug.line_at(@file, @line)}\n" unless
-            ['(irb)', '-e'].include? @file
-          loc
-        end
-      end
-
-  end # class CommandProcessor
-
-
-  class ControlCommandProcessor < Processor
-    def initialize(interface)
-      super(interface)
-      @context_was_dead = false # Assume we haven't started.
-    end
-
-    def process_commands(verbose=false)
-      control_cmds = Command.commands.select do |cmd|
-        cmd.allow_in_control
-      end
-      state = State.new(@interface, control_cmds)
-      commands = control_cmds.map{|cmd| cmd.new(state) }
-
-      if @context_was_dead
-        print "The program finished.\n"
-        @context_was_dead = false
-      end
-
-      while input = @interface.read_command(prompt(nil))
-        print "+#{input}" if verbose
-        catch(:debug_error) do
-          if cmd = commands.find{|c| c.match(input) }
-            cmd.execute
-          else
-            errmsg "Unknown command\n"
-          end
-        end
-      end
-    rescue IOError, Errno::EPIPE
-    rescue Exception
-      print "INTERNAL ERROR!!! #{$!}\n" rescue nil
-      print $!.backtrace.map{|l| "\t#{l}"}.join("\n") rescue nil
-    ensure
-      @interface.close
-    end
-
-    #
-    # Prompt shown before reading a command.
-    #
-    def prompt(context)
-      return '(byebug:ctrl) '
-    end
-
-    class State
-      attr_reader :commands, :interface
-
-      def initialize(interface, commands)
-        @interface = interface
-        @commands = commands
-      end
-
-      def proceed
-      end
-
-      extend Forwardable
-      def_delegators :@interface, :errmsg, :print
-
-      def confirm(*args)
-        'y'
-      end
-
-      def context
-        nil
-      end
-
-      def file
-        errmsg "No filename given.\n"
-        throw :debug_error
-      end
-    end
-  end
 end

data/lib/byebug/version.rb

@@ -1,3 +1,3 @@
 module Byebug
-  VERSION = '2.5.0'
+  VERSION = '2.6.0'
 end

data/test/examples/stepping_raise_from_c_method.rb

@@ -0,0 +1,3 @@
+byebug
+
+SteppingRaiseFromCMethodExample.new.a

data/test/examples/stepping_raise_from_ruby_method.rb

@@ -0,0 +1,3 @@
+byebug
+
+SteppingRaiseFromRubyMethodExample.new.a

data/test/frame_test.rb

@@ -86,7 +86,7 @@ class TestFrame < TestDsl::TestCase
 
     it 'must set frame to the last one' do
       enter 'frame -1'
-      debug_file('frame') { File.basename(state.file).must_equal 'test_helper.rb' }
+      debug_file('frame') { File.basename(state.file).must_equal 'minitest.rb' }
     end
 
     it 'must not set frame if the frame number is too low' do

data/test/stepping_test.rb

@@ -15,7 +15,40 @@ class SteppingExample
   end
 end
 
+class SteppingRaiseFromRubyMethodExample
+  def a
+    b
+  rescue
+    1
+  end
+
+  def b
+    c
+  end
+
+  def c
+    raise 'bang'
+  end
+end
+
+class SteppingRaiseFromCMethodExample
+  def a
+    b
+  rescue NameError
+    1
+  end
+
+  def b
+    c
+  end
+
+  def c
+    d
+  end
+end
+
 class TestStepping < TestDsl::TestCase
+
   describe 'Next Command' do
 
     describe 'method call behaviour' do
@@ -77,6 +110,26 @@ class TestStepping < TestDsl::TestCase
         debug_file('stepping') { state.line.must_equal 8 }
       end
     end
+
+    describe 'raise/rescue behaviour' do
+      describe 'from c method' do
+        before { enter "break #{__FILE__}:36", 'cont' }
+
+        it 'must step over rescue' do
+          enter 'next'
+          debug_file('stepping_raise_from_c_method') { state.line.must_equal 38 }
+        end
+      end
+
+      describe 'from ruby method' do
+        before { enter "break #{__FILE__}:20", 'cont' }
+
+        it 'must step over rescue' do
+          enter 'next'
+          debug_file('stepping_raise_from_ruby_method') { state.line.must_equal 22 }
+        end
+      end
+    end
   end
 
   describe 'Step Command' do

data/test/test_helper.rb

@@ -1,7 +1,14 @@
+if ENV['CI']
+  require 'coveralls'
+  Coveralls.wear! do
+    add_filter 'test'
+  end
+end
+
 require 'minitest'
 require 'minitest/spec'
 require 'pathname'
-require 'mocha/setup'
+require 'mocha/mini_test'
 require 'byebug'
 
 Dir.glob(File.expand_path("../support/*.rb", __FILE__)).each { |f| require f }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: byebug
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - David Rodriguez
@@ -10,92 +10,106 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-14 00:00:00.000000000 Z
+date: 2014-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: columnize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: debugger-linecache
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: '10.1'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.8
+        version: '5.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.8
+        version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 description: |-
   Byebug is a Ruby 2 debugger. It's implemented using the
       Ruby 2 TracePoint C API for execution control and the Debug Inspector C API
@@ -111,8 +125,8 @@ extensions:
 extra_rdoc_files:
 - README.md
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - GUIDE.md
@@ -131,6 +145,7 @@ files:
 - ext/byebug/threads.c
 - lib/byebug.rb
 - lib/byebug/command.rb
+- lib/byebug/command_processor.rb
 - lib/byebug/commands/breakpoints.rb
 - lib/byebug/commands/catchpoint.rb
 - lib/byebug/commands/condition.rb
@@ -160,6 +175,7 @@ files:
 - lib/byebug/commands/trace.rb
 - lib/byebug/commands/variables.rb
 - lib/byebug/context.rb
+- lib/byebug/control_command_processor.rb
 - lib/byebug/helper.rb
 - lib/byebug/interface.rb
 - lib/byebug/interfaces/local_interface.rb
@@ -168,7 +184,6 @@ files:
 - lib/byebug/processor.rb
 - lib/byebug/remote.rb
 - lib/byebug/version.rb
-- logo.png
 - test/breakpoints_test.rb
 - test/conditions_test.rb
 - test/continue_test.rb
@@ -207,6 +222,8 @@ files:
 - test/examples/show.rb
 - test/examples/source.rb
 - test/examples/stepping.rb
+- test/examples/stepping_raise_from_c_method.rb
+- test/examples/stepping_raise_from_ruby_method.rb
 - test/examples/test-triangle.rb
 - test/examples/thread.rb
 - test/examples/tmate.rb
@@ -250,17 +267,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Ruby 2.0 fast debugger - base + cli
@@ -303,6 +320,8 @@ test_files:
 - test/examples/show.rb
 - test/examples/source.rb
 - test/examples/stepping.rb
+- test/examples/stepping_raise_from_c_method.rb
+- test/examples/stepping_raise_from_ruby_method.rb
 - test/examples/test-triangle.rb
 - test/examples/thread.rb
 - test/examples/tmate.rb
@@ -336,4 +355,3 @@ test_files:
 - test/thread_test.rb
 - test/trace_test.rb
 - test/variables_test.rb
-has_rdoc: