byebug 3.1.2 → 3.2.0

data/lib/byebug/commands/save.rb

@@ -1,5 +1,4 @@
 module Byebug
-
   module SaveFunctions
     # Create a temporary file to write in if file is nil
     def open_save

data/lib/byebug/commands/set.rb

@@ -1,6 +1,4 @@
 module Byebug
-
-  # Implements byebug "set" command.
   class SetCommand < Command
     self.allow_in_control = true
 
@@ -20,7 +18,7 @@ module Byebug
       elsif Setting.boolean?(full_key)
         value = get_onoff(value, key =~ /^no/ ? false : true)
       elsif Setting.integer?(full_key)
-        return unless value = get_int(value, full_key, 1, 300)
+        return unless value = get_int(value, full_key, 1)
       end
 
       Setting[full_key.to_sym] = value
@@ -31,12 +29,12 @@ module Byebug
     def get_onoff(arg, default)
       return default if arg.nil?
       case arg
-      when '1', 'on'
+      when '1', 'on', 'true'
         return true
-      when '0', 'off'
+      when '0', 'off', 'false'
         return false
       else
-        print "Expecting 'on', 1, 'off', or 0. Got: #{arg}.\n"
+        print "Expecting 'on', 1, true, 'off', 0, false. Got: #{arg}.\n"
         raise RuntimeError
       end
     end
@@ -69,5 +67,4 @@ module Byebug
       end
     end
   end
-
 end

data/lib/byebug/commands/show.rb

@@ -1,6 +1,4 @@
 module Byebug
-
-  # Implements byebug "show" command.
   class ShowCommand < Command
     self.allow_in_control = true
 
@@ -43,5 +41,4 @@ module Byebug
       end
     end
   end
-
 end

data/lib/byebug/commands/source.rb

@@ -1,6 +1,4 @@
 module Byebug
-
-  # Implements byebug "source" command.
   class SourceCommand < Command
     self.allow_in_control = true
 
@@ -32,5 +30,4 @@ module Byebug
       end
     end
   end
-
 end

data/lib/byebug/commands/stepping.rb

@@ -1,6 +1,7 @@
 module Byebug
-
-  # Mix-in module to assist in command parsing.
+  #
+  # Mixin to assist command parsing
+  #
   module SteppingFunctions
     def parse_stepping_args(command_name, match)
       if match[1].nil?
@@ -15,7 +16,6 @@ module Byebug
     end
   end
 
-  # Implements byebug "next" command.
   class NextCommand < Command
     self.allow_in_post_mortem = false
 
@@ -44,7 +44,6 @@ module Byebug
     end
   end
 
-  # Implements byebug "step" command.
   class StepCommand < Command
     self.allow_in_post_mortem = false
 

data/lib/byebug/commands/trace.rb

@@ -1,5 +1,4 @@
 module Byebug
-
   class TraceCommand < Command
     def regexp
       /^\s* tr(?:acevar)? (?: \s+ (\S+))?  # (variable-name)?

data/lib/byebug/commands/variables.rb

@@ -12,8 +12,9 @@ module Byebug
             s = "*Error in evaluation*"
           end
         end
+        s = "#{v} = #{s}"
         s[Setting[:width]-3..-1] = "..." if s.size > Setting[:width]
-        print "#{v} = #{s}\n"
+        print "#{s}\n"
       end
     end
 
@@ -27,7 +28,6 @@ module Byebug
     end
   end
 
-  # Implements byebug's 'var class' command
   class VarClassCommand < Command
     def regexp
       /^\s* v(?:ar)? \s+ cl(?:ass)? \s*/x
@@ -110,7 +110,7 @@ module Byebug
 
     def execute
       obj = bb_eval(@match.post_match.empty? ? 'self' : @match.post_match)
-      var_list(obj.instance_variables, obj.instance_eval{binding()})
+      var_list(obj.instance_variables, obj.instance_eval { binding() })
     end
 
     class << self
@@ -124,7 +124,6 @@ module Byebug
     end
   end
 
-  # Implements byebug's 'var local' command
   class VarLocalCommand < Command
     def regexp
       /^\s* v(?:ar)? \s+ l(?:ocal)? \s*$/x

data/lib/byebug/context.rb

@@ -12,7 +12,6 @@ module Byebug
           end
           backtrace.size
         else
