byebug 5.0.0 → 6.0.0

data/lib/byebug/commands/history.rb

@@ -8,12 +8,26 @@ module Byebug
   class HistoryCommand < Command
     include Helpers::ParseHelper
 
-    def regexp
+    self.allow_in_post_mortem = true
+
+    def self.regexp
       /^\s* hist(?:ory)? (?:\s+(?<num_cmds>.+))? \s*$/x
     end
 
+    def self.description
+      <<-EOD
+        hist[ory] [num_cmds]
+
+        #{short_description}
+      EOD
+    end
+
+    def self.short_description
+      "Shows byebug's history of commands"
+    end
+
     def execute
-      history = @state.interface.history
+      history = processor.interface.history
 
       if @match[:num_cmds]
         size, = get_int(@match[:num_cmds], 'history', 1, history.size)
@@ -22,13 +36,5 @@ module Byebug
 
       puts history.to_s(size)
     end
-
-    def description
-      <<-EOD
-        hist[ory] [num_cmds]
-
-        Show byebug's command history.
-      EOD
-    end
   end
 end

data/lib/byebug/commands/info.rb

@@ -1,8 +1,6 @@
 require 'byebug/subcommands'
 
-require 'byebug/commands/info/args'
 require 'byebug/commands/info/breakpoints'
-require 'byebug/commands/info/catch'
 require 'byebug/commands/info/display'
 require 'byebug/commands/info/file'
 require 'byebug/commands/info/line'
@@ -16,17 +14,22 @@ module Byebug
     include Subcommands
 
     self.allow_in_control = true
+    self.allow_in_post_mortem = true
 
-    def regexp
+    def self.regexp
       /^\s* i(?:nfo)? (?:\s+ (.+))? \s*$/x
     end
 
-    def description
+    def self.description
       <<-EOD
         info[ subcommand]
 
-        Generic command for showing things about the program being debugged.
+        #{short_description}
       EOD
     end
+
+    def self.short_description
+      'Shows several informations about the program being debugged'
+    end
   end
 end

data/lib/byebug/commands/info/breakpoints.rb

@@ -6,11 +6,25 @@ module Byebug
     #
     # Information about current breakpoints
     #
-    class BreakpointsSubcommand < Command
-      def regexp
+    class BreakpointsCommand < Command
+      self.allow_in_post_mortem = true
+
+      def self.regexp
         /^\s* b(?:reakpoints)? (?:\s+ (.+))? \s*$/x
       end
 
+      def self.description
+        <<-EOD
+          inf[o] b[reakpoints]
+
+          #{short_description}
+        EOD
+      end
+
+      def self.short_description
+        'Status of user settable breakpoints'
+      end
+
       def execute
         return puts('No breakpoints.') if Byebug.breakpoints.empty?
 
@@ -28,18 +42,6 @@ module Byebug
         breakpoints.each { |b| info_breakpoint(b) }
       end
 
-      def short_description
-        'Status of user settable breakpoints.'
-      end
-
-      def description
-        <<-EOD
-          inf[o] b[reakpoints]
-
-          #{short_description}
-        EOD
-      end
-
       private
 
       def info_breakpoint(brkpt)

data/lib/byebug/commands/info/display.rb

@@ -6,37 +6,37 @@ module Byebug
     #
     # Information about display expressions
     #
-    class DisplaySubcommand < Command
-      def regexp
+    class DisplayCommand < Command
+      self.allow_in_post_mortem = true
+
+      def self.regexp
         /^\s* d(?:isplay)? \s*$/x
       end
 
-      def execute
-        display = @state.display
+      def self.description
+        <<-EOD
+          inf[o] d[display]
+
+          #{short_description}
+        EOD
+      end
+
+      def self.short_description
+        'List of expressions to display when program stops'
+      end
 
-        unless display.find { |d| d[0] }
+      def execute
+        unless Byebug.displays.find { |d| d[0] }
           return puts('There are no auto-display expressions now.')
         end
 
         puts 'Auto-display expressions now in effect:'
         puts 'Num Enb Expression'
 
-        display.each_with_index do |d, i|
+        Byebug.displays.each_with_index do |d, i|
           puts(format('%3d: %s  %s', i + 1, d[0] ? 'y' : 'n', d[1]))
         end
       end
-
-      def short_description
-        'List of expressions to display when program stops'
-      end
-
-      def description
-        <<-EOD
-          inf[o] d[display]
-
-          #{short_description}
-        EOD
-      end
     end
   end
 end

data/lib/byebug/commands/info/file.rb

@@ -8,15 +8,32 @@ module Byebug
     #
     # Information about a particular source file
     #
-    class FileSubcommand < Command
+    class FileCommand < Command
       include Helpers::FileHelper
 
-      def regexp
+      self.allow_in_post_mortem = true
+
+      def self.regexp
         /^\s* f(?:ile)? (?:\s+ (\S+))? \s*$/x
       end
 
+      def self.description
+        <<-EOD
+          inf[o] f[ile]
+
+          #{short_description}
+
+          It informs about file name, number of lines, possible breakpoints in
+          the file, last modification time and sha1 digest.
+        EOD
+      end
+
+      def self.short_description
+        'Information about a particular source file.'
+      end
+
       def execute
-        file = @match[1] || @state.file
+        file = @match[1] || frame.file
         unless File.exist?(file)
           return errmsg(pr('info.errors.undefined_file', file: file))
         end
@@ -25,8 +42,7 @@ module Byebug
 
           File #{info_file_basic(file)}
 
-          Breakpoint line numbers:
-          #{info_file_breakpoints(file)}
+          Breakpoint line numbers: #{info_file_breakpoints(file)}
 
           Modification time: #{info_file_mtime(file)}
 
@@ -35,21 +51,6 @@ module Byebug
         EOC
       end
 
