byebug 9.0.5 → 11.1.3

data/lib/byebug/commands/restart.rb

@@ -1,12 +1,18 @@
-require 'byebug/command'
-require 'byebug/helpers/path'
-require 'shellwords'
+# frozen_string_literal: true
+
+require_relative "../command"
+require_relative "../helpers/bin"
+require_relative "../helpers/path"
+require "shellwords"
+require "English"
+require "rbconfig"
 
 module Byebug
   #
   # Restart debugged program from within byebug.
   #
   class RestartCommand < Command
+    include Helpers::BinHelper
     include Helpers::PathHelper
 
     self.allow_in_control = true
@@ -17,29 +23,42 @@ module Byebug
     end
 
     def self.description
-      <<-EOD
+      <<-DESCRIPTION
         restart [args]
 
         #{short_description}
 
         This is a re-exec - all byebug state is lost. If command arguments are
         passed those are used.
-      EOD
+      DESCRIPTION
     end
 
     def self.short_description
-      'Restarts the debugged program'
+      "Restarts the debugged program"
     end
 
     def execute
-      argv = [$PROGRAM_NAME]
+      cmd = [$PROGRAM_NAME]
+
+      cmd = prepend_byebug_bin(cmd)
+      cmd = prepend_ruby_bin(cmd)
+
+      cmd += (@match[:args] ? @match[:args].shellsplit : $ARGV)
 
-      argv.unshift(bin_file) if Byebug.mode == :standalone
+      puts pr("restart.success", cmd: cmd.shelljoin)
+      Kernel.exec(*cmd)
+    end
+
+    private
 
-      argv += (@match[:args] ? @match[:args].shellsplit : $ARGV.compact)
+    def prepend_byebug_bin(cmd)
+      cmd.unshift(bin_file) if Byebug.mode == :standalone
+      cmd
+    end
 
-      puts pr('restart.success', cmd: argv.shelljoin)
-      Kernel.exec(*argv)
+    def prepend_ruby_bin(cmd)
+      cmd.unshift(RbConfig.ruby) if which("ruby") != which(cmd.first)
+      cmd
     end
   end
 end

data/lib/byebug/commands/save.rb

@@ -1,4 +1,6 @@
-require 'byebug/command'
+# frozen_string_literal: true
+
+require_relative "../command"
 
 module Byebug
   #
@@ -13,7 +15,7 @@ module Byebug
     end
 
     def self.description
-      <<-EOD
+      <<-DESCRIPTION
         save[ FILE]
 
         #{short_description}
@@ -24,22 +26,22 @@ module Byebug
 
         Use the "source" command in another debug session to restore the saved
         file.
-      EOD
+      DESCRIPTION
     end
 
     def self.short_description
-      'Saves current byebug session to a file'
+      "Saves current byebug session to a file"
     end
 
     def execute
-      file = File.open(@match[1] || Setting[:savefile], 'w')
+      file = File.open(@match[1] || Setting[:savefile], "w")
 
       save_breakpoints(file)
       save_catchpoints(file)
       save_displays(file)
       save_settings(file)
 
-      print pr('save.messages.done', path: file.path)
+      print pr("save.messages.done", path: file.path)
       file.close
     end
 
@@ -52,7 +54,7 @@ module Byebug
     end
 
     def save_catchpoints(file)
-      Byebug.catchpoints.keys.each do |c|
+      Byebug.catchpoints.each_key do |c|
         file.puts "catch #{c}"
       end
     end
@@ -62,7 +64,7 @@ module Byebug
     end
 
     def save_settings(file)
-      %w(autoirb autolist basename).each do |setting|
+      %w[autoirb autolist basename].each do |setting|
         file.puts "set #{setting} #{Setting[setting.to_sym]}"
       end
     end

data/lib/byebug/commands/set.rb

@@ -1,5 +1,7 @@
-require 'byebug/command'
-require 'byebug/helpers/parse'
+# frozen_string_literal: true
+
+require_relative "../command"
+require_relative "../helpers/parse"
 
 module Byebug
   #
@@ -16,7 +18,7 @@ module Byebug
     end
 
     def self.description
-      <<-EOD
+      <<-DESCRIPTION
         set <setting> <value>
 
         #{short_description}
