byebug 1.0.0 → 1.0.1

data/lib/byebug/commands/irb.rb

@@ -71,12 +71,12 @@ module Byebug
       end
 
       save_trap = trap("SIGINT") do
-        throw :IRB_EXIT, :cont if $rdebug_in_irb
+        throw :IRB_EXIT, :cont if $byebug_in_irb
       end
 
       add_debugging = @match.is_a?(MatchData) && '-d' == @match[1]
       $byebug_state = @state if add_debugging
-      $rdebug_in_irb = true
+      $byebug_in_irb = true
       cont = IRB.start_session(get_binding)
       case cont
       when :cont
@@ -97,7 +97,7 @@ module Byebug
       end
 
     ensure
-      $rdebug_in_irb = nil
+      $byebug_in_irb = nil
       $byebug_state = nil if add_debugging
       trap("SIGINT", save_trap) if save_trap
     end

data/lib/byebug/commands/list.rb

@@ -1,9 +1,10 @@
 module Byebug
+
   # Implements byebug "list" command.
   class ListCommand < Command
 
     register_setting_get(:autolist) do
-      ListCommand.always_run 
+      ListCommand.always_run
     end
     register_setting_set(:autolist) do |value|
       ListCommand.always_run = value
@@ -16,17 +17,17 @@ module Byebug
     def execute
       listsize = Command.settings[:listsize]
       if !@match || !(@match[1] || @match[2])
-        b = @state.previous_line ? 
+        b = @state.previous_line ?
         @state.previous_line + listsize : @state.line - (listsize/2)
         e = b + listsize - 1
       elsif @match[1] == '-'
         b = if @state.previous_line
               if  @state.previous_line > 0
-                @state.previous_line - listsize 
+                @state.previous_line - listsize
               else
                 @state.previous_line
               end
-            else 
+            else
               @state.line - (listsize/2)
             end
         e = b + listsize - 1
@@ -65,30 +66,30 @@ module Byebug
 
     private
 
-    # Show FILE from line B to E where CURRENT is the current line number.
-    # If we can show from B to E then we return B, otherwise we return the
-    # previous line @state.previous_line.
-    def display_list(b, e, file, current)
-      print "[%d, %d] in %s\n", b, e, file
-      lines = LineCache::getlines(file, 
-                                  Command.settings[:reload_source_on_change])
-      if lines
-        return @state.previous_line if b >= lines.size
-        e = lines.size if lines.size < e
-        [b, 1].max.upto(e) do |n|
-          if n > 0 && lines[n-1]
-            if n == current
-              print "=> %d  %s\n", n, lines[n-1].chomp
-            else
-              print "   %d  %s\n", n, lines[n-1].chomp
+      # Show FILE from line B to E where CURRENT is the current line number.
+      # If we can show from B to E then we return B, otherwise we return the
+      # previous line @state.previous_line.
+      def display_list(b, e, file, current)
+        print "[%d, %d] in %s\n", b, e, file
+        lines = LineCache::getlines(file,
+                                    Command.settings[:reload_source_on_change])
+        if lines
+          return @state.previous_line if b >= lines.size
+          e = lines.size if lines.size < e
+          [b, 1].max.upto(e) do |n|
+            if n > 0 && lines[n-1]
+              if n == current
+                print "=> %d  %s\n", n, lines[n-1].chomp
+              else
+                print "   %d  %s\n", n, lines[n-1].chomp
+              end
             end
           end
+        else
+          errmsg "No sourcefile available for %s\n", file
+          return @state.previous_line
         end
-      else
-        errmsg "No sourcefile available for %s\n", file
-        return @state.previous_line
+        return e == lines.size ? @state.previous_line : b
       end
-      return e == lines.size ? @state.previous_line : b
-    end
   end
 end

data/lib/byebug/commands/save.rb

@@ -1,10 +1,10 @@
 module Byebug
-  module SaveFunctions # :nodoc:
 
+  module SaveFunctions
     # Create a temporary file to write in if file is nil
     def open_save
       require "tempfile"
-      file = Tempfile.new("rdebug-save")
+      file = Tempfile.new("byebug-save")
       # We want close to not unlink, so redefine.
       def file.close
         @tmpfile.close if @tmpfile
