byebug 1.0.2 → 1.0.3

data/lib/byebug/commands/breakpoints.rb

@@ -22,7 +22,7 @@ module Byebug
       if expr
         if expr !~ /^\s*if\s+(.+)/
           if file or line
-            errmsg "Expecting 'if' in breakpoint condition; got: #{expr}.\n"
+            errmsg "Expecting \"if\" in breakpoint condition; got: #{expr}.\n"
           else
             errmsg "Invalid breakpoint location: #{expr}.\n"
           end

data/lib/byebug/commands/control.rb

@@ -1,6 +1,6 @@
 module Byebug
 
-  class RestartCommand < Command # :nodoc:
+  class RestartCommand < Command
     self.allow_in_control = true
 
     def regexp
@@ -12,28 +12,24 @@ module Byebug
     end
 
     def execute
-      if not defined? Byebug::PROG_SCRIPT
-        errmsg "Don't know name of debugged program\n"
-        return
-      end
+      return errmsg "Don't know name of debugged program\n" unless
+        defined? Byebug::PROG_SCRIPT
 
-      if not File.exist?(File.expand_path(Byebug::PROG_SCRIPT))
-        errmsg "Ruby program #{Byebug::PROG_SCRIPT} doesn't exist\n"
-        return
-      end
+      return errmsg "Ruby program #{Byebug::PROG_SCRIPT} doesn't exist\n" unless
+        File.exist?(File.expand_path(Byebug::PROG_SCRIPT))
 
-      if not defined? Byebug::RDEBUG_SCRIPT
+      if not defined? Byebug::BYEBUG_SCRIPT
         print "Byebug was not called from the outset...\n"
         if not File.executable?(Byebug::PROG_SCRIPT)
           print "Ruby program #{Byebug::PROG_SCRIPT} not executable... " \
                 "We'll add a call to Ruby.\n"
           ruby = begin defined?(Gem) ? Gem.ruby : "ruby" rescue "ruby" end
-          byebug_script = "#{ruby} -I#{$:.join(' -I')} #{Byebug::PROG_SCRIPT}"
+          cmd = "#{ruby} -I#{$:.join(' -I')} #{Byebug::PROG_SCRIPT}"
         else
-          byebug_script = Byebug::PROG_SCRIPT
+          cmd = Byebug::PROG_SCRIPT
         end
       else
-        byebug_script = Byebug::RDEBUG_SCRIPT
+        cmd = Byebug::BYEBUG_SCRIPT
       end
 
       begin
@@ -43,16 +39,13 @@ module Byebug
       end
 
       if @match[1]
-        argv = [Byebug::PROG_SCRIPT] + @match[1].split(/[ \t]+/)
+        cmd += " #{@match[1]}"
+      elsif not defined? Command.settings[:argv]
+        return errmsg "Arguments not set. Use 'set args' to set them.\n"
       else
-        if not defined? Command.settings[:argv]
-          errmsg "Arguments have not been set. Use 'set args' to set them.\n"
-          return
-        else
-          argv = Command.settings[:argv]
-        end
+        require 'shellwords'
+        cmd += " #{Command.settings[:argv].compact.shelljoin}"
       end
-      cmd = "#{byebug_script} #{argv.compact.join(' ')}"
 
       # An execv would be preferable to the "exec" below.
       print "Re exec'ing:\n\t#{cmd}\n"

data/lib/byebug/commands/display.rb

@@ -1,6 +1,6 @@
 module Byebug
 
-  module DisplayFunctions # :nodoc:
+  module DisplayFunctions
 
     def display_expression(exp)
       print "%s = %s\n", exp, debug_silent_eval(exp).to_s
@@ -22,7 +22,7 @@ module Byebug
     end
   end
 
-  class AddDisplayCommand < Command # :nodoc:
+  class AddDisplayCommand < Command
     def regexp
       /^\s*disp(?:lay)?\s+(.+)$/
     end
@@ -47,7 +47,7 @@ module Byebug
     end
   end
 
