byebug 3.0.0 → 3.1.0

data/lib/byebug/commands/display.rb

@@ -1,5 +1,4 @@
 module Byebug
-
   module DisplayFunctions
     def display_expression(exp)
       print "#{exp} = #{bb_warning_eval(exp).inspect}\n"
@@ -81,13 +80,13 @@ module Byebug
 
     def execute
       unless pos = @match[1]
-        if confirm("Clear all expressions? (y/n) ")
+        if confirm('Clear all expressions? (y/n) ')
           for d in @state.display
             d[0] = false
           end
         end
       else
-        pos = get_int(pos, "Undisplay")
+        pos = get_int(pos, 'Undisplay')
         return unless pos
         if @state.display[pos-1]
           @state.display[pos-1][0] = nil

data/lib/byebug/commands/eval.rb

@@ -11,16 +11,6 @@ module Byebug
   class EvalCommand < Command
     self.allow_in_control = true
 
-    register_setting_get(:autoeval) do
-      EvalCommand.unknown
-    end
-    register_setting_set(:autoeval) do |value|
-      EvalCommand.unknown = value
-    end
-
-    # Set default value
-    Command.settings[:autoeval] = true
-
     def match(input)
       @input = input
       super
@@ -33,7 +23,7 @@ module Byebug
     def execute
       expr = @match ? @match.post_match : @input
       run_with_binding do |b|
-        if Command.settings[:stack_on_error]
+        if Setting[:stack_on_error]
           print "#{bb_eval(expr, b).inspect}\n"
         else
           print "#{bb_warning_eval(expr, b).inspect}\n"
@@ -68,7 +58,7 @@ module Byebug
     def execute
       out = StringIO.new
       run_with_binding do |b|
-        if Command.settings[:stack_on_error]
+        if Setting[:stack_on_error]
           PP.pp(bb_eval(@match.post_match, b), out)
         else
           PP.pp(bb_warning_eval(@match.post_match, b), out)
@@ -101,14 +91,14 @@ module Byebug
     def execute
       out = StringIO.new
       run_with_binding do |b|
-        if Command.settings[:stack_on_error]
+        if Setting[:stack_on_error]
           vals = bb_eval(@match.post_match, b)
         else
           vals = bb_warning_eval(@match.post_match, b)
         end
         if vals.is_a?(Array)
           vals = vals.map{|item| item.to_s}
-          print "#{columnize(vals, Command.settings[:width])}\n"
+          print "#{columnize(vals, Setting[:width])}\n"
         else
           PP.pp(vals, out)
           print out.string
@@ -142,14 +132,14 @@ module Byebug
     def execute
       out = StringIO.new
       run_with_binding do |b|
-        if Command.settings[:stack_on_error]
+        if Setting[:stack_on_error]
           vals = bb_eval(@match.post_match, b)
         else
           vals = bb_warning_eval(@match.post_match, b)
         end
         if vals.is_a?(Array)
           vals = vals.map{|item| item.to_s}
-          print "#{columnize(vals.sort!, Command.settings[:width])}\n"
+          print "#{columnize(vals.sort!, Setting[:width])}\n"
         else
           PP.pp(vals, out)
           print out.string

data/lib/byebug/commands/finish.rb

@@ -10,7 +10,7 @@ module Byebug
 
     def execute
       max_frames = Context.stack_size - @state.frame_pos
-      n_frames = get_int(@match[1], "finish", 0, max_frames - 1, 1)
+      n_frames = get_int(@match[1], 'finish', 0, max_frames - 1, 1)
       return nil unless n_frames
 
       force = n_frames == 0 ? true : false

data/lib/byebug/commands/frame.rb

@@ -86,12 +86,12 @@ module Byebug
 
     def get_frame_call(prefix, pos)
       frame_block, frame_method = get_frame_block_and_method(pos)
