byebug 5.0.0 → 6.0.0

data/lib/byebug/commands/set.rb

@@ -9,11 +9,34 @@ module Byebug
     include Helpers::ParseHelper
 
     self.allow_in_control = true
+    self.allow_in_post_mortem = true
 
-    def regexp
+    def self.regexp
       /^\s* set (?:\s+(?<setting>\w+))? (?:\s+(?<value>\S+))? \s*$/x
     end
 
+    def self.description
+      <<-EOD
+        set <setting> <value>
+
+        #{short_description}
+
+        Boolean values take "on", "off", "true", "false", "1" or "0". If you
+        don't specify a value, the boolean setting will be enabled. Conversely,
+        you can use "set no<setting>" to disable them.
+
+        You can see these environment settings with the "show" command.
+      EOD
+    end
+
+    def self.short_description
+      'Modifies byebug settings'
+    end
+
+    def self.help
+      super + Setting.help_all
+    end
+
     def execute
       key = @match[:setting]
       value = @match[:value]
@@ -36,6 +59,8 @@ module Byebug
       puts setting.to_s
     end
 
+    private
+
     def get_onoff(arg, default)
       return default if arg.nil?
 
@@ -48,23 +73,5 @@ module Byebug
         [nil, pr('set.errors.on_off', arg: arg)]
       end
     end
-
-    def help
-      description + Setting.help_all
-    end
-
-    def description
-      <<-EOD
-        set <setting> <value>
-
-        Modifies parts of byebug environment.
-
-        Boolean values take "on", "off", "true", "false", "1" or "0". If you
-        don't specify a value, the boolean setting will be enabled. Conversely,
-        you can use "set no<setting>" to disable them.
-
-        You can see these environment settings with the "show" command.
-      EOD
-    end
   end
 end

data/lib/byebug/commands/show.rb

@@ -6,11 +6,30 @@ module Byebug
   #
   class ShowCommand < Command
     self.allow_in_control = true
+    self.allow_in_post_mortem = true
 
-    def regexp
+    def self.regexp
       /^\s* show (?:\s+(?<setting>\w+))? \s*$/x
     end
 
+    def self.description
+      <<-EOD
+        show <setting> <value>
+
+        #{short_description}
+
+        You can change them with the "set" command.
+      EOD
+    end
+
+    def self.short_description
+      'Shows byebug settings'
+    end
+
+    def self.help
+      super + Setting.help_all
+    end
+
     def execute
       key = @match[:setting]
       return puts(help) unless key
@@ -20,18 +39,5 @@ module Byebug
 
       puts Setting.settings[setting.to_sym]
     end
-
-    def help
-      description + Setting.help_all
-    end
-
-    def description
-      <<-EOD
-        show <setting> <value>
-
-        Generic command for showing byebug settings. You can change them with
-        the "set" command.
-      EOD
-    end
   end
 end

data/lib/byebug/commands/source.rb

@@ -8,32 +8,33 @@ module Byebug
   #
   class SourceCommand < Command
     self.allow_in_control = true
+    self.allow_in_post_mortem = true
 
-    def regexp
+    def self.regexp
       /^\s* so(?:urce)? (?:\s+(\S+))? \s*$/x
     end
 
+    def self.description
+      <<-EOD
+        source <file>
+
+        #{short_description}
+      EOD
+    end
+
+    def self.short_description
+      'Restores a previously saved byebug session'
+    end
+
     def execute
       return puts(help) unless @match[1]
 
-      unless @state && @state.interface
-        return errmsg(pr('source.errors.not_available'))
-      end
-
       file = File.expand_path(@match[1]).strip
       unless File.exist?(file)
         return errmsg(pr('source.errors.not_found', file: file))
       end
 
-      @state.interface.read_file(file)
-    end
-
-    def description
-      <<-EOD
-        source <file>
-
-        Executes file <file> containing byebug commands.
-      EOD
+      processor.interface.read_file(file)
     end
   end
 end

data/lib/byebug/commands/step.rb

@@ -11,26 +11,28 @@ module Byebug
   class StepCommand < Command
     include Helpers::ParseHelper
 
-    self.allow_in_post_mortem = false
-
-    def regexp
+    def self.regexp
       /^\s* s(?:tep)? (?:\s+(\S+))? \s*$/x
     end
 
-    def execute
-      steps, err = parse_steps(@match[1], 'Steps')
-      return errmsg(err) unless steps
+    def self.description
+      <<-EOD
+        s[tep][ times]
 
-      @state.context.step_into(steps, @state.frame)
-      @state.proceed
+        #{short_description}
+      EOD
     end
 
-    def description
-      <<-EOD
-        s[tep][ nnn]
+    def self.short_description
+      'Steps into blocks or methods one or more times'
+    end
 
-        Steps (into methods) once or nnn times.
-      EOD
+    def execute
+      steps, err = parse_steps(@match[1], 'Steps')
+      return errmsg(err) unless steps
+
+      context.step_into(steps, context.frame.pos)
+      processor.proceed!
     end
   end
 end

data/lib/byebug/commands/thread.rb

@@ -13,16 +13,20 @@ module Byebug
   class ThreadCommand < Command
     include Subcommands
 