-          print 'WARNING: No backtrace available!!'
           0
         end
       end

data/lib/byebug/helper.rb

@@ -29,6 +29,29 @@ module Byebug
       end
     end
 
+    #
+    # Gets all lines in a source code file
+    #
+    def get_lines(filename)
+      return nil unless File.exist?(filename)
+
+      unless lines = SCRIPT_LINES__[filename]
+        lines = File.readlines(filename) rescue []
+        SCRIPT_LINES__[filename] = lines
+      end
+
+      return lines
+    end
+
+    #
+    # Gets a single line in a source code file
+    #
+    def get_line(filename, lineno)
+      return nil unless lines = get_lines(filename)
+
+      return lines[lineno-1]
+    end
+
     #
     # Returns true if code is syntactically correct for Ruby.
     #

data/lib/byebug/interfaces/script_interface.rb

@@ -1,5 +1,5 @@
 module Byebug
-  class ScriptInterface < Byebug::Interface
+  class ScriptInterface < Interface
     def initialize(file, out, verbose=false)
       super()
       @file = file.respond_to?(:gets) ? file : open(file)

data/lib/byebug/processors/command_processor.rb

@@ -1,5 +1,4 @@
 module Byebug
-
   class CommandProcessor < Processor
     attr_reader :display
 
@@ -61,24 +60,26 @@ module Byebug
 
     def at_breakpoint(context, breakpoint)
       n = Byebug.breakpoints.index(breakpoint) + 1
-      file = CommandProcessor.canonic_file(breakpoint.source)
+      file = self.class.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))
+      file = self.class.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
 
+    include ParseFunctions
+
     def at_tracing(context, file, line)
       if file != @last_file || line != @last_line || Setting[:tracing_plus]
+        path = self.class.canonic_file(file)
         @last_file, @last_line = file, line
-        print "Tracing: #{CommandProcessor.canonic_file(file)}:#{line} " \
-              "#{Byebug.line_at(file,line)}\n"
+        print "Tracing: #{path}:#{line} #{get_line(file, line)}"
       end
       always_run(context, file, line, 2)
     end
@@ -236,13 +237,12 @@ module Byebug
         end
 
         def location
-          loc = "#{CommandProcessor.canonic_file(@file)} @ #{@line}\n"
-          loc += "#{Byebug.line_at(@file, @line)}\n" unless
+          path = self.class.canonic_file(@file)
+          loc = "#{path} @ #{@line}\n"
+          loc += "#{get_line(@file, @line)}\n" unless
             ['(irb)', '-e'].include? @file
           loc
         end
       end
-
   end # class CommandProcessor
-
 end

data/lib/byebug/remote.rb

@@ -60,7 +60,7 @@ module Byebug
        return @actual_control_port if @control_thread
        server = TCPServer.new(host, ctrl_port)
        @actual_control_port = server.addr[1]
-       @control_thread = Thread.new do
+       @control_thread = DebugThread.new do
          while (session = server.accept)
            interface = RemoteInterface.new(session)
            ControlCommandProcessor.new(interface).process_commands
@@ -73,7 +73,7 @@ module Byebug
     # Connects to the remote byebug
     #
     def start_client(host = 'localhost', port = PORT)
-      interface = Byebug::LocalInterface.new
+      interface = LocalInterface.new
       socket = TCPSocket.new(host, port)
       puts "Connected."
 

data/lib/byebug/setting.rb

@@ -2,8 +2,10 @@ module Byebug
   class Setting
     attr_accessor :value
 
+    DEFAULT = false
+
     def initialize
-      @value = false
+      @value = self.class::DEFAULT
     end
 
     def self.settings

data/lib/byebug/settings/autoeval.rb

@@ -1,7 +1,9 @@
 module Byebug
   class AutoevalSetting < Setting
+    DEFAULT = true
+
     def initialize
-      EvalCommand.unknown = true
+      EvalCommand.unknown = DEFAULT
     end
 
     def help

data/lib/byebug/settings/autoirb.rb

@@ -1,7 +1,9 @@
 module Byebug
   class AutoirbSetting < Setting
+    DEFAULT = 0
+
     def initialize
-      IrbCommand.always_run = 0
+      IrbCommand.always_run = DEFAULT
     end
 
     def help