-      frame_class = get_frame_class(Command.settings[:callstyle], pos)
-      frame_args = get_frame_args(Command.settings[:callstyle], pos)
+      frame_class = get_frame_class(Setting[:callstyle], pos)
+      frame_args = get_frame_args(Setting[:callstyle], pos)
 
       call_str = frame_block + frame_class + frame_method + frame_args
 
-      max_call_str_size = Command.settings[:width] - prefix.size
+      max_call_str_size = Setting[:width] - prefix.size
       if call_str.size > max_call_str_size
         call_str = call_str[0..max_call_str_size - 5] + "...)"
       end
@@ -122,7 +122,7 @@ module Byebug
       file = @state.context.frame_file pos
       line = @state.context.frame_line pos
 
-      unless Command.settings[:fullpath]
+      unless Setting[:fullpath]
         path_components = file.split(/[\\\/]/)
         if path_components.size > 3
           path_components[0...-3] = '...'
@@ -140,7 +140,7 @@ module Byebug
       frame_str += sprintf "#%-2d ", pos
       frame_str += get_frame_call frame_str, pos
       file_line = "at #{CommandProcessor.canonic_file(file)}:#{line}"
-      if frame_str.size + file_line.size + 1 > Command.settings[:width]
+      if frame_str.size + file_line.size + 1 > Setting[:width]
         frame_str += "\n      #{file_line}\n"
       else
         frame_str += " #{file_line}\n"
@@ -162,7 +162,7 @@ module Byebug
 
     class << self
       def names
-        %w(where backtrace)
+        %w(where backtrace bt)
       end
 
       def description
@@ -184,7 +184,7 @@ module Byebug
     end
 
     def execute
-      pos = get_int(@match[1], "Up")
+      pos = get_int(@match[1], 'Up')
       return unless pos
       adjust_frame(pos, false)
     end
@@ -206,7 +206,7 @@ module Byebug
     end
 
     def execute
-      pos = get_int(@match[1], "Down")
+      pos = get_int(@match[1], 'Down')
       return unless pos
       adjust_frame(-pos, false)
     end
@@ -229,7 +229,7 @@ module Byebug
 
     def execute
       return print_frame @state.frame_pos unless @match[1]
-      return unless pos = get_int(@match[1], "Frame")
+      return unless pos = get_int(@match[1], 'Frame')
       adjust_frame(pos, true)
     end
 

data/lib/byebug/commands/help.rb

@@ -26,13 +26,12 @@ module Byebug
         end
       end
 
-      print "byebug help v#{Byebug::VERSION}\n" unless
-        Command.settings[:testing]
+      print "byebug help v#{Byebug::VERSION}\n" unless Setting[:testing]
 
       print "Type \"help <command-name>\" for help on a specific command\n\n"
       print "Available commands:\n"
       cmds = @state.commands.map{ |cmd| cmd.names }.flatten.uniq.sort
-      print columnize(cmds, Command.settings[:width])
+      print columnize(cmds, Setting[:width])
     end
 
     class << self

data/lib/byebug/commands/history.rb

