byebug 3.5.1 → 4.0.0

data/lib/byebug/commands/method.rb

@@ -1,3 +1,5 @@
+require 'byebug/command'
+
 module Byebug
   #
   # Show methods of specific classes/modules/objects.
@@ -11,13 +13,17 @@ module Byebug
 
     def execute
       obj = bb_eval(@match.post_match)
-      if @match[1]
-        puts "#{columnize(obj.methods.sort, Setting[:width])}"
-      elsif !obj.is_a?(Module)
-        puts "Should be Class/Module: #{@match.post_match}"
-      else
-        puts "#{columnize(obj.instance_methods(false).sort, Setting[:width])}"
-      end
+      result =
+        if @match[1]
+          prc('method.methods', obj.methods.sort) { |item, _| { name: item } }
+        elsif !obj.is_a?(Module)
+          pr('variable.errors.not_module', object: @match.post_match)
+        else
+          prc('method.methods', obj.instance_methods(false).sort) do |item, _|
+            { name: item }
+          end
+        end
+      puts result
     end
 
     class << self
@@ -26,13 +32,15 @@ module Byebug
       end
 
       def description
-        %{m[ethod] (i[nstance][ <obj>]|<class|module>)
+        prettify <<-EOD
+          m[ethod] (i[nstance][ <obj>]|<class|module>)
 
           When invoked with "instance", shows instance methods of the object
           specified as argument or of self no object was specified.
 
           When invoked only with a class or module, shows class methods of the
-          class or module specified as argument.}
+          class or module specified as argument.
+        EOD
       end
     end
   end

data/lib/byebug/commands/pry.rb

@@ -1,3 +1,5 @@
+require 'byebug/command'
+
 module Byebug
   #
   # Enter Pry from byebug's prompt
@@ -9,7 +11,13 @@ module Byebug
 
     def execute
       unless @state.interface.is_a?(LocalInterface)
-        return errmsg('Command is available only in local mode.')
+        return errmsg(pr('base.errors.only_local'))
+      end
+
+      begin
+        require 'pry'
+      rescue LoadError
+        errmsg(pr('pry.errors.not_installed'))
       end
 
       get_binding.pry
@@ -21,8 +29,10 @@ module Byebug
       end
 
       def description
-        %(pry        Starts a Pry session.)
+        prettify <<-EOD
+          pry  Starts a Pry session.
+        EOD
       end
     end
   end
-end if defined?(Pry)
+end

data/lib/byebug/commands/quit.rb

@@ -1,3 +1,5 @@
+require 'byebug/command'
+
 module Byebug
   #
   # Exit from byebug.
@@ -6,27 +8,30 @@ module Byebug
     self.allow_in_control = true
 
     def regexp
-      /^\s* (?:q(?:uit)?|exit) \s* (!|\s+unconditionally)? \s*$/x
+      /^\s* q(?:uit)? \s* (?:(!|\s+unconditionally))? \s*$/x
     end
 
     def execute
-      return unless @match[1] || confirm('Really quit? (y/n) ')
+      return unless @match[1] || confirm(pr('quit.confirmations.really'))
 
+      @state.interface.autosave
       @state.interface.close
       exit! # exit -> exit!: No graceful way to stop...
     end
 
     class << self
       def names
-        %w(quit exit)
+        %w(quit)
       end
 
       def description
-        %(q[uit]|exit [!|unconditionally]        Exits from byebug.
+        prettify <<-EOD
+          q[uit] [!|unconditionally] Exits from byebug.
 
           Normally we prompt before exiting. However if the parameter
           "unconditionally" is given or command is suffixed with !, we exit
-          without asking further questions.)
+          without asking further questions.
+        EOD
       end
     end
   end

data/lib/byebug/commands/restart.rb

@@ -1,3 +1,5 @@
+require 'byebug/command'
+
 module Byebug
   #
   # Restart debugged program from within byebug.
@@ -10,32 +12,21 @@ module Byebug
     end
 
     def execute
-      prog = Byebug.debugged_program
-
-      if defined?(BYEBUG_SCRIPT)
-        cmd = "#{BYEBUG_SCRIPT} #{prog}"
+      if Byebug.mode == :standalone
+        cmd = "#{Gem.bin_path('byebug', 'byebug')} #{$PROGRAM_NAME}"
       else
-        puts 'Byebug was not called from the outset...'
-        if File.executable?(prog)
-          cmd = prog
-        else
-          puts "Program #{prog} not executable... Wrapping it in a ruby call"
-          cmd = "ruby -rbyebug -I#{$LOAD_PATH.join(' -I')} #{prog}"
-        end
+        cmd = $PROGRAM_NAME
       end
 
       if @match[:args]
         cmd += " #{@match[:args]}"
       else
         require 'shellwords'