-  class DisplayCommand < Command # :nodoc:
+  class DisplayCommand < Command
     def self.always_run
       Byebug.annotate = 0 unless Byebug.annotate
       if Byebug.annotate > 1
@@ -78,7 +78,7 @@ module Byebug
     end
   end
 
-  class DeleteDisplayCommand < Command # :nodoc:
+  class DeleteDisplayCommand < Command
 
     def regexp
       /^\s* undisp(?:lay)? \s* (?:(\S+))?$/x

data/lib/byebug/commands/enable.rb

@@ -16,14 +16,15 @@ module Byebug
         return nil unless pos
         breakpoints.each do |b|
           if b.id == pos
-            enabled = ("Enable" == is_enable)
+            enabled = ('Enable' == is_enable)
             if enabled
               unless syntax_valid?(b.expr)
-                errmsg("Expression \"#{b.expr}\" syntactically incorrect; breakpoint remains disabled.\n")
+                errmsg "Expression \"#{b.expr}\" syntactically incorrect; " \
+                       "breakpoint remains disabled.\n"
                 break
               end
             end
-            b.enabled = ("Enable" == is_enable)
+            b.enabled = ('Enable' == is_enable)
             break
           end
         end
@@ -38,7 +39,7 @@ module Byebug
       args.each do |pos|
         pos = get_int(pos, "#{is_enable} display", 1, @state.display.size)
         return nil unless pos
-        @state.display[pos-1][0] = ("Enable" == is_enable)
+        @state.display[pos-1][0] = ('Enable' == is_enable)
       end
     end
 
@@ -49,11 +50,11 @@ module Byebug
       [
        ['breakpoints', 2, 'Enable specified breakpoints',
         'Give breakpoint numbers (separated by spaces) as arguments. This is ' \
-        'used to cancel the effect of the \"disable\" command.'],
+        'used to cancel the effect of the "disable" command.'],
        ['display', 2,
         'Enable some expressions to be displayed when program stops',
         'Arguments are the code numbers of the expressions to resume '     \
-        'displaying. Do \"info display\" to see the current list of code ' \
+        'displaying. Do "info display" to see the current list of code ' \
         'numbers.'],
       ].map do |name, min, short_help, long_help|
       SubcmdStruct.new(name, min, short_help, long_help)
@@ -65,8 +66,8 @@ module Byebug
 
     def execute
       if not @match[1]
-        errmsg "\"enable\" must be followed \"display\", \"breakpoints\"" +
-          " or breakpoint numbers.\n"
+        errmsg "\"enable\" must be followed by \"display\", \"breakpoints\" " \
+               "or breakpoint numbers.\n"
       else
         args = @match[1].split(/[ \t]+/)
         param = args.shift
@@ -74,17 +75,17 @@ module Byebug
         if subcmd
           send("enable_#{subcmd.name}", args)
         else
-          send("enable_breakpoints", args.unshift(param))
+          send('enable_breakpoints', args.unshift(param))
         end
       end
     end
 
     def enable_breakpoints(args)
-      enable_disable_breakpoints("Enable", args)
+      enable_disable_breakpoints('Enable', args)
     end
 
     def enable_display(args)
-      enable_disable_display("Enable", args)
+      enable_disable_display('Enable', args)
     end
 
     class << self
@@ -99,7 +100,7 @@ module Byebug
           return "Invalid \"enable\" subcommand \"#{args[1]}\"." unless subcmd
 
           str = subcmd.short_help + '.'
-          str += "\n" + subcmd.long_help if subcmd.long_help
+          str += '\n' + subcmd.long_help if subcmd.long_help
           return str
         end
 
@@ -127,7 +128,7 @@ module Byebug
         'breakpoint is not forgotten, but has no effect until reenabled.'],
        ['display', 1, 'Disable some display expressions when program stops',
         'Arguments are the code numbers of the expressions to stop '       \
-        'displaying. Do \"info display\" to see the current list of code ' \
+        'displaying. Do "info display" to see the current list of code ' \
         'numbers.'],
       ].map do |name, min, short_help, long_help|
       SubcmdStruct.new(name, min, short_help, long_help)