@@ -0,0 +1,28 @@
+module Byebug
+  class HistoryCommand < Command
+    def regexp
+      /^\s* hist(?:ory)? (?:\s+(?<num_cmds>.+))? \s*$/x
+    end
+
+    def execute
+      if Byebug::Setting[:autosave]
+        if arg = @match[:num_cmds]
+          size = get_int(@match[:num_cmds], 'history', 1, Byebug::Setting[:histsize])
+        end
+        print Byebug::History.to_s(size || Byebug::Setting[:histsize])
+      else
+        errmsg "Not currently saving history. Enable it with \"set autosave\"\n"
+      end
+    end
+
+    class << self
+      def names
+        %w(history)
+      end
+
+      def description
+        %{hist[ory] [num_cmds]\t\tShow byebug's command history}
+      end
+    end
+  end
+end

data/lib/byebug/commands/info.rb

@@ -89,7 +89,7 @@ module Byebug
 
       args.map do |_, name|
         s = "#{name} = #{locals[name].inspect}"
-        pad_with_dots(s)
+        s[Setting[:width]-3..-1] = "..." if s.size > Setting[:width]
         print "#{s}\n"
       end
     end
@@ -150,7 +150,7 @@ module Byebug
       breakpoints = LineCache.trace_line_numbers(file)
       if breakpoints
         print "\tbreakpoint line numbers:\n"
-        print columnize(breakpoints.to_a.sort, Command.settings[:width])
+        print columnize(breakpoints.to_a.sort, Setting[:width])
       end
     end
     private :info_file_breakpoints
@@ -219,7 +219,7 @@ module Byebug
             s = "#{name} = *Error in evaluation*"
           end
         end
-        pad_with_dots(s)
+        s[Setting[:width]-3..-1] = "..." if s.size > Setting[:width]
         print "#{s}\n"
       end
     end

data/lib/byebug/commands/list.rb

@@ -2,30 +2,19 @@ module Byebug
 
   # Implements byebug "list" command.
   class ListCommand < Command
-
-    register_setting_get(:autolist) do
-      ListCommand.always_run
-    end
-    register_setting_set(:autolist) do |value|
-      ListCommand.always_run = value
-    end
-
-    # Set default value
-    Command.settings[:autolist] = 1
-
     def regexp
       /^\s* l(?:ist)? (?:\s*([-=])|\s+(\S+))? \s*$/x
     end
 
     def execute
-      Byebug.source_reload if Command.settings[:autoreload]
+      Byebug.source_reload if Setting[:autoreload]
       lines = getlines(@state.file, @state.line)
       if !lines
         errmsg "No sourcefile available for #{@state.file}\n"
         return @state.previous_line
       end
 
-      b, e = set_line_range(Command.settings[:listsize], lines.size)
+      b, e = set_line_range(Setting[:listsize], lines.size)
       return @state.previous_line if b < 0
 
       print "\n[#{b}, #{e}] in #{@state.file}\n"

data/lib/byebug/commands/method.rb

@@ -1,42 +1,4 @@
 module Byebug
-
-  begin
-    require 'methodsig'
-    have_methodsig = true
-  rescue LoadError
-    have_methodsig = false
-  end
-
-  # Implements byebug's 'method sig' command.
-  class MethodSigCommand < Command
-    def regexp
-      /^\s* m(?:ethod)? \s+ sig(?:nature)? \s+ (\S+) \s*$/x
-    end
-
-    def execute
-      obj = bb_eval('method(:%s)' % @match[1])
-      if obj.is_a?(Method)
-        begin
-          print "%s\n", obj.signature.to_s
-        rescue
-          errmsg("Can't get signature for '#{@match[1]}'\n")
-        end
-      else
-        errmsg("Can't make method out of '#{@match[1]}'\n")
-      end
-    end
-
-    class << self
-      def names
-        %w(method)
-      end
-
-      def description
-        %{m[ethod] sig[nature] <obj>\tshow the signature of a method}
-      end
-    end
-  end if have_methodsig
-
   # Implements byebug's 'method' command.
   class MethodCommand < Command
     include Columnize
@@ -47,17 +9,16 @@ module Byebug
 
     def execute
       obj = bb_eval(@match.post_match)
-      if @match[1] == "iv"
+      if @match[1] == 'iv'
         obj.instance_variables.sort.each do |v|
           print "#{v} = #{obj.instance_variable_get(v).inspect}\n"
         end
       elsif @match[1]
-        print "#{columnize(obj.methods.sort(), Command.settings[:width])}\n"
+        print "#{columnize(obj.methods.sort(), Setting[:width])}\n"
+      elsif !obj.kind_of?(Module)
+        print "Should be Class/Module: #{@match.post_match}\n"
       else
-        return print "Should be Class/Module: #{@match.post_match}\n" unless
-          obj.kind_of? Module
-        print "#{columnize(obj.instance_methods(false).sort(),
-                           Command.settings[:width])}\n"
+        print "#{columnize(obj.instance_methods(false).sort(), Setting[:width])}\n"
       end
     end
 