-        cmd += " #{ARGV.compact.shelljoin}"
+        cmd += " #{$ARGV.compact.shelljoin}"
       end
 
-      # An execv would be preferable to the "exec" below.
-      puts "Re exec'ing:\n\t#{cmd}"
-      exec cmd
-    rescue Errno::EOPNOTSUPP
-      puts 'Restart command is not available at this time.'
+      puts pr('restart.success', cmd: cmd)
+      exec(cmd)
     end
 
     class << self
@@ -44,10 +35,12 @@ module Byebug
       end
 
       def description
-        %(restart|R [args]
+        prettify <<-EOD
+          restart|R [args]
 
           Restart the program. This is a re-exec - all byebug state
-          is lost. If command arguments are passed those are used.)
+          is lost. If command arguments are passed those are used.
+        EOD
       end
     end
   end

data/lib/byebug/commands/save.rb

@@ -1,8 +1,10 @@
+require 'byebug/command'
+
 module Byebug
   #
   # Default file where commands are saved
   #
-  RESTART_FILE = '.byebug-save' unless defined?(RESTART_FILE)
+  RESTART_FILE = '.byebug-save'
 
   #
   # Save current settings to use them in another debug session.
@@ -27,7 +29,7 @@ module Byebug
     end
 
     def save_settings(file)
-      %w(autoeval autoirb autolist basename testing).each do |setting|
+      %w(autoeval autoirb autolist basename).each do |setting|
         file.puts "set #{setting} #{Setting[setting.to_sym]}"
       end
     end
@@ -37,14 +39,14 @@ module Byebug
     end
 
     def execute
-      file = open(@match[1] || RESTART_FILE, 'w')
+      file = File.open(@match[1] || RESTART_FILE, 'w')
 
       save_breakpoints(file)
       save_catchpoints(file)
       save_displays(file)
       save_settings(file)
 
-      puts "Saved to '#{file.path}'"
+      print pr('save.messages.done', path: file.path)
       file.close
     end
 
@@ -54,13 +56,15 @@ module Byebug
       end
 
       def description
-        %(save[ FILE]
+        prettify <<-EOD
+          save[ FILE]
 
           Saves current byebug state to FILE as a script file. This includes
           breakpoints, catchpoints, display expressions and some settings. If
           no filename is given, we will fabricate one.
 
-          Use the "source" command in another debug session to restore them.)
+          Use the "source" command in another debug session to restore them.
+        EOD
       end
     end
   end

data/lib/byebug/commands/set.rb

@@ -1,3 +1,5 @@
+require 'byebug/command'
+
 module Byebug
   #
   # Change byebug settings.
@@ -13,21 +15,21 @@ module Byebug
       key, value = @match[:setting], @match[:value]
       return puts(SetCommand.help) if key.nil? && value.nil?
 
-      full_key = Setting.find(key)
-      return errmsg("Unknown setting :#{key}") unless full_key
+      setting = Setting.find(key)
+      return errmsg(pr('set.errors.unknown_setting', key: key)) unless setting
 
-      if !Setting.boolean?(full_key) && value.nil?
-        value, err = nil, "You must specify a value for setting :#{key}"
-      elsif Setting.boolean?(full_key)
+      if !setting.boolean? && value.nil?
+        value, err = nil, pr('set.errors.must_specify_value', key: key)
+      elsif setting.boolean?
         value, err = get_onoff(value, key =~ /^no/ ? false : true)
-      elsif Setting.integer?(full_key)
-        value, err = get_int(value, full_key, 1)
+      elsif setting.integer?
+        value, err = get_int(value, setting.to_sym, 1)
       end
       return errmsg(err) if value.nil?
 
-      Setting[full_key.to_sym] = value
+      setting.value = value
 
-      puts Setting.settings[full_key.to_sym].to_s
+      puts setting.to_s
     end
 
     def get_onoff(arg, default)
@@ -39,7 +41,7 @@ module Byebug
       when '0', 'off', 'false'
         false
       else
-        [nil, "Expecting 'on', 1, true, 'off', 0, false. Got: #{arg}.\n"]
+        [nil, pr('set.errors.on_off', arg: arg)]
       end
     end
 
@@ -49,8 +51,7 @@ module Byebug
       end
 
       def description
-        <<-EOD.gsub(/^        /, '')
-
+        prettify <<-EOD
           set <setting> <value>
 
           Modifies parts of byebug environment.
@@ -63,8 +64,8 @@ module Byebug
         EOD
       end
 
-      def help(subcmds = [])
-        Setting.help('set', subcmds.first)
+      def help(subcmd = nil)
+        Setting.help('set', subcmd)
       end
     end
   end