@@ -13,9 +13,9 @@ module Byebug
     end
   end
 
-  class SaveCommand < Command # :nodoc:
+  class SaveCommand < Command
     self.allow_in_control = true
-    
+
     def save_breakpoints(file)
       Byebug.breakpoints.each do |b|
         file.puts "break #{b.source}:#{b.pos}#{" if #{b.expr}" if b.expr}"
@@ -24,10 +24,10 @@ module Byebug
 
     def save_catchpoints(file)
       Byebug.catchpoints.keys.each do |c|
-        file.puts "catch #{c}" 
+        file.puts "catch #{c}"
       end
     end
-    
+
     def save_displays(file)
       for d in @state.display
         if d[0]
@@ -35,7 +35,7 @@ module Byebug
         end
       end
     end
-    
+
     def save_settings(file)
       # FIXME put routine in set
       %w(autoeval basename byebugtesting).each do |setting|
@@ -47,13 +47,13 @@ module Byebug
         file.puts "set #{setting} #{on_off}"
       end
     end
-    
+
     def regexp
       /^\s* sa(?:ve)?
-        (?:\s+(.+))? 
+        (?:\s+(.+))?
         \s*$/ix
     end
-    
+
     def execute
       if not @match[1] or @match[1].strip.empty?
         file = open_save()
@@ -75,7 +75,7 @@ module Byebug
       def help_command
         'save'
       end