@@ -26,11 +28,11 @@ module Byebug
         you can use "set no<setting>" to disable them.
 
         You can see these environment settings with the "show" command.
-      EOD
+      DESCRIPTION
     end
 
     def self.short_description
-      'Modifies byebug settings'
+      "Modifies byebug settings"
     end
 
     def self.help
@@ -43,12 +45,12 @@ module Byebug
       return puts(help) if key.nil? && value.nil?
 
       setting = Setting.find(key)
-      return errmsg(pr('set.errors.unknown_setting', key: key)) unless setting
+      return errmsg(pr("set.errors.unknown_setting", key: key)) unless setting
 
       if !setting.boolean? && value.nil?
-        err = pr('set.errors.must_specify_value', key: key)
+        err = pr("set.errors.must_specify_value", key: key)
       elsif setting.boolean?
-        value, err = get_onoff(value, key =~ /^no/ ? false : true)
+        value, err = get_onoff(value, /^no/.match?(key) ? false : true)
       elsif setting.integer?
         value, err = get_int(value, setting.to_sym, 1)
       end
@@ -65,12 +67,12 @@ module Byebug
       return default if arg.nil?
 
       case arg
-      when '1', 'on', 'true'
+      when "1", "on", "true"
         true
-      when '0', 'off', 'false'
+      when "0", "off", "false"
         false
       else
-        [nil, pr('set.errors.on_off', arg: arg)]
+        [nil, pr("set.errors.on_off", arg: arg)]
       end
     end
   end

data/lib/byebug/commands/show.rb

@@ -1,4 +1,6 @@
-require 'byebug/command'
+# frozen_string_literal: true
+
+require_relative "../command"
 
 module Byebug
   #
@@ -13,17 +15,17 @@ module Byebug
     end
 
     def self.description
-      <<-EOD
+      <<-DESCRIPTION
         show <setting> <value>
 
         #{short_description}
 
         You can change them with the "set" command.
-      EOD
+      DESCRIPTION
     end
 
     def self.short_description
-      'Shows byebug settings'
+      "Shows byebug settings"
     end
 
     def self.help
@@ -35,7 +37,7 @@ module Byebug
       return puts(help) unless key
 
       setting = Setting.find(key)
-      return errmsg(pr('show.errors.unknown_setting', key: key)) unless setting
+      return errmsg(pr("show.errors.unknown_setting", key: key)) unless setting
 
       puts Setting.settings[setting.to_sym]
     end

data/lib/byebug/commands/skip.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+require_relative "../command"
+require_relative "../helpers/parse"
+
+module Byebug
+  #
+  # Allows the user to continue execution until the next breakpoint, as
+  # long as it is different from the current one
+  #
+  class SkipCommand < Command
+    include Helpers::ParseHelper
+
+    class << self
+      attr_writer :file_line, :file_path
+      attr_reader :previous_autolist
+
+      def file_line
+        @file_line ||= 0
+      end
+
+      def file_path
+        @file_path ||= ""
+      end
+
+      def setup_autolist(value)
+        @previous_autolist = ListCommand.always_run
+        ListCommand.always_run = value
+      end
+
+      def restore_autolist
+        ListCommand.always_run = @previous_autolist
+        @previous_autolist = nil
+      end
+    end
+
+    def self.regexp
+      /^\s* sk(?:ip)? \s*$/x
+    end
+
+    def self.description
+      <<-DESCRIPTION
+        sk[ip]
+
+        #{short_description}
+      DESCRIPTION
+    end
+
+    def self.short_description
+      "Runs until the next breakpoint as long as it is different from the current one"
+    end
+
+    def initialize_attributes
+      self.class.always_run = 2
+      self.class.setup_autolist(0)
+      self.class.file_path = frame.file
+      self.class.file_line = frame.line
+    end
+
+    def keep_execution
+      [self.class.file_path, self.class.file_line] == [frame.file, frame.line]
+    end
+
+    def reset_attributes
+      self.class.always_run = 0
+      ListCommand.new(processor).execute if self.class.previous_autolist == 1
+      self.class.restore_autolist
+    end
+
+    def auto_run
+      return false unless self.class.always_run == 2
+
+      keep_execution ? processor.proceed! : reset_attributes
+      true
+    end
+
+    def execute
+      return if auto_run
+
+      initialize_attributes
+      processor.proceed!
+      Byebug.stop if Byebug.stoppable?
+    end
+  end
+end