@@ -139,8 +140,8 @@ module Byebug
 
     def execute
       if not @match[1]
-        errmsg "\"disable\" must be followed \"display\", \"breakpoints\"" +
-          " or breakpoint numbers.\n"
+        errmsg "\"disable\" must be followed by \"display\", \"breakpoints\" " \
+               "or breakpoint numbers.\n"
       else
         args = @match[1].split(/[ \t]+/)
         param = args.shift
@@ -148,17 +149,17 @@ module Byebug
         if subcmd
           send("disable_#{subcmd.name}", args)
         else
-          send("disable_breakpoints", args.unshift(param))
+          send('disable_breakpoints', args.unshift(param))
         end
       end
     end
 
     def disable_breakpoints(args)
-      enable_disable_breakpoints("Disable", args)
+      enable_disable_breakpoints('Disable', args)
     end
 
     def disable_display(args)
-      enable_disable_display("Disable", args)
+      enable_disable_display('Disable', args)
     end
 
     class << self
@@ -173,7 +174,7 @@ module Byebug
           return "Invalid \"disable\" subcommand \"#{args[1]}\"." unless subcmd
 
           str = subcmd.short_help + '.'
-          str += "\n" + subcmd.long_help if subcmd.long_help
+          str += '\n' + subcmd.long_help if subcmd.long_help
           return str
         end
 

data/lib/byebug/commands/eval.rb

@@ -23,7 +23,7 @@ module Byebug
     end
   end
 
-  class EvalCommand < Command # :nodoc:
+  class EvalCommand < Command
     self.allow_in_control = true
 
     register_setting_get(:autoeval) do

data/lib/byebug/commands/finish.rb

@@ -31,11 +31,10 @@ module Byebug
         %{
           fin[ish] [frame-number]\tExecute until selected stack frame returns.
 
-If no frame number is given, we run until the currently selected frame
-returns.  The currently selected frame starts out the most-recent
-frame or 0 if no frame positioning (e.g "up", "down" or "frame") has
-been performed. If a frame number is given we run until that frame
-returns.
+If no frame number is given, we run until the currently selected frame returns.
+The currently selected frame starts out the most-recent frame or 0 if no frame
+positioning (e.g "up", "down" or "frame") has been performed. If a frame number
+is given we run until that frame returns.
         }
       end
     end

data/lib/byebug/commands/info.rb

@@ -41,18 +41,18 @@ module Byebug
        ['locals', 2, 'Local variables of the current stack frame'],
        ['program', 2, 'Execution status of the program'],
        ['stack', 2, 'Backtrace of the stack'],
-#      ['thread', 6,  'List info about thread NUM',
-#       'If no thread number is given, we list info for all threads. "terse"' \
-#       ' and "verbose" options are possible. If "terse", just give summary ' \
-#       'thread name information. See "help info threads" for more detail '   \
-#       'about this summary information. If "verbose" is appended to the end' \
-#       ' of the command, then the entire stack trace is given for each '     \
-#       'thread.'],
-#      ['threads', 7, 'information of currently-known threads',
-#       'This information includes whether the thread is the current thread ' \
-#       '(+), it\'s suspended ($) or it\'s ignored (!), plus the thread '     \
-#       'number and the top stack item. If "verbose" is given then the '      \
-#       'entire stack frame is shown.'],
+       ['thread', 6,  'List info about thread NUM',
+        'If no thread number is given, we list info for all threads. "terse"' \
+        ' and "verbose" options are possible. If "terse", just give summary ' \
+        'thread name information. See "help info threads" for more detail '   \
+        'about this summary information. If "verbose" is appended to the end' \
+        ' of the command, then the entire stack trace is given for each '     \
+        'thread.'],
+       ['threads', 7, 'information of currently-known threads',
+        'This information includes whether the thread is the current thread ' \
+        '(+), it\'s suspended ($) or it\'s ignored (!), plus the thread '     \
+        'number and the top stack item. If "verbose" is given then the '      \
+        'entire stack frame is shown.'],
        ['variables', 1,
         'Local and instance variables of the current stack frame']
       ].map do |name, min, short_help, long_help|
