byebug 3.1.2 → 3.2.0

data/lib/byebug/commands/continue.rb

@@ -1,6 +1,4 @@
 module Byebug
-
-  # Implements byebug "continue" command.
   class ContinueCommand < Command
     self.allow_in_post_mortem = true
 
@@ -12,10 +10,9 @@ module Byebug
       if @match[1] && !@state.context.dead?
         filename = File.expand_path(@state.file)
         return unless line_number = get_int(@match[1], "Continue", 0, nil, 0)
-        return errmsg "Line #{line_number} is not a stopping point in file " \
-                      "\"#{filename}\"\n" unless
-          LineCache.trace_line_numbers(filename).member?(line_number)
-
+        unless LineCache.trace_line_numbers(filename).member?(line_number)
+          return errmsg "Line #{line_number} is not a valid stopping point in file\n"
+        end
         Byebug.add_breakpoint filename, line_number
       end
       @state.proceed

data/lib/byebug/commands/delete.rb

@@ -0,0 +1,38 @@
+module Byebug
+  class DeleteCommand < Command
+    self.allow_in_post_mortem = false
+    self.allow_in_control = true
+
+    def regexp
+      /^\s* del(?:ete)? (?:\s+(.*))?$/x
+    end
+
+    def execute
+      return errmsg "We are not in a state we can delete breakpoints.\n" unless
+        @state.context
+
+      if not @match[1]
+        Byebug.breakpoints.clear if confirm("Delete all breakpoints? (y or n) ")
+      else
+        @match[1].split(/[ \t]+/).each do |pos|
+          return unless pos = get_int(pos, "Delete", 1)
+          errmsg "No breakpoint number %d\n", pos unless
+            Byebug.remove_breakpoint(pos)
+        end
+      end
+    end
+
+    class << self
+      def names
+        %w(delete)
+      end
+
+      def description
+        %{del[ete][ nnn...]
+
+          Without and argument, deletes all breakpoints. With integer arguments,
+          it deletes specific breakpoints.}
+      end
+    end
+  end
+end

data/lib/byebug/commands/edit.rb

@@ -1,5 +1,4 @@
 module Byebug
-
   class EditCommand < Command
     self.allow_in_control = true
 
@@ -46,5 +45,4 @@ module Byebug
       end
     end
   end
-
 end

data/lib/byebug/commands/enable.rb

@@ -1,9 +1,10 @@
 module Byebug
-
-  # Mix-in module to assist in command parsing.
+  #
+  # Mixin to assist command parsing
+  #
   module EnableDisableFunctions
     def enable_disable_breakpoints(is_enable, args)
-      return errmsg "No breakpoints have been set." if Byebug.breakpoints.empty?
+      return errmsg "No breakpoints have been set" if Byebug.breakpoints.empty?
 
       all_breakpoints = Byebug.breakpoints.sort_by {|b| b.id }
       if args.empty?
@@ -32,8 +33,7 @@ module Byebug
 
     def enable_disable_display(is_enable, args)
       if 0 == @state.display.size
-        errmsg "No display expressions have been set.\n"
-        return
+        return errmsg "No display expressions have been set\n"
       end
       args.each do |pos|
         pos = get_int(pos, "#{is_enable} display", 1, @state.display.size)
@@ -64,7 +64,7 @@ module Byebug
 
     def execute
       return errmsg "\"enable\" must be followed by \"display\", " \
-                    "\"breakpoints\" or breakpoint numbers.\n" unless @match[1]
+                    "\"breakpoints\" or breakpoint ids\n" unless @match[1]
 
       args = @match[1].split(/[ \t]+/)
       param = args.shift
@@ -118,7 +118,7 @@ module Byebug
 
     def execute
       return errmsg "\"disable\" must be followed by \"display\", " \
-                    "\"breakpoints\" or breakpoint numbers.\n" unless @match[1]
+                    "\"breakpoints\" or breakpoint ids\n" unless @match[1]
 
       args = @match[1].split(/[ \t]+/)
       param = args.shift
