byebug 1.3.0 → 1.3.1

data/lib/byebug/commands/jump.rb

@@ -18,14 +18,9 @@ module Byebug
     end
 
     def execute
-      if !@match[1]
-        errmsg "\"jump\" must be followed by a line number\n"
-        return
-      end
-      if !numeric?(@match[1])
-        errmsg "Bad line number: " + @match[1]
-        return
-      end
+      return errmsg "\"jump\" must be followed by a line number\n" unless @match[1]
+      return errmsg "Bad line number: " + @match[1] unless numeric?(@match[1])
+
       line = @match[1].to_i
       line = @state.context.frame_line(0) + line if @match[1][0] == '+' or @match[1][0] == '-'
       if line == @state.context.frame_line(0)

data/lib/byebug/commands/list.rb

@@ -21,7 +21,7 @@ module Byebug
       Byebug.source_reload if Command.settings[:autoreload]
       lines = LineCache::getlines @state.file, Command.settings[:autoreload]
       if !lines
-        errmsg "No sourcefile available for #{@state.file}\n"
+        errmsg "No sourcefile available for #{@state.file}\n" if @state.file != '(irb)'
         return @state.previous_line
       end
 
@@ -37,7 +37,7 @@ module Byebug
         %w(list)
       end
 
-      def help(cmd)
+      def description
         %{
           l[ist]\t\tlist forward
           l[ist] -\tlist backward

data/lib/byebug/commands/method.rb

@@ -51,19 +51,17 @@ module Byebug
       if @match[1] == "iv"
         obj = debug_eval(@match.post_match)
         obj.instance_variables.sort.each do |v|
-          print "%s = %s\n", v, obj.instance_variable_get(v).inspect
+          print "#{v} = #{obj.instance_variable_get(v).inspect}\n"
         end
       elsif @match[1]
         obj = debug_eval(@match.post_match)
-        print "%s\n", columnize(obj.methods.sort(), Command.settings[:width])
+        print "#{columnize(obj.methods.sort(), Command.settings[:width])}\n"
       else
         obj = debug_eval(@match.post_match)
-        unless obj.kind_of? Module
-          print "Should be Class/Module: %s\n", @match.post_match
-        else
-          print "%s\n", columnize(obj.instance_methods(false).sort(),
-                                  Command.settings[:width])
-        end
+        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"
       end
     end
 

data/lib/byebug/commands/save.rb

@@ -55,7 +55,7 @@ module Byebug
     end
 
     def execute
-      if not @match[1] or @match[1].strip.empty?
+      if not @match[1]
         file = open_save()
       else
         file = open(@match[1], 'w')

data/lib/byebug/commands/set.rb

@@ -167,18 +167,6 @@ module Byebug
           or 0. You can see these environment settings with the "show" command
         }
       end
-
-      def help(args)
-        if args && args[1]
-          subcmd = SetCommand.new(nil).find(Subcommands, args[1])
-          if subcmd
-            return "#{subcmd.short_help}.\n#{subcmd.long_help ? subcmd.long_help : ''}"
-          else
-            return "Invalid \"set\" subcommand \"#{args[1]}\".\n"
-          end
-        end
-        description + SetCommand.new(nil).format_subcmds(Subcommands)
-      end
     end
 
   end

data/lib/byebug/commands/show.rb

@@ -198,29 +198,16 @@ module Byebug
     end
 
     def execute
-      if not @match[1]
-        print format_subcmds(Subcommands)
-      else
-        args = @match[1].split(/[ \t]+/)
-        param = args.shift
-        subcmd = find(Subcommands, param)
-        if subcmd
-          print "%s\n" % show_setting(subcmd.name)
-        else
-          print "Unknown show command #{param}\n"
-        end
-      end
-    end
+      return print ShowCommand.help(nil) unless @match[1]
 