data/lib/byebug/commands/source.rb

@@ -1,4 +1,6 @@
-require 'byebug/command'
+# frozen_string_literal: true
+
+require_relative "../command"
 
 module Byebug
   #
@@ -15,24 +17,22 @@ module Byebug
     end
 
     def self.description
-      <<-EOD
+      <<-DESCRIPTION
         source <file>
 
         #{short_description}
-      EOD
+      DESCRIPTION
     end
 
     def self.short_description
-      'Restores a previously saved byebug session'
+      "Restores a previously saved byebug session"
     end
 
     def execute
       return puts(help) unless @match[1]
 
       file = File.expand_path(@match[1]).strip
-      unless File.exist?(file)
-        return errmsg(pr('source.errors.not_found', file: file))
-      end
+      return errmsg(pr("source.errors.not_found", file: file)) unless File.exist?(file)
 
       processor.interface.read_file(file)
     end

data/lib/byebug/commands/step.rb

@@ -1,5 +1,7 @@
-require 'byebug/command'
-require 'byebug/helpers/parse'
+# frozen_string_literal: true
+
+require_relative "../command"
+require_relative "../helpers/parse"
 
 module Byebug
   #
@@ -16,19 +18,19 @@ module Byebug
     end
 
     def self.description
-      <<-EOD
+      <<-DESCRIPTION
         s[tep][ times]
 
         #{short_description}
-      EOD
+      DESCRIPTION
     end
 
     def self.short_description
-      'Steps into blocks or methods one or more times'
+      "Steps into blocks or methods one or more times"
     end
 
     def execute
-      steps, err = parse_steps(@match[1], 'Steps')
+      steps, err = parse_steps(@match[1], "Steps")
       return errmsg(err) unless steps
 
       context.step_into(steps, context.frame.pos)

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

@@ -1,4 +1,6 @@
-require 'byebug/helpers/thread'
+# frozen_string_literal: true
+
+require_relative "../../helpers/thread"
 
 module Byebug
   #
@@ -16,15 +18,15 @@ module Byebug
       end
 
       def self.description
-        <<-EOD
+        <<-DESCRIPTION
           th[read] c[urrent]
 
           #{short_description}
-        EOD
+        DESCRIPTION
       end
 
       def self.short_description
-        'Shows current thread information'
+        "Shows current thread information"
       end
 
       def execute

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

@@ -1,4 +1,6 @@
-require 'byebug/helpers/thread'
+# frozen_string_literal: true
+
+require_relative "../../helpers/thread"
 
 module Byebug
   #
@@ -16,21 +18,21 @@ module Byebug
       end
 
       def self.description
-        <<-EOD
+        <<-DESCRIPTION
           th[read] l[ist] <thnum>
 
           #{short_description}
-        EOD
+        DESCRIPTION
       end
 
       def self.short_description
-        'Lists all threads'
+        "Lists all threads"
       end
 
       def execute
         contexts = Byebug.contexts.sort_by(&:thnum)
 
-        thread_list = prc('thread.context', contexts) do |context, _|
+        thread_list = prc("thread.context", contexts) do |context, _|
           thread_arguments(context)
         end
 

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

@@ -1,4 +1,6 @@
-require 'byebug/helpers/thread'
+# frozen_string_literal: true
+
+require_relative "../../helpers/thread"
 
 module Byebug
   #
@@ -16,15 +18,15 @@ module Byebug
       end
 
       def self.description
-        <<-EOD
+        <<-DESCRIPTION
           th[read] r[esume] <thnum>
 
           #{short_description}
-        EOD
+        DESCRIPTION
       end
 
       def self.short_description
-        'Resumes execution of the specified thread'
+        "Resumes execution of the specified thread"
       end
 
       def execute
@@ -33,9 +35,7 @@ module Byebug
         context, err = context_from_thread(@match[1])
         return errmsg(err) if err
 