@@ -151,5 +151,4 @@ module Byebug
       end
     end
   end
-
 end

data/lib/byebug/commands/finish.rb

@@ -1,6 +1,4 @@
 module Byebug
-
-  # Implements byebug's 'finish' command.
   class FinishCommand < Command
     self.allow_in_post_mortem = false
 

data/lib/byebug/commands/frame.rb

@@ -1,7 +1,8 @@
 # encoding: utf-8
 module Byebug
-
-  # Mix-in module to assist in command parsing.
+  #
+  # Mixin to assist command parsing
+  #
   module FrameFunctions
     def c_frame?(frame_no)
       @state.context.frame_binding(frame_no).nil?
@@ -52,7 +53,7 @@ module Byebug
     end
 
     def get_frame_class(style, pos)
-      frame_class = style == :short ? '' : "#{@state.context.frame_class pos}"
+      frame_class = style == 'short' ? '' : "#{@state.context.frame_class pos}"
       return frame_class == '' ? '' : "#{frame_class}."
     end
 
@@ -67,7 +68,7 @@ module Byebug
       args = @state.context.frame_args pos
       return '' if args.empty?
 
-      locals = @state.context.frame_locals pos if style == :long
+      locals = @state.context.frame_locals pos if style == 'long'
       my_args = args.map do |arg|
         case arg[0]
           when :block
@@ -77,7 +78,7 @@ module Byebug
           else
             prefix, default = '', nil
         end
-        klass = style == :long && arg[1] ? "##{locals[arg[1]].class}" : ''
+        klass = style == 'long' && arg[1] ? "##{locals[arg[1]].class}" : ''
         "#{prefix}#{arg[1] || default}#{klass}"
       end
 
@@ -118,18 +119,16 @@ module Byebug
       end
     end
 
+    def shortpath(fullpath)
+      separator = File::ALT_SEPARATOR || File::SEPARATOR
+      "...#{separator}" + fullpath.split(separator)[-3..-1].join(separator)
+    end
+
     def print_frame(pos, mark_current = true)
-      file = @state.context.frame_file pos
+      fullpath = @state.context.frame_file pos
+      file = Setting[:fullpath] ? fullpath : shortpath(fullpath)
       line = @state.context.frame_line pos
 
-      unless Setting[:fullpath]
-        path_components = file.split(/[\\\/]/)
-        if path_components.size > 3
-          path_components[0...-3] = '...'
-          file = path_components.join(File::ALT_SEPARATOR || File::SEPARATOR)
-        end
-      end
-
       if mark_current
         frame_str = (pos == @state.frame_pos) ? '--> ' : '    '
       else
@@ -150,7 +149,6 @@ module Byebug
     end
   end
 
-  # Implements byebug "where" or "backtrace" command.
   class WhereCommand < Command
     def regexp
       /^\s* (?:w(?:here)?|bt|backtrace) \s*$/x

data/lib/byebug/commands/help.rb

@@ -1,6 +1,4 @@
 module Byebug
-
-  # Implements byebug "help" command.
   class HelpCommand < Command
     include Columnize
 
@@ -26,7 +24,7 @@ module Byebug
         end
       end
 
-      print "byebug help v#{Byebug::VERSION}\n" unless Setting[:testing]
+      print "byebug help v#{VERSION}\n" unless Setting[:testing]
 
       print "Type \"help <command-name>\" for help on a specific command\n\n"
       print "Available commands:\n"

data/lib/byebug/commands/history.rb

@@ -5,11 +5,11 @@ module Byebug
     end
 
     def execute
-      if Byebug::Setting[:autosave]
+      if Setting[:autosave]
         if arg = @match[:num_cmds]
-          size = get_int(arg, 'history', 1, Byebug::Setting[:histsize])
+          size = get_int(arg, 'history', 1, Setting[:histsize])
         end
