byebug 2.3.1 → 2.4.0

data/lib/byebug/commands/frame.rb

@@ -102,10 +102,17 @@ module Byebug
       realsize = Context.stack_size
       calcedsize = @state.context.calced_stack_size
       if calcedsize != realsize
-        errmsg "Byebug's stacksize (#{calcedsize}) should be #{realsize}. " \
-               "This might be a bug in byebug or ruby's debugging API's\n"
+        if Byebug.post_mortem?
+          stacksize = calcedsize
+        else
+          errmsg "Byebug's stacksize (#{calcedsize}) should be #{realsize}. " \
+                 "This might be a bug in byebug or ruby's debugging API's\n"
+          stacksize = realsize
+        end
+      else
+        stacksize = calcedsize
       end
-      (0...realsize).each do |idx|
+      (0...stacksize).each do |idx|
         print_frame(idx)
       end
     end

data/lib/byebug/commands/info.rb

@@ -240,9 +240,11 @@ module Byebug
     private :info_stop_reason
 
     def info_program(*args)
-      return print "The program crashed.\n" + Byebug.last_exception ?
-                   "Exception: #{Byebug.last_exception.inspect}" : "" + "\n" if
-        @state.context.dead?
+      if @state.context.dead?
+        print "The program crashed.\n"
+        print "Exception: #{Byebug.last_exception.inspect}\n" if Byebug.last_exception
+        return
+      end
 
       print "Program stopped. "
       info_stop_reason @state.context.stop_reason

data/lib/byebug/commands/reload.rb

@@ -14,6 +14,7 @@ module Byebug
   # Implements byebug "reload" command.
   class ReloadCommand < Command
     self.allow_in_control = true
+    self.allow_in_post_mortem = false
 
     register_setting_get(:autoreload) do
       Byebug.class_variable_get(:@@autoreload)

data/lib/byebug/commands/set.rb

@@ -51,7 +51,11 @@ module Byebug
         return unless width = get_int(setting_args[0], "Set width", 10, nil, 80)
         Command.settings[:width] = width
       when /^post_mortem$/
-        Byebug.post_mortem = setting_value
+        if setting_value == true
+          Byebug.post_mortem
+        else
+          return print 'Sorry... not implemented yet. Restart byebug'
+        end
       when /^autoeval|autoreload|basename|forcestep|fullpath|linetrace_plus|
              testing|stack_on_error$/x
         Command.settings[setting_name.to_sym] = setting_value

data/lib/byebug/commands/threads.rb

@@ -14,9 +14,9 @@ module Byebug
       end
       debug_flag = context.ignored? ? '!' : ' '
       if should_show_top_frame
-        if context.thread == Thread.current
-          file = @state.context.frame_file(0)
-          line = @state.context.frame_line(0)
+        if context.thread == Thread.current && !context.dead?
+          file = context.frame_file(0)
+          line = context.frame_line(0)
         else
           if context.thread.backtrace_locations &&
              context.thread.backtrace_locations[0]
@@ -72,7 +72,8 @@ module Byebug
     end
 
     def execute
-      Byebug.contexts.sort_by(&:thnum).each { |c| display_context(c) }
+      Byebug.contexts.select { |c| Thread.list.include?(c.thread) }
+                     .sort_by(&:thnum).each { |c| display_context(c) }
     end
 
     class << self

data/lib/byebug/commands/trace.rb

@@ -15,19 +15,19 @@ module Byebug
         print "#{show_setting('linetrace')}\n"
       elsif @match[1] =~ /var(?:iable)?/
         varname = @match[2]
-        if bb_eval("defined?(#{varname})")
+        if global_variables.include?("$#{varname}".to_sym)
           if @match[3] && @match[3] !~ /(:?no)?stop/
             errmsg "expecting \"stop\" or \"nostop\"; got \"#{@match[3]}\"\n"
           else
             dbg_cmd = (@match[3] && @match[3] !~ /nostop/) ? 'byebug(1,0)' : ''
           end