@@ -73,5 +34,4 @@ module Byebug
       end
     end
   end
-
 end

data/lib/byebug/commands/reload.rb

@@ -16,15 +16,6 @@ module Byebug
     self.allow_in_control = true
     self.allow_in_post_mortem = false
 
-    register_setting_get(:autoreload) do
-      Byebug.class_variable_get(:@@autoreload)
-    end
-
-    register_setting_set(:autoreload) do |value|
-      Byebug.class_variable_set(:@@autoreload, value)
-    end
-    Command.settings[:autoreload] = true
-
     def regexp
       /^\s* r(?:eload)? \s*$/x
     end
@@ -32,11 +23,9 @@ module Byebug
     def execute
       Byebug.source_reload
       print "Source code is reloaded. Automatic reloading is "   \
-            "#{Command.settings[:autoreload] ? 'on' : 'off'}.\n"
+            "#{Setting[:autoreload] ? 'on' : 'off'}.\n"
     end
 
-    private
-
     class << self
       def names
         %w(reload)

data/lib/byebug/commands/repl.rb

@@ -18,9 +18,9 @@ module IRB
   end
 
   require 'irb'
-  ExtendCommandBundle.def_extend_command "cont", :Continue
-  ExtendCommandBundle.def_extend_command "n", :Next
-  ExtendCommandBundle.def_extend_command "step", :Step
+  ExtendCommandBundle.def_extend_command 'cont', :Continue
+  ExtendCommandBundle.def_extend_command 'next', :Next
+  ExtendCommandBundle.def_extend_command 'step', :Step
 
   def self.start_session(binding)
     unless @__initialized ||= false
@@ -37,7 +37,7 @@ module IRB
     @CONF[:IRB_RC].call(irb.context) if @CONF[:IRB_RC]
     @CONF[:MAIN_CONTEXT] = irb.context
 
-    trap("SIGINT") do
+    trap('SIGINT') do
       irb.signal_handle
     end
 
@@ -51,13 +51,6 @@ module Byebug
 
   # Implements byebug's "irb" command.
   class IrbCommand < Command
-    register_setting_get(:autoirb) do
-      IrbCommand.always_run
-    end
-    register_setting_set(:autoirb) do |value|
-      IrbCommand.always_run = value
-    end
-
     def regexp
       /^\s* irb \s*$/x
     end
@@ -73,11 +66,11 @@ module Byebug
       when :cont
         @state.proceed
       when :step
-        force = Command.settings[:forcestep]
+        force = Setting[:forcestep]
         @state.context.step_into 1, force
         @state.proceed
       when :next
-        force = Command.settings[:forcestep]
+        force = Setting[:forcestep]
         @state.context.step_over 1, @state.frame_pos, force
         @state.proceed
       else
@@ -86,7 +79,6 @@ module Byebug
       end
     end
 
-
     class << self
       def names
         %w(irb)
@@ -134,5 +126,4 @@ module Byebug
       end
     end
   end if has_pry
-
 end

data/lib/byebug/commands/save.rb

@@ -38,13 +38,8 @@ module Byebug
 
     def save_settings(file)
       # FIXME put routine in set
-      %w(autoeval basename testing).each do |setting|
-        on_off = show_onoff(Command.settings[setting.to_sym])
-        file.puts "set #{setting} #{on_off}"
-      end
-      %w(autolist autoirb).each do |setting|
-        on_off = show_onoff(Command.settings[setting.to_sym] > 0)
-        file.puts "set #{setting} #{on_off}"
+      %w(autoeval autoirb autolist basename testing).each do |setting|
+        file.puts "set #{setting} #{Setting[setting.to_sym]}"
       end
     end