@@ -114,37 +114,30 @@ module Byebug
     end
 
     def info_breakpoints(*args)
-      unless @state.context
-        print "info breakpoints not available here.\n"
-        return
+      return print "\"info breakpoints\" not available here.\n" unless
+        @state.context
+
+      return print "No breakpoints.\n" if Byebug.breakpoints.empty?
+
+      brkpts = Byebug.breakpoints.sort_by{|b| b.id}
+      unless args.empty?
+        indices = args.map{|a| a.to_i}
+        brkpts = brkpts.select{|b| indices.member?(b.id)}
+        return errmsg "No breakpoints found among list given.\n" if
+          brkpts.empty?
       end
-      unless Byebug.breakpoints.empty?
-        brkpts = Byebug.breakpoints.sort_by{|b| b.id}
-        unless args.empty?
-          indices = args.map{|a| a.to_i}
-          brkpts = brkpts.select{|b| indices.member?(b.id)}
-          if brkpts.empty?
-            errmsg "No breakpoints found among list given.\n"
-            return
-          end
+      print "Num Enb What\n"
+      brkpts.each do |b|
+        print "%-3d %-3s at %s:%s%s\n", b.id,
+                                        b.enabled? ? 'y' : 'n',
+                                        b.source,
+                                        b.pos,
+                                        b.expr.nil? ? '' : " if #{b.expr}"
+        hits = b.hit_count
+        if hits > 0
+          s = (hits > 1) ? 's' : ''
+          print "\tbreakpoint already hit #{hits} time#{s}\n"
         end
-        print "Num Enb What\n"
-        brkpts.each do |b|
-          if b.expr.nil?
-            print "%3d %s   at %s:%s\n",
-            b.id, (b.enabled? ? 'y' : 'n'), b.source, b.pos
-          else
-            print "%3d %s   at %s:%s if %s\n",
-            b.id, (b.enabled? ? 'y' : 'n'), b.source, b.pos, b.expr
-          end
-          hits = b.hit_count
-          if hits > 0
-            s = (hits > 1) ? 's' : ''
-            print "\tbreakpoint already hit #{hits} time#{s}\n"
-          end
-        end
-      else
-        print "No breakpoints.\n"
       end
     end
 
@@ -167,6 +160,35 @@ module Byebug
       end
     end
 
+    def info_file_path(file)
+      path = LineCache.path(file)
+      if path != file
+        print " - #{path}"
+      end
+    end
+
+    def info_file_lines(file)
+      lines = LineCache.size(file)
+      print "\t %d lines\n", lines if lines
+    end
+
+    def info_file_breakpoints(file)
+      breakpoints = LineCache.trace_line_numbers(file)
+      if breakpoints
+        print "\tbreakpoint line numbers:\n"
+        print columnize(breakpoints.to_a.sort, self.class.settings[:width])
+      end
+    end
+
+    def info_file_mtime(file)
+      stat = LineCache.stat(file)
+      print "\t%s\n", stat.mtime if stat
+    end
+
+    def info_file_sha1(file)
+      print "\t%s\n", LineCache.sha1(file)
+    end
+
     def info_file(*args)
       return info_files unless args[0]
       file = args[0]
@@ -184,33 +206,13 @@ module Byebug
       end
 
       print "File #{file}"
-      path = LineCache.path(file)
-      if %w(all basic path).member?(subcmd.name) and path != file
-        print " - #{path}"
-      end
+      info_file_path(file) if %w(all basic path).member?(subcmd.name)
       print "\n"
 