-    def help(args)
-      if args[1]
-        subcmd = find(Subcommands, args[1])
-        return "Invalid \"show\" subcommand \"#{args[1]}\"." unless subcmd
-        str = subcmd.short_help + '.'
-        str += "\n" + subcmd.long_help if subcmd.long_help
-        return str
+      args = @match[1].split(/[ \t]+/)
+      param = args.shift
+      subcmd = find(Subcommands, param)
+      if subcmd
+        print "%s\n" % show_setting(subcmd.name)
+      else
+        print "Unknown show command #{param}\n"
       end
-      ShowCommad.description + format_subcmds(Subcommands)
     end
 
     class << self
@@ -234,5 +221,6 @@ module Byebug
         }
       end
     end
+
   end
 end

data/lib/byebug/commands/variables.rb

@@ -14,7 +14,7 @@ module Byebug
           end
         end
         pad_with_dots(s)
-        print "%s = %s\n", v, s
+        print "#{v} = #{s}\n"
       end
     end
     def var_class_self
@@ -69,7 +69,7 @@ module Byebug
           print " %s => %p\n", c, value
         end
       else
-        print "Should be Class/Module: %s\n", @match.post_match
+        print "Should be Class/Module: #{@match.post_match}\n"
       end
     end
 
@@ -138,8 +138,8 @@ module Byebug
     end
 
     def execute
-      locals = @state.context.frame_locals(@state.frame_pos)
       _self = @state.context.frame_self(@state.frame_pos)
+      locals = @state.context.frame_locals
       locals.keys.sort.each do |name|
         print "  %s => %p\n", name, locals[name]
       end

data/lib/byebug/context.rb

@@ -8,8 +8,8 @@ module Byebug
   end
 
   class Context
-    def frame_args(frame_no=0)
-      bind = frame_binding(frame_no)
+    def frame_args frame_no = 0
+      bind = frame_binding frame_no
       return [] unless eval "__method__", bind
       begin
         eval "self.method(__method__).parameters.map{|(attr, mid)| mid}", bind
@@ -20,6 +20,17 @@ module Byebug
       end
     end
 
+    def frame_locals frame_no = 0
+      bind = frame_binding frame_no
+      eval "local_variables.inject({}){|h, v| h[v] = eval(v.to_s); h}", bind
+    end
+
+    def frame_args_info
+      bind = frame_binding frame_no
+      return [] unless eval "__method__", bind
+      eval "self.method(__method__).parameters", bind
+    end
+
     def handler
       Byebug.handler or raise 'No interface loaded'
     end

data/lib/byebug/interface.rb

@@ -8,7 +8,7 @@ module Byebug
     end
 
     # Common routine for reporting byebug error messages.
-    # Derived classed may want to override this to capture output.
+    # Derived classes may want to override this to capture output.
     def errmsg(*args)
       if Byebug.annotate.to_i > 2
         aprint 'error-begin'
@@ -28,6 +28,17 @@ module Byebug
     def aprint(msg)
       print afmt(msg)
     end
+
+    protected
+      def format(*args)
+        if args.is_a?(Array)
+          new_args = args.first
+          new_args = new_args % args[1..-1] unless args[1..-1].empty?
+        else
+          new_args = args
+        end
+        new_args.gsub('%', '%%')
+      end
   end
 
   class LocalInterface < Interface
@@ -60,13 +71,8 @@ module Byebug
       readline(prompt, false)
     end
 
-    # Callers of this routine should make sure to use comma to separate format
-    # argments rather than %. Otherwise it seems that if the string you want to
-    # print has format specifier, which could happen if you are trying to show
-    # say a source-code line with "puts" or "print" in it, this print routine
-    # will give an error saying it is looking for more arguments.
     def print(*args)
-      STDOUT.printf(*args)
+      STDOUT.printf(format(*args))
     end
 
     def close

data/lib/byebug/processor.rb

@@ -25,26 +25,20 @@ module Byebug
   class CommandProcessor < Processor
     attr_reader :display
 