-      def short_description
-        'Information about a particular source file.'
-      end
-
-      def description
-        <<-EOD
-          inf[o] f[ile]
-
-          #{short_description}
-
-          It informs about file name, number of lines, possible breakpoints in
-          the file, last modification time and sha1 digest.
-        EOD
-      end
-
       private
 
       def info_file_basic(file)
@@ -64,8 +65,7 @@ module Byebug
         breakpoints = Breakpoint.potential_lines(file)
         return unless breakpoints
 
-        breakpoints.to_a.sort.columnize(line_prefix: '  ',
-                                        displaywidth: Setting[:width])
+        breakpoints.to_a.sort.join(' ')
       end
 
       def info_file_mtime(file)

data/lib/byebug/commands/info/line.rb

@@ -6,26 +6,28 @@ module Byebug
     #
     # Information about current location
     #
-    class LineSubcommand < Command
-      def regexp
-        /^\s* l(?:ine)? \s*$/x
-      end
+    class LineCommand < Command
+      self.allow_in_post_mortem = true
 
-      def execute
-        puts "Line #{@state.line} of \"#{@state.file}\""
-      end
-
-      def short_description
-        'Line number and file name of current position in source file.'
+      def self.regexp
+        /^\s* l(?:ine)? \s*$/x
       end
 
-      def description
+      def self.description
         <<-EOD
           inf[o] l[ine]
 
           #{short_description}
         EOD
       end
+
+      def self.short_description
+        'Line number and file name of current position in source file.'
+      end
+
+      def execute
+        puts "Line #{frame.line} of \"#{frame.file}\""
+      end
     end
   end
 end

data/lib/byebug/commands/info/program.rb

@@ -6,32 +6,28 @@ module Byebug
     #
     # Information about arguments of the current method/block
     #
-    class ProgramSubcommand < Command
-      def regexp
+    class ProgramCommand < Command
+      self.allow_in_post_mortem = true
+
+      def self.regexp
         /^\s* p(?:rogram)? \s*$/x
       end
 
-      def execute
-        if @state.context.dead?
-          puts 'The program crashed.'
-          excpt = Byebug.last_exception
-          return puts("Exception: #{excpt.inspect}") if excpt
-        end
+      def self.description
+        <<-EOD
+          inf[o] p[rogram]
 
-        puts 'Program stopped. '
-        format_stop_reason @state.context.stop_reason
+          #{short_description}
+        EOD
       end
 
-      def short_description
+      def self.short_description
         'Information about the current status of the debugged program.'
       end
 
-      def description
-        <<-EOD
-          inf[o] p[rogram]
-
-          #{short_description}
-        EOD
+      def execute
+        puts 'Program stopped. '
+        format_stop_reason context.stop_reason
       end
 
       private

data/lib/byebug/commands/interrupt.rb

@@ -6,23 +6,25 @@ module Byebug
   #
   class InterruptCommand < Command
     self.allow_in_control = true
-    self.allow_in_post_mortem = false
 
-    def regexp
-      /^\s*i(?:nterrupt)?\s*$/
+    def self.regexp
+      /^\s*int(?:errupt)?\s*$/
     end
 
-    def execute
-      context = Byebug.thread_context(Thread.main)
-      context.interrupt
-    end
-
-    def description
+    def self.description
       <<-EOD
-        i[nterrupt]
+        int[errupt]
 
-        Interrupts the program.
+        #{short_description}
       EOD
     end
+
+    def self.short_description
+      'Interrupts the program'
+    end
+
+    def execute
+      Byebug.thread_context(Thread.main).interrupt
+    end
   end
 end

data/lib/byebug/commands/irb.rb

@@ -6,24 +6,30 @@ module Byebug
   # Enter IRB from byebug's prompt
   #
   class IrbCommand < Command
-    def regexp
+    self.allow_in_post_mortem = true
+
+    def self.regexp
       /^\s* irb \s*$/x
     end
 
+    def self.description
+      <<-EOD
+        irb
+
+        #{short_description}
+      EOD
+    end
+
+    def self.short_description
+      'Starts an IRB session'
+    end
+
     def execute
-      unless @state.interface.is_a?(LocalInterface)
+      unless processor.interface.is_a?(LocalInterface)
         return errmsg(pr('base.errors.only_local'))
       end
 
       IRB.start(__FILE__)
     end
-
-    def description
-      <<-EOD
-        irb
-
-        Starts an Interactive Ruby (IRB) session.
-      EOD
-    end
   end
 end

data/lib/byebug/commands/kill.rb

@@ -7,33 +7,39 @@ module Byebug
   class KillCommand < Command
     self.allow_in_control = true
 
-    def regexp
+    def self.regexp
       /^\s* (?:kill) \s* (?:\s+(\S+))? \s*$/x
     end
 
+    def self.description
+      <<-EOD
+        kill[ signal]
+
+        #{short_description}
+
+        Equivalent of Process.kill(Process.pid)
+      EOD
+    end
+
+    def self.short_description
+      'Sends a signal to the current process'
+    end
+
     def execute
       if @match[1]
         signame = @match[1]
+
         unless Signal.list.member?(signame)
-          errmsg("signal name #{signame} is not a signal I know about\n")
-          return false
+          return errmsg("signal name #{signame} is not a signal I know about\n")
         end
-        @state.interface.close if 'KILL' == signame
       else
         return unless confirm('Really kill? (y/n) ')
+
         signame = 'KILL'
       end
 
+      processor.interface.close if 'KILL' == signame
       Process.kill(signame, Process.pid)
     end
-
-    def description
-      <<-EOD
-        kill[ signal]
-
-        Send [signal] to Process.pid
-        Equivalent of Process.kill(Process.pid)
-      EOD
-    end
   end
 end