-      if %w(all basic lines).member?(subcmd.name)
-        lines = LineCache.size(file)
-        print "\t %d lines\n", lines if lines
-      end
-
-      if %w(all breakpoints).member?(subcmd.name)
-        breakpoints = LineCache.trace_line_numbers(file)
-        if breakpoints
-          print "\tbreakpoint line numbers:\n"
-          print columnize(breakpoints.to_a.sort, self.class.settings[:width])
-        end
-      end
-
-      if %w(all mtime).member?(subcmd.name)
-        stat = LineCache.stat(file)
-        print "\t%s\n", stat.mtime if stat
-      end
-
-      if %w(all sha1).member?(subcmd.name)
-        print "\t%s\n", LineCache.sha1(file)
-      end
+      info_file_lines(file) if %w(all basic lines).member?(subcmd.name)
+      info_file_breakpoints(file) if %w(all breakpoints).member?(subcmd.name)
+      info_file_mtime(file) if %w(all mtime).member?(subcmd.name)
+      info_file_sha1(file) if %w(all sha1).member?(subcmd.name)
     end
 
     def info_files(*args)
@@ -301,56 +303,56 @@ module Byebug
       print_backtrace
     end
 
-#   def info_thread_preamble(arg)
-#     if not @state.context
-#       errmsg "info threads not available here.\n"
-#       return false, false
-#     end
-#     verbose = if arg
-#       subcmd = find(InfoThreadSubcommands, arg)
-#       unless subcmd
-#         errmsg "'terse' or 'verbose' expected. Got '#{arg}'\n"
-#         return false, false
-#       end
-#       'verbose' == subcmd.name
-#     else
-#       false
-#     end
-#     return true, verbose
-#   end
-#   private :info_thread_preamble
-
-#   def info_threads(*args)
-#     ok, verbose = info_thread_preamble(args[0])
-#     return unless ok
-#     threads = Byebug.contexts.sort_by{|c| c.thnum}.each do |c|
-#       display_context(c, !verbose)
-#       if verbose and not c.ignored?
-#         (0...c.stack_size).each do |idx|
-#           print "\t"
-#           print_frame(idx, false, c)
-#         end
-#       end
-#     end
-#   end
-
-#   def info_thread(*args)
-#     unless args[0]
-#       info_threads(args[0])
-#       return
-#     end
-#     ok, verbose = info_thread_preamble(args[1])
-#     return unless ok
-#     c = parse_thread_num("info thread" , args[0])
-#     return unless c
-#     display_context(c, !verbose)
-#     if verbose and not c.ignored?
-#       (0...c.stack_size).each do |idx|
-#         print "\t"
-#         print_frame(idx, false, c)
-#       end
-#     end
-#   end
+    def info_thread_preamble(arg)
+      if not @state.context
+        errmsg "info threads not available here.\n"
+        return false, false
+      end
+      verbose = if arg
+        subcmd = find(InfoThreadSubcommands, arg)
+        unless subcmd
+          errmsg "'terse' or 'verbose' expected. Got '#{arg}'\n"
+          return false, false
+        end
+        'verbose' == subcmd.name
+      else
+        false
+      end
+      return true, verbose
+    end
+    private :info_thread_preamble
+
+    def info_threads(*args)
+      ok, verbose = info_thread_preamble(args[0])
+      return unless ok
+      threads = Byebug.contexts.sort_by{|c| c.thnum}.each do |c|
+        display_context(c, !verbose)
+        if verbose and not c.ignored?
+          (0...c.stack_size).each do |idx|
+            print "\t"
+            print_frame(idx, false, c)
+          end
+        end
+      end
+    end
+
+    def info_thread(*args)
+      unless args[0]
+        info_threads(args[0])
+        return
+      end
+      ok, verbose = info_thread_preamble(args[1])
+      return unless ok
+      c = parse_thread_num("info thread" , args[0])
+      return unless c
+      display_context(c, !verbose)
+      if verbose and not c.ignored?
+        (0...c.stack_size).each do |idx|
+          print "\t"
+          print_frame(idx, false, c)
+        end
+      end
+    end
 
     def info_global_variables(*args)
       unless @state.context