-      
+
       def help(cmd)
         %{
 save [FILE]

data/lib/byebug/commands/set.rb

@@ -4,37 +4,35 @@ module Byebug
   class SetCommand < Command
     SubcmdStruct2=Struct.new(:name, :min, :is_bool, :short_help,
                              :long_help) unless defined?(SubcmdStruct2)
-    Subcommands =
-      [
-        ['annotate', 2, false, "Set annotation level",
-         '0 == normal. '                                                    \
-         '2 == output annotated suitably for use by programs that control ' \
-         'byebug.'],
-        ['args', 2, false,
-         'Set argument list to give program being debugged when it is started'],
-        ['autoeval', 4, true, "Evaluate every unrecognized command"],
-        ['autolist', 4, true, "Execute 'list' command on every breakpoint"],
-        ['autoirb', 4, true, "Invoke IRB on every stop"],
-        ['autoreload', 4, true, "Reload source code when changed"],
-        ['basename', 1, true, "Report file basename only showing file names"],
-        ['callstyle', 2, false, "Set how you want call parameters displayed"],
-        ['byebugtesting', 8, false, "Used when testing byebug"],
-        ['forcestep', 2, true,
-         'Make sure \'next/step\' commands always move to a new line'],
-        ['fullpath', 2, true, "Display full file names in frames"],
-        ['history', 2, false,
-         'Generic command for setting command history parameters',
-         'set history filename -- Set the filename in which to record the ' \
-         'command history. '                                                \
-         'set history save -- Set saving of the history record on exit. '   \
-         'set history size -- Set the size of the command history'],
-        ['linetrace+', 10, true,
-         'Set line execution tracing to show different lines'],
-        ['linetrace', 3, true, "Set line execution tracing"],
-        ['listsize', 3, false, "Set number of source lines to list by default"],
-        ['trace', 1, true, "Display stack trace when 'eval' raises exception"],
-        ['width', 1, false,
-         'Number of characters per line for byebug\'s output']
+    Subcommands = [
+      ['annotate', 2, false, "Set annotation level",
+       '0 == normal. '                                                    \
+       '2 == output annotated suitably for use by programs that control ' \
+       'byebug.'],
+      ['args', 2, false,
+       'Set argument list to give program being debugged when it is started'],
+      ['autoeval', 4, true, "Evaluate every unrecognized command"],
+      ['autolist', 4, true, "Execute 'list' command on every breakpoint"],
+      ['autoirb', 4, true, "Invoke IRB on every stop"],
+      ['autoreload', 4, true, "Reload source code when changed"],
+      ['basename', 1, true, "Report file basename only showing file names"],
+      ['callstyle', 2, false, "Set how you want call parameters displayed"],
+      ['byebugtesting', 8, false, "Used when testing byebug"],
+      ['forcestep', 2, true,
+       'Make sure \'next/step\' commands always move to a new line'],
+      ['fullpath', 2, true, "Display full file names in frames"],
+      ['history', 2, false,
+       'Generic command for setting command history parameters',
+       'set history filename -- Set the filename in which to record the ' \
+       'command history. '                                                \
+       'set history save -- Set saving of the history record on exit. '   \
+       'set history size -- Set the size of the command history'],
+      ['linetrace+', 10, true,
+       'Set line execution tracing to show different lines'],
+      ['linetrace', 3, true, "Set line execution tracing"],
+      ['listsize', 3, false, "Set number of source lines to list by default"],
+      ['trace', 1, true, "Display stack trace when 'eval' raises exception"],
+      ['width', 1, false, 'Number of characters per line for byebug\'s output']
       ].map do |name, min, is_bool, short_help, long_help|
       SubcmdStruct2.new(name, min, is_bool, short_help, long_help)
     end unless defined?(Subcommands)
@@ -47,11 +45,7 @@ module Byebug
 
     def execute
       if not @match[1]
-        print "\"set\" must be followed by the name of an set command:\n"
-        print "List of set subcommands:\n\n"
-        for subcmd in Subcommands do
-          print "set #{subcmd.name} -- #{subcmd.short_help}\n"
-        end
+        print_subcommands
       else
         args = @match[1].split(/[ \t]+/)
         subcmd = args.shift
@@ -80,10 +74,10 @@ module Byebug
                   return
                 end
                 if defined?(Byebug::RDEBUG_SCRIPT)
-                  # rdebug was called initially. 1st arg is script name.
+                  # byebug was called initially. 1st arg is script name.
                   Command.settings[:argv][1..-1] = args
                 else
-                  # rdebug wasn't called initially. 1st arg is not script name.
+                  # byebug wasn't called initially. 1st arg is not script name.
                   Command.settings[:argv] = args
                 end
               when /^args$/

data/lib/byebug/commands/show.rb

@@ -11,10 +11,10 @@ module Byebug
       when /^args$/
         if Command.settings[:argv] and Command.settings[:argv].size > 0
           if defined?(Byebug::RDEBUG_SCRIPT)
-            # rdebug was called initially. 1st arg is script name.
+            # byebug was called initially. 1st arg is script name.
             args = Command.settings[:argv][1..-1].join(' ')
           else
-            # rdebug wasn't called initially. 1st arg is not script name.
+            # byebug wasn't called initially. 1st arg is not script name.
             args = Command.settings[:argv].join(' ')
           end
         else
@@ -194,11 +194,7 @@ show history size -- Show the size of the command history"],
 
     def execute
       if not @match[1]
-        print "\"show\" must be followed by the name of an show command:\n"
-        print "List of show subcommands:\n\n"
-        for subcmd in Subcommands do
-          print "show #{subcmd.name} -- #{subcmd.short_help}\n"
-        end
+        print_subcommands
       else
         args = @match[1].split(/[ \t]+/)
         param = args.shift

data/lib/byebug/commands/variables.rb

@@ -5,8 +5,7 @@ module Byebug
       ary.sort!
       for v in ary
         begin
-          s = debug_eval(v.to_s, b).inspect unless
-            v == :$KCODE || v == :$-K || v == :$=
+          s = debug_eval(v.to_s, b).inspect
         rescue
           begin
             s = debug_eval(v.to_s, b).to_s
@@ -14,9 +13,7 @@ module Byebug
             s = "*Error in evaluation*"
           end
         end
-        if s.size > self.class.settings[:width]
-          s[self.class.settings[:width]-3 .. -1] = "..."
-        end
+        pad_with_dots(s)
         print "%s = %s\n", v, s
       end
     end
@@ -24,6 +21,9 @@ module Byebug
       obj = debug_eval('self')
       var_list(obj.class.class_variables, get_binding)
     end
+    def var_global
+      var_list(global_variables.reject { |v| [:$=, :$KCODE, :$-K].include?(v) })
+    end
   end
 
   # Implements byebug's 'var class' command
@@ -92,7 +92,7 @@ module Byebug
     end
 
     def execute
-      var_list(global_variables)
+      var_global
     end
 
     class << self

data/lib/byebug/helper.rb

@@ -63,7 +63,7 @@ module Byebug
       eval("BEGIN {return true}\n#{code}", nil, "", 0)
     rescue Exception
       false
-    end 
+    end
 
   end
 end

data/lib/byebug/interface.rb

@@ -1,6 +1,6 @@
 module Byebug
 
-  class Interface # :nodoc:
+  class Interface
     attr_writer :have_readline
 
     def initialize
@@ -31,13 +31,14 @@ module Byebug
 
   end
 
-  class LocalInterface < Interface # :nodoc:
+  class LocalInterface < Interface
     attr_accessor :command_queue, :history_length, :history_save, :histfile
     attr_accessor :restart_file
 
     unless defined?(FILE_HISTORY)
-      FILE_HISTORY = ".rdebug_hist"
+      FILE_HISTORY = ".byebug_hist"
     end
+
     def initialize()
       super
       @command_queue = []
@@ -126,7 +127,7 @@ module Byebug
       end
   end
 
-  class RemoteInterface < Interface # :nodoc:
+  class RemoteInterface < Interface
     attr_accessor :command_queue, :history_length, :history_save, :histfile
     attr_accessor :restart_file
 
@@ -180,7 +181,7 @@ module Byebug
       end
   end
 
-  class ScriptInterface < Interface # :nodoc:
+  class ScriptInterface < Interface
     attr_accessor :command_queue, :history_length, :history_save, :histfile
     attr_accessor :restart_file
 

data/lib/byebug/processor.rb

@@ -86,7 +86,8 @@ module Byebug
     end
 
     def self.print_location_and_text(file, line)
-      file_line = "#{canonic_file(file)}:#{line}\n#{Byebug.line_at(file, line)}"
+      file_line = "#{canonic_file(file)}:#{line}\n" \
+                  "#{Byebug.line_at(file, line)}\n"
 
       # FIXME: use annotations routines
       if Byebug.annotate.to_i > 2
@@ -132,7 +133,7 @@ module Byebug
       aprint 'stopped' if Byebug.annotate.to_i > 2
       file = CommandProcessor.canonic_file(context.frame_file(0))
       line = context.frame_line(0)
-      print afmt("%s:%d" % [file, line]) if ENV['EMACS']
+      #print afmt("%s:%d" % [file, line]) if ENV['EMACS']
       print "Catchpoint at %s:%d: `%s' (%s)\n", file, line, excpt, excpt.class
       fs = context.stack_size
       tb = caller(0)[-fs..-1]
@@ -148,10 +149,9 @@ module Byebug
       # Don't trace ourselves
       return if defined?(Byebug::RDEBUG_FILE) && Byebug::RDEBUG_FILE == file
 
-      #@last_file = CommandProcessor.canonic_file(file)
       file = CommandProcessor.canonic_file(file)
-      unless file == @last_file and line == @last_line and
-             Command.settings[:tracing_plus]
+      tracing_plus = Command.settings[:tracing_plus]
+      if file != @last_file || line != @last_line || tracing_plus
         @last_file = file
         @last_line = line
         print "Tracing: #{file}:#{line} #{Byebug.line_at(file, line)}"
@@ -356,8 +356,8 @@ module Byebug
       end
 
       class State
-        attr_accessor :binding, :commands, :context, :display, :file, :frame_pos
-        attr_accessor :interface, :line, :previous_line
+        attr_accessor :binding, :commands, :context, :display, :file
+        attr_accessor :frame_pos, :interface, :line, :previous_line
 
         def initialize
           super()
@@ -382,7 +382,7 @@ module Byebug
   end # end class CommandProcessor
 
 
-  class ControlCommandProcessor < Processor # :nodoc:
+  class ControlCommandProcessor < Processor
 
     def initialize(interface)
       super()
@@ -426,7 +426,7 @@ module Byebug
     # The prompt shown before reading a command.
     # Note: have an unused 'context' parameter to match the local interface.
     def prompt(context)
-      p = '(rdb:ctrl) '
+      p = '(byebug:ctrl) '
       p = afmt("pre-prompt")+p+"\n"+afmt("prompt") if
         Byebug.annotate.to_i > 2
       return p

data/lib/byebug/version.rb

@@ -1,4 +1,4 @@
 module Byebug
   # Current version of the gem
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end