-    # FIXME: get from Command regexp method.
-    @@Show_breakpoints_postcmd = [
-                                  /^\s*b(?:reak)?/,
-                                  /^\s* cond(?:ition)? (?:\s+(\d+)\s*(.*))?$/ix,
-                                  /^\s*del(?:ete)?(?:\s+(.*))?$/ix,
-                                  /^\s* dis(?:able)? (?:\s+(.*))?$/ix,
-                                  /^\s* en(?:able)? (?:\s+(.*))?$/ix
-                                  # "tbreak", "clear",
+    @@Show_breakpoints_postcmd = [ Byebug::BreakCommand.new(nil).regexp,
+                                   Byebug::ConditionCommand.new(nil).regexp,
+                                   Byebug::DeleteCommand.new(nil).regexp,
+                                   Byebug::DisableCommand.new(nil).regexp,
+                                   Byebug::EnableCommand.new(nil).regexp
                                  ]
-    @@Show_annotations_run = [
-                              /^\s*c(?:ont(?:inue)?)?(?:\s+(.*))?$/,
-                              /^\s*fin(?:ish)?$/,
-                              /^\s*n(?:ext)?([+-])?(?:\s+(.*))?$/,
-                              /^\s*s(?:tep)?([+-])?(?:\s+(.*))?$/
-                            ]
-
-    @@Show_annotations_postcmd = [
-                                  /^\s* down (?:\s+(.*))? .*$/x,
-                                  /^\s* f(?:rame)? (?:\s+ (.*))? \s*$/x,
-                                  /^\s* u(?:p)? (?:\s+(.*))?$/x
+    @@Show_annotations_run = [ Byebug::ContinueCommand.new(nil).regexp,
+                               Byebug::FinishCommand.new(nil).regexp,
+                               Byebug::NextCommand.new(nil).regexp,
+                               Byebug::StepCommand.new(nil).regexp
+                             ]
+    @@Show_annotations_postcmd = [ Byebug::DownCommand.new(nil).regexp,
+                                   Byebug::FrameCommand.new(nil).regexp,
+                                   Byebug::UpCommand.new(nil).regexp
                                  ]
 
     def initialize(interface = LocalInterface.new)
@@ -86,8 +80,12 @@ module Byebug
     end
 
     def self.print_location_and_text(file, line)
-      file_line = "#{canonic_file(file)} @ #{line}\n" \
-                  "#{Byebug.line_at(file, line)}\n"
+      if file == '(irb)'
+        file_line = "#{canonic_file(file)} @ #{line}\n"
+      else
+        file_line = "#{canonic_file(file)} @ #{line}\n" \
+                    "#{Byebug.line_at(file, line)}\n"
+      end
 
       # FIXME: use annotations routines
       if Byebug.annotate.to_i > 2
@@ -123,7 +121,7 @@ module Byebug
       if Byebug.annotate.to_i > 2
         print afmt("source #{file}:#{line}")
       end
-      print "Stopped by breakpoint %d at %s:%s\n", n, file, line
+      print "Stopped by breakpoint #{n} at #{file}:#{line}\n"
     end
     protect :at_breakpoint
 
@@ -146,12 +144,12 @@ module Byebug
       # Don't trace ourselves
       return if defined?(Byebug::BYEBUG_SCRIPT) && Byebug::BYEBUG_SCRIPT == file
 
-      file = CommandProcessor.canonic_file(file)
       tracing_plus = Command.settings[:tracing_plus]
       if file != @last_file || line != @last_line || tracing_plus == false
         @last_file = file
         @last_line = line
-        print "Tracing: #{file}:#{line} #{Byebug.line_at(file, line)}\n"
+        print "Tracing: #{CommandProcessor.canonic_file(file)}:#{line} " \
+              "#{Byebug.line_at(file,line)}\n"
       end
       always_run(context, file, line, 2)
     end
@@ -232,7 +230,7 @@ module Byebug
 
         preloop(commands, context)
 
-        if Command.settings[:autolist] == 0
+        if Command.settings[:autolist] == 0 || file == '(irb)'
           CommandProcessor.print_location_and_text(file, line)
         end
 

data/lib/byebug/version.rb

@@ -1,3 +1,3 @@
 module Byebug
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

data/old_doc/primes.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # Enumerator for primes
 class SievePrime
   @@odd_primes = []
@@ -14,7 +13,7 @@ class SievePrime
       end
       unless not_prime
         @@odd_primes << candidate
-        yield candidate 
+        yield candidate
       end
       candidate += 2
     end
@@ -24,5 +23,3 @@ SievePrime.next_prime do |prime|
   puts prime
   break if prime > 10
 end
-
-    

data/test/continue_test.rb

@@ -17,12 +17,6 @@ class TestContinue < TestDsl::TestCase
       enter 'cont 4'
       debug_file('continue') { state.line.must_equal 4 }
     end
-
-    it "must not keep temporal breakpoint when line specified" do
-      skip 'Not working yet, breakpoint is currently kept'
-      enter 'cont 4'
-      debug_file('continue') { Byebug.breakpoints.size.must_equal 0 }
-    end
   end
 
   describe "unsuccessful" do
@@ -34,9 +28,8 @@ class TestContinue < TestDsl::TestCase
     it "must show error if specified line is not valid" do
       enter 'cont 123'
       debug_file('continue')
-      check_output_includes "Line 123 is not a stopping point in file \"#{fullpath('continue')}\".", interface.error_queue
+      check_output_includes "Line 123 is not a stopping point in file " \
+                            "\"#{fullpath('continue')}\"", interface.error_queue
     end
-
-    it "must ignore the line if the context is dead"
   end
 end

data/test/examples/list.rb

@@ -20,4 +20,4 @@ byebug
 20
 21
 22
-23
+a = '%23'

data/test/examples/trace.rb

@@ -5,3 +5,4 @@ $bla = 4
 $bla = 5
 $bla = 6
 $bla = 7
+$bla = (0 == (7 % $bla))

data/test/help_test.rb

@@ -35,7 +35,7 @@ class TestHelp < TestDsl::TestCase
   it 'must show a command\'s help' do
     enter 'help break'
     debug_file 'help'
-    check_output_includes Byebug::AddBreakpoint.help(nil)
+    check_output_includes Byebug::BreakCommand.help(nil)
   end
 
   describe 'Post Mortem' do

data/test/info_test.rb

@@ -55,7 +55,7 @@ class TestInfo < TestDsl::TestCase
     it 'must show all display expressions' do
       enter 'display 3 + 3', 'display a + b', 'info display'
       debug_file 'info'
-      check_output_includes 'Auto-display expressions now in effect:',
+      check_output_includes "Auto-display expressions now in effect:\n" \
                             'Num Enb Expression',
                             '1: y  3 + 3',
                             '2: y  a + b'
@@ -273,10 +273,10 @@ class TestInfo < TestDsl::TestCase
                             '@foo = "bar"'
     end
 
-    it 'must handle printf strings correctly' do
+    it 'must correctly print variables containing % sign' do
       enter 'break 32', 'cont', 'info variables'
       debug_file 'info'
-      check_output_includes 'e = "%%.2f"'
+      check_output_includes 'e = "%.2f"'
     end
   end
 

data/test/list_test.rb

@@ -56,7 +56,7 @@ class TestList < TestDsl::TestCase
     end
   end
 
-  describe 'list backward' do
+  describe 'list backwards' do
     temporary_change_hash Byebug::Command.settings, :autolist, 0
 
     it 'must show surrounding lines with the first call' do
@@ -165,6 +165,12 @@ class TestList < TestDsl::TestCase
                           interface.error_queue
   end
 
+  it 'must correctly print lines containing % sign' do
+    enter 'list 23'
+    debug_file 'list'
+    check_output_includes "23: a = '%23'"
+  end
+
   describe 'Post Mortem' do
     it 'must work in post-mortem mode' do
       enter 'cont'

data/test/method_test.rb

@@ -1,7 +1,6 @@
 require_relative 'test_helper'
 
 class TestMethod < TestDsl::TestCase
-
   temporary_change_hash Byebug::Command.settings, :autolist, 0
 
   describe 'show instance method of a class' do