-        unless context.suspended?
-          return errmsg(pr('thread.errors.already_running'))
-        end
+        return errmsg(pr("thread.errors.already_running")) unless context.suspended?
 
         context.resume
         display_context(context)

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

@@ -1,4 +1,6 @@
-require 'byebug/helpers/thread'
+# frozen_string_literal: true
+
+require_relative "../../helpers/thread"
 
 module Byebug
   #
@@ -16,15 +18,15 @@ module Byebug
       end
 
       def self.description
-        <<-EOD
+        <<-DESCRIPTION
           th[read] st[op] <thnum>
 
           #{short_description}
-        EOD
+        DESCRIPTION
       end
 
       def self.short_description
-        'Stops the execution of the specified thread'
+        "Stops the execution of the specified thread"
       end
 
       def execute

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

@@ -1,4 +1,6 @@
-require 'byebug/helpers/thread'
+# frozen_string_literal: true
+
+require_relative "../../helpers/thread"
 
 module Byebug
   #
@@ -16,15 +18,15 @@ module Byebug
       end
 
       def self.description
-        <<-EOD
+        <<-DESCRIPTION
           th[read] sw[itch] <thnum>
 
           #{short_description}
-        EOD
+        DESCRIPTION
       end
 
       def self.short_description
-        'Switches execution to the specified thread'
+        "Switches execution to the specified thread"
       end
 
       def execute

data/lib/byebug/commands/thread.rb

@@ -1,10 +1,12 @@
-require 'byebug/subcommands'
+# frozen_string_literal: true
 
-require 'byebug/commands/thread/current'
-require 'byebug/commands/thread/list'
-require 'byebug/commands/thread/resume'
-require 'byebug/commands/thread/stop'
-require 'byebug/commands/thread/switch'
+require_relative "../subcommands"
+
+require_relative "../commands/thread/current"
+require_relative "../commands/thread/list"
+require_relative "../commands/thread/resume"
+require_relative "../commands/thread/stop"
+require_relative "../commands/thread/switch"
 
 module Byebug
   #
@@ -18,15 +20,15 @@ module Byebug
     end
 
     def self.description
-      <<-EOD
+      <<-DESCRIPTION
         th[read] <subcommand>
 
         #{short_description}
-      EOD
+      DESCRIPTION
     end
 
     def self.short_description
-      'Commands to manipulate threads'
+      "Commands to manipulate threads"
     end
   end
 end

data/lib/byebug/commands/tracevar.rb

@@ -1,4 +1,6 @@
-require 'byebug/command'
+# frozen_string_literal: true
+
+require_relative "../command"
 
 module Byebug
   #
@@ -12,7 +14,7 @@ module Byebug
     end
 
     def self.description
-      <<-EOD
+      <<-DESCRIPTION
         tr[acevar] <variable> [[no]stop]
 
         #{short_description}
@@ -20,20 +22,17 @@ module Byebug
         If "stop" is specified, execution will stop every time the variable
         changes its value. If nothing or "nostop" is specified, execution won't
         stop, changes will just be logged in byebug's output.
-      EOD
+      DESCRIPTION
     end
 
     def self.short_description
-      'Enables tracing of a global variable'
+      "Enables tracing of a global variable"
     end
 
     def execute
       var = @match[1]
-      return errmsg(pr('trace.errors.needs_global_variable')) unless var
-
-      unless global_variables.include?(:"#{var}")
-        return errmsg(pr('trace.errors.var_is_not_global', name: var))
-      end
+      return errmsg(pr("trace.errors.needs_global_variable")) unless var
+      return errmsg(pr("trace.errors.var_is_not_global", name: var)) unless global_variables.include?(:"#{var}")
 
       stop = @match[2] && @match[2] !~ /nostop/
 
@@ -41,13 +40,13 @@ module Byebug
         trace_var(:"#{var}") { |val| on_change(var, val, stop) }
       end
 
-      puts pr('trace.messages.success', var: var)
+      puts pr("trace.messages.success", var: var)
     end
 
     private
 
     def on_change(name, value, stop)
-      puts pr('trace.messages.on_change', name: name, value: value)
+      puts pr("trace.messages.on_change", name: name, value: value)
 
       context.step_out(1, false) if stop
     end