data/lib/byebug/settings/autolist.rb

@@ -1,7 +1,9 @@
 module Byebug
   class AutolistSetting < Setting
+    DEFAULT = 1
+
     def initialize
-      ListCommand.always_run = 1
+      ListCommand.always_run = DEFAULT
     end
 
     def help

data/lib/byebug/settings/autoreload.rb

@@ -1,8 +1,6 @@
 module Byebug
   class AutoreloadSetting < Setting
-    def initialize
-      @value = true
-    end
+    DEFAULT = true
 
     def help
       'Reload source code when changed'

data/lib/byebug/settings/autosave.rb

@@ -1,8 +1,6 @@
 module Byebug
   class AutosaveSetting < Setting
-    def initialize
-      @value = true
-    end
+    DEFAULT = true
 
     def help
       'If true, command history record is saved on exit'

data/lib/byebug/settings/callstyle.rb

@@ -1,15 +1,13 @@
 module Byebug
   class CallstyleSetting < Setting
-    def initialize
-      @value = :long
-    end
+    DEFAULT = 'long'
 
     def help
       'Set how you want method call parameters to be displayed'
     end
 
     def to_s
-      "Frame display callstyle is :#{value}"
+      "Frame display callstyle is '#{value}'"
     end
   end
 end

data/lib/byebug/settings/fullpath.rb

@@ -1,8 +1,6 @@
 module Byebug
   class FullpathSetting < Setting
-    def initialize
-      @value = true
-    end
+    DEFAULT = true
 
     def help
       'Display full file names in frames'

data/lib/byebug/settings/histfile.rb

@@ -1,8 +1,6 @@
 module Byebug
   class HistfileSetting < Setting
-    def initialize
-      @value = File.expand_path("#{ENV['HOME']||'.'}/.byebug_hist")
-    end
+    DEFAULT = File.expand_path("#{ENV['HOME'] || '.'}/.byebug_hist")
 
     def help
       "Customize file where history is loaded from and saved to. By default, " \

data/lib/byebug/settings/histsize.rb

@@ -2,10 +2,6 @@ module Byebug
   class HistsizeSetting < Setting
     DEFAULT = 256
 
-    def initialize
-      @value = DEFAULT
-    end
-
     def help
       "Customize maximum number of commands that can be stored in byebug's " \
       "history record. By default, #{DEFAULT}"

data/lib/byebug/settings/listsize.rb

@@ -1,8 +1,6 @@
 module Byebug
   class ListsizeSetting < Setting
-    def initialize
-      @value = 10
-    end
+    DEFAULT = 10
 
     def help
       'Set number of source lines to list by default'

data/lib/byebug/settings/post_mortem.rb

@@ -5,11 +5,24 @@ module Byebug
     end
 
     def value=(v)
-      v ? Byebug.post_mortem : Byebug.post_mortem = v
+      Byebug.post_mortem = v
+      at_exit { handle_post_mortem if Byebug.post_mortem? }
     end
 
     def value
       Byebug.post_mortem?
     end
+
+    private
+      #
+      # Saves information about the unhandled exception and gives a byebug
+      # prompt back to the user before program termination.
+      #
+      def handle_post_mortem
+        context = Byebug.raised_exception.__bb_context
+        file    = Byebug.raised_exception.__bb_file
+        line    = Byebug.raised_exception.__bb_line
+        Byebug.handler.at_line(context, file, line)
+      end
   end
 end

data/lib/byebug/settings/width.rb

@@ -1,14 +1,6 @@
 module Byebug
   class WidthSetting < Setting
-    def initialize
-      if ENV['COLUMNS'] =~ /^\d+$/
-        @value = ENV['COLUMNS'].to_i
-      elsif STDIN.tty? && exists?('stty')
-        @value = `stty size`.scan(/\d+/)[1].to_i
-      else
-        @value = 160
-      end
-    end
+    DEFAULT = 160
 
     def help
       "Number of characters per line in byebug's output"
@@ -17,13 +9,5 @@ module Byebug
     def to_s
       "Maximum width of byebug's output is #{value}"
     end
-
-    private
-
-      def exists?(command)
-        ENV['PATH'].split(File::PATH_SEPARATOR).any? do |d|
-          File.exist?(File.join(d, command))
-        end
-      end
   end
 end