-          eval("trace_var(:\"#{varname}\") do |val|
-                  print \"traced variable \#{varname} has value \#{val}\n\"
+          eval("trace_var(:\"\$#{varname}\") do |val|
+                  print \"traced global variable '#{varname}' has value '\#{val}'\"\n
                   #{dbg_cmd}
                 end")
-          print "Tracing variable \"#{varname}\".\n"
+          print "Tracing global variable \"#{varname}\".\n"
         else
-          errmsg "#{varname} is not a global variable.\n"
+          errmsg "'#{varname}' is not a global variable.\n"
         end
       else
         errmsg "expecting \"on\", \"off\", \"var\" or \"variable\"; got: " \

data/lib/byebug/context.rb

@@ -4,18 +4,18 @@ module Byebug
 
     class << self
       def stack_size
-        if backtrace = Thread.current.backtrace_locations
+        if backtrace = Thread.current.backtrace_locations(1)
           backtrace.drop_while { |l| ignored(l.path) || l.path == '(eval)' }
                    .take_while { |l| !ignored(l.path) }
                    .size
         else
           print 'No backtrace available!!'
-          return 0
+          0
         end
       end
 
       def real_stack_size
-        if backtrace = Thread.current.backtrace_locations
+        if backtrace = Thread.current.backtrace_locations(1)
           backtrace.size
         end
       end

data/lib/byebug/interface.rb

@@ -1,5 +1,4 @@
 module Byebug
-
   class Interface
     attr_writer :have_readline
 
@@ -29,190 +28,7 @@ module Byebug
     end
   end
 
-  class LocalInterface < Interface
-    attr_accessor :command_queue, :history_length, :history_save, :histfile
-    attr_accessor :restart_file
-
-    FILE_HISTORY = ".byebug_hist" unless defined?(FILE_HISTORY)
-
-    def initialize()
-      super
-      @command_queue = []
-      @have_readline = false
-      @history_save = true
-      @history_length = ENV["HISTSIZE"] ? ENV["HISTSIZE"].to_i : 256
-      @histfile = File.join(ENV["HOME"]||ENV["HOMEPATH"]||".", FILE_HISTORY)
-      open(@histfile, 'r') do |file|
-        file.each do |line|
-          line.chomp!
-          Readline::HISTORY << line
-        end
-      end if File.exist?(@histfile)
-      @restart_file = nil
-    end
-
-    def read_command(prompt)
-      readline(prompt, true)
-    end
-
-    def confirm(prompt)
-      readline(prompt, false)
-    end
-
-    def print(*args)
-      STDOUT.printf(escape(format(*args)))
-    end
-
-    def close
-    end
-
-    # Things to do before quitting
-    def finalize
-      if Byebug.respond_to?(:save_history)
-        Byebug.save_history
-      end
-    end
-
-    def readline_support?
-      @have_readline
-    end
-
-    private
-
-      begin
-        require 'readline'
-        class << Byebug
-          @have_readline = true
-          define_method(:save_history) do
-            iface = self.handler.interface
-            iface.histfile ||= File.join(ENV["HOME"]||ENV["HOMEPATH"]||".",
-                                    FILE_HISTORY)
-            open(iface.histfile, 'w') do |file|
-              Readline::HISTORY.to_a.last(iface.history_length).each do |line|
-                file.puts line unless line.strip.empty?
-              end if defined?(iface.history_save) and iface.history_save
-            end rescue nil
-          end
-          public :save_history
-        end
-
-        def readline(prompt, hist)
-          Readline::readline(prompt, hist)
-        rescue Interrupt
-          print "^C\n"
-          retry
-        end
-      rescue LoadError
-        def readline(prompt, hist)
-          @histfile = ''
-          @hist_save = false
-          STDOUT.print prompt
-          STDOUT.flush
-          line = STDIN.gets
-          exit unless line
-          line.chomp!
-          line
-        end
-      end
-  end
-
-  class RemoteInterface < Interface
-    attr_accessor :command_queue, :history_length, :history_save, :histfile
-    attr_accessor :restart_file
-
-    def initialize(socket)
-      @command_queue = []
-      @socket = socket
-      @history_save = false
-      @history_length = 256
-      @histfile = ''
-      # Do we read the histfile?
-#       open(@histfile, 'r') do |file|
-#         file.each do |line|
-#           line.chomp!
-#           Readline::HISTORY << line
-#         end
-#       end if File.exist?(@histfile)
-      @restart_file = nil
-    end
-
-    def close
-      @socket.close
-    rescue Exception
-    end
-
-    def confirm(prompt)
-      send_command "CONFIRM #{prompt}"
-    end
-
-    def finalize
-    end
-
-    def read_command(prompt)
-      send_command "PROMPT #{prompt}"
-    end
-
-    def readline_support?
-      false
-    end
-
-    def print(*args)
-      @socket.printf(escape(format(*args)))
-    end
-
-    private
-
-      def send_command(msg)
-        @socket.puts msg
-        result = @socket.gets
-        raise IOError unless result
-        result.chomp
-      end
-  end
-
-  class ScriptInterface < Interface
-    attr_accessor :command_queue, :history_length, :history_save, :histfile
-    attr_accessor :restart_file
-
-    def initialize(file, out, verbose=false)
-      super()
-      @command_queue = []
-      @file = file.respond_to?(:gets) ? file : open(file)
-      @out = out
-      @verbose = verbose
-      @history_save = false
-      @history_length = 256
-      @histfile = ''
-    end
-
-    def finalize
-    end
-
-    def read_command(prompt)
-      while result = @file.gets
-        puts "# #{result}" if @verbose
-        next if result =~ /^\s*#/
-        next if result.strip.empty?
-        break
-      end
-      raise IOError unless result
-      result.chomp!
-    end
-
-    def readline_support?
-      false
-    end
-
-    def confirm(prompt)
-      'y'
-    end
-
-    def print(*args)
-      @out.printf(*args)
-    end
-
-    def close
-      @file.close
-    end
-  end
+  require_relative 'interfaces/local_interface'
+  require_relative 'interfaces/script_interface'
+  require_relative 'interfaces/remote_interface'
 end

data/lib/byebug/interfaces/local_interface.rb

@@ -0,0 +1,88 @@
+module Byebug
+  class LocalInterface < Interface
+    attr_accessor :command_queue, :history_length, :history_save, :histfile
+    attr_accessor :restart_file
+
+    FILE_HISTORY = ".byebug_hist" unless defined?(FILE_HISTORY)
+
+    def initialize()
+      super
+      @command_queue = []
+      @have_readline = false
+      @history_save = true
+      @history_length = ENV["HISTSIZE"] ? ENV["HISTSIZE"].to_i : 256
+      @histfile = File.join(ENV["HOME"]||ENV["HOMEPATH"]||".", FILE_HISTORY)
+      open(@histfile, 'r') do |file|
+        file.each do |line|
+          line.chomp!
+          Readline::HISTORY << line
+        end
+      end if File.exist?(@histfile)
+      @restart_file = nil
+    end
+
+    def read_command(prompt)
+      readline(prompt, true)
+    end
+
+    def confirm(prompt)
+      readline(prompt, false)
+    end
+
+    def print(*args)
+      STDOUT.printf(escape(format(*args)))
+    end
+
+    def close
+    end
+
+    # Things to do before quitting
+    def finalize
+      if Byebug.respond_to?(:save_history)
+        Byebug.save_history
+      end
+    end
+
+    def readline_support?
+      @have_readline
+    end
+
+    private
+
+      begin
+        require 'readline'
+        class << Byebug
+          @have_readline = true
+          define_method(:save_history) do
+            iface = self.handler.interface
+            iface.histfile ||= File.join(ENV["HOME"]||ENV["HOMEPATH"]||".",
+                                    FILE_HISTORY)
+            open(iface.histfile, 'w') do |file|
+              Readline::HISTORY.to_a.last(iface.history_length).each do |line|
+                file.puts line unless line.strip.empty?
+              end if defined?(iface.history_save) and iface.history_save
+            end rescue nil
+          end
+          public :save_history
+        end
+
+        def readline(prompt, hist)
+          Readline::readline(prompt, hist)
+        rescue Interrupt
+          print "^C\n"
+          retry
+        end
+      rescue LoadError
+        def readline(prompt, hist)
+          @histfile = ''
+          @hist_save = false
+          STDOUT.print prompt
+          STDOUT.flush
+          line = STDIN.gets
+          exit unless line
+          line.chomp!
+          line
+        end
+      end
+  end
+end

data/lib/byebug/interfaces/remote_interface.rb

@@ -0,0 +1,55 @@
+module Byebug
+  class RemoteInterface < Interface
+    attr_accessor :command_queue, :history_length, :history_save, :histfile
+    attr_accessor :restart_file
+
+    def initialize(socket)
+      @command_queue = []
+      @socket = socket
+      @history_save = false
+      @history_length = 256
+      @histfile = ''
+      # Do we read the histfile?
+      # open(@histfile, 'r') do |file|
+      #   file.each do |line|
+      #     line.chomp!
+      #     Readline::HISTORY << line
+      #   end
+      # end if File.exist?(@histfile)
+        @restart_file = nil
+    end
+
+    def close
+      @socket.close
+    rescue Exception
+    end
+
+    def confirm(prompt)
+      send_command "CONFIRM #{prompt}"
+    end
+
+    def finalize
+    end
+
+    def read_command(prompt)
+      send_command "PROMPT #{prompt}"
+    end
+
+    def readline_support?
+      false
+    end
+
+    def print(*args)
+      @socket.printf(escape(format(*args)))
+    end
+
+    private
+
+      def send_command(msg)
+        @socket.puts msg
+        result = @socket.gets
+        raise IOError unless result
+        result.chomp
+      end
+  end
+end