-        print Byebug::History.to_s(size || Byebug::Setting[:histsize])
+        print History.to_s(size || Setting[:histsize])
       else
         errmsg "Not currently saving history. Enable it with \"set autosave\"\n"
       end

data/lib/byebug/commands/info.rb

@@ -1,5 +1,4 @@
 module Byebug
-
   module InfoFunctions
     def info_catch(*args)
       return print "No frame selected.\n" unless @state.context
@@ -14,7 +13,6 @@ module Byebug
     end
   end
 
-  # Implements byebug "info" command.
   class InfoCommand < Command
     include Columnize
     self.allow_in_control = true
@@ -41,7 +39,6 @@ module Byebug
                                  'position in source file'                    ],
        ['locals'            , 2, 'Local variables of the current stack frame' ],
        ['program'           , 2, 'Execution status of the program'            ],
-       ['stack'             , 2, 'Backtrace of the stack'                     ],
        ['variables'         , 1, 'Local and instance variables of the '     \
                                  'current stack frame'                        ]
     ].map do |name, min, help|
@@ -141,8 +138,8 @@ module Byebug
     private :info_file_path
 
     def info_file_lines(file)
-      lines = LineCache.size(file)
-      print "\t #{lines} lines\n" if lines
+      lines = File.foreach(file)
+      print "\t#{lines.count} lines\n" if lines
     end
     private :info_file_lines
 
@@ -156,13 +153,13 @@ module Byebug
     private :info_file_breakpoints
 
     def info_file_mtime(file)
-      stat = LineCache.stat(file)
+      stat = File.stat(file)
       print "\t#{stat.mtime}\n" if stat
     end
     private :info_file_mtime
 
     def info_file_sha1(file)
-      print "\t#{LineCache.sha1(file)}\n"
+      print "\t#{Digest::SHA1.hexdigest(file)}\n"
     end
     private :info_file_sha1
 
@@ -250,10 +247,6 @@ module Byebug
       info_stop_reason @state.context.stop_reason
     end
 
-    def info_stack(*args)
-      print_backtrace
-    end
-
     def info_global_variables(*args)
       var_global
     end
@@ -295,7 +288,5 @@ module Byebug
         return str
       end
     end
-
   end
-
 end

data/lib/byebug/commands/interrupt.rb

@@ -0,0 +1,25 @@
+module Byebug
+  class InterruptCommand < Command
+    self.allow_in_control     = true
+    self.allow_in_post_mortem = false
+
+    def regexp
+      /^\s*i(?:nterrupt)?\s*$/
+    end
+
+    def execute
+      context = Byebug.thread_context(Thread.main)
+      context.interrupt
+    end
+
+    class << self
+      def names
+        %w(interrupt)
+      end
+
+      def description
+        %{i|nterrupt\t interrupt the program}
+      end
+    end
+  end
+end

data/lib/byebug/commands/kill.rb

@@ -1,6 +1,4 @@
 module Byebug
-
-  # Implements byebug "kill" command
   class KillCommand < Command
     self.allow_in_control = true
 

data/lib/byebug/commands/list.rb

@@ -1,6 +1,4 @@
 module Byebug
-
-  # Implements byebug "list" command.
   class ListCommand < Command
     def regexp
       /^\s* l(?:ist)? (?:\s*([-=])|\s+(\S+))? \s*$/x
@@ -8,8 +6,8 @@ module Byebug
 
     def execute
       Byebug.source_reload if Setting[:autoreload]
-      lines = getlines(@state.file, @state.line)
-      if !lines
+
+      unless lines = get_lines(@state.file)
         errmsg "No sourcefile available for #{@state.file}\n"
         return @state.previous_line
       end

data/lib/byebug/commands/method.rb

@@ -1,19 +1,14 @@
 module Byebug
-  # Implements byebug's 'method' command.
   class MethodCommand < Command
     include Columnize
 
     def regexp