-    def regexp
+    def self.regexp
       /^\s* th(?:read)? (?:\s+ (.+))? \s*$/x
     end
 
-    def description
+    def self.description
       <<-EOD
-        th]read <subcommand>
+        th[read] <subcommand>
 
-        Commands to manipulate threads.
+        #{short_description}
       EOD
     end
+
+    def self.short_description
+      'Commands to manipulate threads'
+    end
   end
 end

data/lib/byebug/commands/thread/current.rb

@@ -8,28 +8,28 @@ module Byebug
     #
     # Information about the current thread
     #
-    class CurrentSubcommand < Command
+    class CurrentCommand < Command
       include Helpers::ThreadHelper
 
-      def regexp
+      def self.regexp
         /^\s* c(?:urrent)? \s*$/x
       end
 
-      def execute
-        display_context(@state.context)
-      end
-
-      def short_description
-        'Shows current thread information'
-      end
-
-      def description
+      def self.description
         <<-EOD
           th[read] c[urrent]
 
           #{short_description}
         EOD
       end
+
+      def self.short_description
+        'Shows current thread information'
+      end
+
+      def execute
+        display_context(context)
+      end
     end
   end
 end

data/lib/byebug/commands/thread/list.rb

@@ -8,13 +8,25 @@ module Byebug
     #
     # Information about threads
     #
-    class ListSubcommand < Command
+    class ListCommand < Command
       include Helpers::ThreadHelper
 
-      def regexp
+      def self.regexp
         /^\s* l(?:ist)? \s*$/x
       end
 
+      def self.description
+        <<-EOD
+          th[read] l[ist] <thnum>
+
+          #{short_description}
+        EOD
+      end
+
+      def self.short_description
+        'Lists all threads'
+      end
+
       def execute
         contexts = Byebug.contexts.sort_by(&:thnum)
 
@@ -24,18 +36,6 @@ module Byebug
 
         print(thread_list)
       end
-
-      def short_description
-        'Lists all threads'
-      end
-
-      def description
-        <<-EOD
-          th[read] l[ist] <thnum>
-
-          #{short_description}
-        EOD
-      end
     end
   end
 end

data/lib/byebug/commands/thread/resume.rb

@@ -8,13 +8,25 @@ module Byebug
     #
     # Resumes the specified thread
     #
-    class ResumeSubcommand < Command
+    class ResumeCommand < Command
       include Helpers::ThreadHelper
 
-      def regexp
+      def self.regexp
         /^\s* r(?:esume)? (?: \s* (\d+))? \s*$/x
       end
 
+      def self.description
+        <<-EOD
+          th[read] r[esume] <thnum>
+
+          #{short_description}
+        EOD
+      end
+
+      def self.short_description
+        'Resumes execution of the specified thread'
+      end
+
       def execute
         return puts(help) unless @match[1]
 
@@ -28,18 +40,6 @@ module Byebug
         context.resume
         display_context(context)
       end
-
-      def short_description
-        'Resumes execution of the specified thread'
-      end
-
-      def description
-        <<-EOD
-          th[read] r[esume] <thnum>
-
-          #{short_description}
-        EOD
-      end
     end
   end
 end

data/lib/byebug/commands/thread/stop.rb

@@ -8,13 +8,25 @@ module Byebug
     #
     # Stops the specified thread
     #
-    class StopSubcommand < Command
+    class StopCommand < Command
       include Helpers::ThreadHelper
 
-      def regexp
+      def self.regexp
         /^\s* st(?:op)? (?: \s* (\d+))? \s*$/x
       end
 
+      def self.description
+        <<-EOD
+          th[read] st[op] <thnum>
+
+          #{short_description}
+        EOD
+      end
+
+      def self.short_description
+        'Stops the execution of the specified thread'
+      end
+
       def execute
         return puts(help) unless @match[1]
 
@@ -24,18 +36,6 @@ module Byebug
         context.suspend
         display_context(context)
       end
-
-      def short_description
-        'Stops the execution of the specified thread'
-      end
-
-      def description
-        <<-EOD
-          th[read] st[op] <thnum>
-
-          #{short_description}
-        EOD
-      end
     end
   end
 end

data/lib/byebug/commands/thread/switch.rb

@@ -8,13 +8,25 @@ module Byebug
     #
     # Switches to the specified thread
     #
-    class SwitchSubcommand < Command
+    class SwitchCommand < Command
       include Helpers::ThreadHelper
 
-      def regexp
+      def self.regexp
         /^\s* sw(?:itch)? (?: \s* (\d+))? \s*$/x
       end
 
+      def self.description
+        <<-EOD
+          th[read] sw[itch] <thnum>
+
+          #{short_description}
+        EOD
+      end
+
+      def self.short_description
+        'Switches execution to the specified thread'
+      end
+
       def execute
         return puts(help) unless @match[1]
 
@@ -24,19 +36,8 @@ module Byebug
         display_context(context)
 
         context.switch
-        @state.proceed
-      end
 
-      def short_description
-        'Switches execution to the specified thread'
-      end
-
-      def description
-        <<-EOD
-          th[read] sw[itch] <thnum>
-
-          #{short_description}
-        EOD
+        processor.proceed!
       end
     end
   end