data/lib/byebug/commands/show.rb

@@ -1,3 +1,5 @@
+require 'byebug/command'
+
 module Byebug
   #
   # Show byebug settings.
@@ -13,10 +15,10 @@ module Byebug
       key = @match[:setting]
       return puts(self.class.help) if key.nil?
 
-      full_key = Setting.find(key)
-      return errmsg("Unknown setting :#{key}") unless full_key
+      setting = Setting.find(key)
+      return errmsg(pr('show.errors.unknown_setting', key: key)) unless setting
 
-      puts Setting.settings[full_key.to_sym].to_s
+      puts Setting.settings[setting.to_sym]
     end
 
     class << self
@@ -25,18 +27,16 @@ module Byebug
       end
 
       def description
-        <<-EOD.gsub(/^ {8}/, '')
-
+        prettify <<-EOD
           show <setting> <value>
 
           Generic command for showing byebug settings. You can change them with
           the "set" command.
-
         EOD
       end
 
-      def help(subcmds = [])
-        Setting.help('show', subcmds.first)
+      def help(subcmd = nil)
+        Setting.help('show', subcmd)
       end
     end
   end

data/lib/byebug/commands/source.rb

@@ -1,3 +1,5 @@
+require 'byebug/command'
+
 module Byebug
   #
   # Execute a file containing byebug commands.
@@ -14,14 +16,16 @@ module Byebug
     def execute
       return puts(self.class.help) if self.class.names.include?(@match[0])
 
-      file = File.expand_path(@match[1]).strip
-      return errmsg("File \"#{file}\" not found") unless File.exist?(file)
+      unless @state && @state.interface
+        return errmsg(pr('source.errors.not_available'))
+      end
 
-      if @state && @state.interface
-        @state.interface.command_queue += File.open(file).readlines
-      else
-        Byebug.run_script(file, @state)
+      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
 
     class << self
@@ -30,9 +34,11 @@ module Byebug
       end
 
       def description
-        %(source <file>
+        prettify <<-EOD
+          source <file>
 
-          Executes file <file> containing byebug commands.)
+          Executes file <file> containing byebug commands.
+        EOD
       end
     end
   end

data/lib/byebug/commands/stepping.rb

@@ -1,20 +1,6 @@
-module Byebug
-  #
-  # Mixin to assist command parsing
-  #
-  module SteppingFunctions
-    def parse_force(str)
-      return Setting[:forcestep] unless str
-
-      case str
-      when '+' then
-        true
-      when '-' then
-        false
-      end
-    end
-  end
+require 'byebug/command'
 
+module Byebug
   #
   # Implements the next functionality.
   #
@@ -25,14 +11,14 @@ module Byebug
     self.allow_in_post_mortem = false
 
     def regexp
-      /^\s* n(?:ext)?([+-])? (?:\s+(\S+))? \s*$/x
+      /^\s* n(?:ext)? (?:\s+(\S+))? \s*$/x
     end
 
     def execute
-      steps, err = parse_steps(@match[2], 'Next')
+      steps, err = parse_steps(@match[1], 'Next')
       return errmsg(err) unless steps
 
-      @state.context.step_over(steps, @state.frame_pos, parse_force(@match[1]))
+      @state.context.step_over(steps, @state.frame)
       @state.proceed
     end
 
@@ -42,11 +28,11 @@ module Byebug
       end
 
       def description
-        %(n[ext][+-]?[ nnn]
+        prettify <<-EOD
+          n[ext][ nnn]
 
-        Steps over once or nnn times.
-          '+' forces to move to another line.
-          '-' is the opposite of '+' and disables the :forcestep setting.)
+          Steps over once or nnn times.
+        EOD
       end
     end
   end
@@ -61,14 +47,14 @@ module Byebug
     self.allow_in_post_mortem = false
 
     def regexp
-      /^\s* s(?:tep)?([+-]) ?(?:\s+(\S+))? \s*$/x
+      /^\s* s(?:tep)? (?:\s+(\S+))? \s*$/x
     end
 
     def execute
-      steps, err = parse_steps(@match[2], 'Steps')
+      steps, err = parse_steps(@match[1], 'Steps')
       return errmsg(err) unless steps
 
-      @state.context.step_into(steps, parse_force(@match[1]))
+      @state.context.step_into(steps, @state.frame)
       @state.proceed
     end
 
@@ -78,11 +64,11 @@ module Byebug
       end
 
       def description
-        %{s[tep][+-]?[ nnn]
+        prettify <<-EOD
+          s[tep][ nnn]
 
           Steps (into methods) once or nnn times.
-            '+' forces to move to another line.
-            '-' is the opposite of '+' and disables the :forcestep setting.}
+        EOD
       end
     end
   end