-      /^\s* m(?:ethod)? \s+ ((iv)|(i(:?nstance)?)\s+)?/x
+      /^\s* m(?:ethod)? \s+ (i(:?nstance)?\s+)?/x
     end
 
     def execute
       obj = bb_eval(@match.post_match)
-      if @match[1] == 'iv'
-        obj.instance_variables.sort.each do |v|
-          print "#{v} = #{obj.instance_variable_get(v).inspect}\n"
-        end
-      elsif @match[1]
+      if @match[1]
         print "#{columnize(obj.methods.sort(), Setting[:width])}\n"
       elsif !obj.kind_of?(Module)
         print "Should be Class/Module: #{@match.post_match}\n"
@@ -29,7 +24,6 @@ module Byebug
 
       def description
         %{m[ethod] i[nstance] <obj>\tshow methods of object
-          m[ethod] iv <obj>\t\tshow instance variables of object
           m[ethod] <class|module>\t\tshow instance methods of class or module}
       end
     end

data/lib/byebug/commands/quit.rb

@@ -1,6 +1,4 @@
 module Byebug
-
-  # Implements byebug "quit" command
   class QuitCommand < Command
     self.allow_in_control = true
 

data/lib/byebug/commands/reload.rb

@@ -1,17 +1,4 @@
 module Byebug
-
-  module ReloadFunctions
-    def getlines(file, line)
-      unless (lines = SCRIPT_LINES__[file]) and lines != true
-        Tracer::Single.get_line(file, line) if File.exist?(file)
-        lines = SCRIPT_LINES__[file]
-        lines = nil if lines == true
-      end
-      lines
-    end
-  end
-
-  # Implements byebug "reload" command.
   class ReloadCommand < Command
     self.allow_in_control = true
     self.allow_in_post_mortem = false
@@ -22,8 +9,8 @@ module Byebug
 
     def execute
       Byebug.source_reload
-      print "Source code is reloaded. Automatic reloading is "   \
-            "#{Setting[:autoreload] ? 'on' : 'off'}.\n"
+      onoff = Setting[:autoreload] ? 'on' : 'off'
+      print "Source code was reloaded. Automatic reloading is #{onoff}\n"
     end
 
     class << self

data/lib/byebug/commands/repl.rb

@@ -48,8 +48,6 @@ module IRB
 end
 
 module Byebug
-
-  # Implements byebug's "irb" command.
   class IrbCommand < Command
     def regexp
       /^\s* irb \s*$/x
@@ -101,7 +99,6 @@ module Byebug
     has_pry = false
   end
 
-  # Implements byebug's "pry" command
   class PryCommand < Command
     def regexp
       /^\s* pry \s*$/x

data/lib/byebug/commands/{control.rb → restart.rb}

@@ -7,8 +7,8 @@ module Byebug
     end
 
     def execute
-      prog = Byebug::PROG_SCRIPT if defined?(Byebug::PROG_SCRIPT)
-      byebug_script = Byebug::BYEBUG_SCRIPT if defined?(Byebug::BYEBUG_SCRIPT)
+      prog = PROG_SCRIPT if defined?(PROG_SCRIPT)
+      byebug_script = BYEBUG_SCRIPT if defined?(BYEBUG_SCRIPT)
 
       return errmsg "Don't know name of debugged program\n" unless prog
 
@@ -55,28 +55,4 @@ module Byebug
       end
     end
   end
-
-  class InterruptCommand < Command
-    self.allow_in_control     = true
-    self.allow_in_post_mortem = false
-
-    def regexp
-      /^\s*i(?:nterrupt)?\s*$/
-    end
-
-    def execute
-      context = Byebug.thread_context(Thread.main)
-      context.interrupt
-    end
-
-    class << self
-      def names
-        %w(interrupt)
-      end
-
-      def description
-        %{i|nterrupt\t interrupt the program}
-      end
-    end
-  end
 end