byebug 1.8.2 → 2.0.0

data/lib/byebug/remote.rb

@@ -34,7 +34,7 @@ module Byebug
 
       server = TCPServer.new(host, cmd_port)
       @cmd_port = cmd_port = server.addr[1]
-      @thread = Thread.new do
+      @thread = DebugThread.new do
         while (session = server.accept)
           self.interface = RemoteInterface.new(session)
           if wait_connection
@@ -52,13 +52,13 @@ module Byebug
     end
 
     def start_control(host = nil, ctrl_port = PORT + 1)
-      return @ctrl_port if defined?(@control_thread) && @control_thread
+      return @ctrl_port if @control_thread
       server = TCPServer.new(host, ctrl_port)
       @ctrl_port = server.addr[1]
       @control_thread = Thread.new do
         while (session = server.accept)
           interface = RemoteInterface.new(session)
-          processor = ControlCommandProcessor.new(interface)
+          ControlCommandProcessor.new(interface).process_commands
           processor.process_commands
         end
       end

data/lib/byebug/version.rb

@@ -1,3 +1,3 @@
 module Byebug
-  VERSION = '1.8.2'
+  VERSION = '2.0.0'
 end

data/old_doc/byebug.1

@@ -147,12 +147,6 @@ https://github.com/cldwalker/byebug
 .PP
 .TP 10
 .TP
-.B \-A | \-\-annotate LEVEL
-Set gdb-style annotation to LEVEL, a number. Additional information is output
-automatically when program state is changed. This can be used by
-front-ends such as GNU Emacs to post this updated information without
-having to poll for it.
-.TP
 .B \-d | \-\-debug
 Set $DEBUG true.
 .TP

data/old_doc/byebug.texi

@@ -1,8 +1,8 @@
 \input texinfo
 @setfilename byebug.info
 
-@set BYEBUG_VERSION 1.1.1
-@set UPDATED May-2013
+@set BYEBUG_VERSION 1.8.2
+@set UPDATED Aug-2013
 
 @macro Example {}
 @iftex
@@ -917,7 +917,6 @@ byebug @value{BYEBUG_VERSION}
 Usage: byebug [options] <script.rb> -- <script.rb parameters>
 
 Options:
-    -A, --annotate LEVEL       Set annotation level
     -d, --debug                Set $DEBUG=true
     -I, --include PATH         Add PATH to $LOAD_PATH
         --keep-frame-binding   Keep frame bindings
@@ -968,13 +967,6 @@ This option causes @code{byebug} to print some basic help and exit.
 @cindex @option{-v}
 This option causes @code{byebug} to print its version number and exit.
 
-@item -A | --annotate @var{level}
-@cindex @option{-A}
-@cindex @option{--annotation} @var{level}
-Set gdb-style annotation @var{level}, a number. Additional information is output
-automatically when program state is changed. This can be used by front-ends such
-as GNU Emacs to post this updated information without having to poll for it.
-
 @item --debug
 @cindex @option{--debug}
 Set @code{$DEBUG} to @code{true}. This option is compatible with Ruby's.
@@ -1092,8 +1084,8 @@ Here are the default values in @code{options}
 @smallexample
 #<OpenStruct server=false, client=false, frame_bind=false, cport=8990,
              tracing=false, nx=false, post_mortem=false, port=8989,
-             verbose_long=false, annotate=nil, control=true, restart_script=nil,
-             quit=true, stop=true, script=nil, host=nil, wait=false>
+             verbose_long=false, control=true, restart_script=nil, quit=true,
+             stop=true, script=nil, host=nil, wait=false>
 @end smallexample
 
 @node Command Files
@@ -1298,8 +1290,7 @@ will be @code{(byebug:post-mortem)}.
 
 In the local interface, whenever @code{byebug} gives an error message such as
 for an invalid command, or an invalid location position, it will generally
-preface the message with @code{***}. However if annotation mode is on then the
-message is put in a @code{begin-error} annotation and no @code{***} appears.
+preface the message with @code{***}.
 
 @node Help
 @section Getting help (@samp{help})
@@ -1326,11 +1317,11 @@ byebug help v@value{BYEBUG_VERSION}
 Type 'help <command-name>' for help on a specific command
 
 Available commands:
-backtrace  delete   enable  help  list    ps       save    where
-break      disable  eval    info  method  putl     set     trace
-catch      display  exit    irb   next    quit     show    undisplay
-condition  down     finish  jump  p       reload   source  up
-continue   edit     frame   kill  pp      restart  step    var
+backtrace  delete   enable  help  method  ps       save    step       where
+break      disable  eval    info  next    putl     set     trace
+catch      display  exit    irb   p       quit     show    undisplay
+condition  down     finish  kill  pp      reload   skip    up
+continue   edit     frame   list  pry     restart  source  var
 @end smallexample
 @end flushleft
 @c the above line break eliminates huge line overfull...
@@ -1362,11 +1353,12 @@ include @code{info}, @code{set}, @code{show}, @code{enable} and @code{disable}.
 When you ask for help for one of these commands, you will get help for all of
 the subcommands that that command offers. Sometimes you may want help that
 subcommand and to do this just follow the command with its subcommand name. For
-example @code{help set annotate} will just give help about the annotate command.
-Furthermore it will give longer help than the summary information that appears
-when you ask for help. You don't need to list the full subcommand name, but just
-enough of the letters to make that subcommand distinct from others will do. For
-example, @code{help set an} is the same as @code{help set annotate}.
+example @code{help info breakpoints} will just give help about the
+@code{info breakpoints} command. Furthermore it will give longer help than the
+summary information that appears when you ask for help. You don't need to list
+the full subcommand name, but just enough of the letters to make that subcommand
+distinct from others will do. For example, @code{help info b} is the same as
+@code{help info breakpoints}.
 
 Some examples follow.
 @example
@@ -2252,7 +2244,7 @@ condition 1       # Change that! Unconditionally stop on breakpoint 1.
 @end example
 
 @node Resuming Execution
-@subsection Resuming Execution (@samp{step}, @samp{next}, @samp{finish}, @samp{continue}, @samp{jump})
+@subsection Resuming Execution (@samp{step}, @samp{next}, @samp{finish}, @samp{continue})
 
 A typical technique for using stepping is to set a breakpoint
 (@pxref{Breakpoints}) at the beginning of the function or the section of your
@@ -2274,7 +2266,6 @@ breakpoint or a signal.
 * Next::     running the next statement skipping over functions (next)
 * Finish::   running until the return of a function or ``source'' (finish)
 * Continue:: continuing execution (continue)
-* Jump::     jumping to a new line (jump)
 @end menu
 
 @node Step
@@ -2367,14 +2358,6 @@ a listing of the breakpoints you won't see this entry in the list of
 breakpoints.
 @end table
 
-@node Jump
-@subsubsection Jump (@samp{jump})
-@table @code
-@kindex jump @r{[}+-@r{]} @ovar{line}
-@item jump @r{[}+-@r{]} @ovar{line}
-Change the next line to execute to the given line number.
-@end table
-
 @node byebug settings
 @section byebug settings (@samp{set args}, @samp{set autoeval}..)
 
@@ -2613,17 +2596,17 @@ Shows whether line tracing is in effect or not.
 @subsection Set/Show Line tracing style
 
 @table @code
-@kindex set linetrace+ @r{[} on | 1 | off | 0 @r{]}
-@item set linetrace+ @r{[} on | 1 | off | 0 @r{]}
+@kindex set linetrace_plus @r{[} on | 1 | off | 0 @r{]}
+@item set linetrace_plus @r{[} on | 1 | off | 0 @r{]}
 
-Setting linetrace+ on will cause consecutive trace lines not to be a
-duplicate of the preceding line-trace line. Note however that this
-setting doesn't by itself turn on or off line tracing.
+Setting linetrace_plus on will cause every trace line to be printed, even if
+it's a duplicate of the preceding trace line. Note however that this setting
+doesn't by itself turn on or off line tracing.
 
-@kindex show linetrace+
-@item show linetrace
-Shows whether the line tracing style is to show all lines or remove
-duplicates linetrace lines when it is a repeat of the previous line.
+@kindex show linetrace_plus
+@item show linetrace_plus
+Shows whether the line tracing style is to show all lines or remove duplicates
+linetrace lines when it is a repeat of the previous line.
 @end table
 
 @node Listsize
@@ -2963,17 +2946,17 @@ Boolean. True if basename on. @xref{Basename}.
 Symbol: @code{:short} or @code{:long}. @xref{Callstyle}.
 @item :testing
 Boolean. True if currently testing byebug.
-@item :force_stepping
+@item :forcestep
 Boolean. True if stepping should go to a line different from the last
 step. @xref{Forcestep}.
-@item :frame_fullpath
+@item :fullpath
 Boolean. @xref{Fullpath}.
 @item :listsize
 Fixnum. Number of lines to show in a @code{list} command. @xref{Listsize}.
 @item :autoreload
 Boolean. True if we should reread the source every time it changes. @xref{Autoreload}.
 @item :stack_trace_on_error
-Boolean. True if we should produce a stack trace on error. @xref{Trace}.
+Boolean. True if we should produce a stack trace on eval errors. @xref{Trace}.
 @item :width
 Fixnum. Number of characters byebug thinks are in a line. @xref{Width}.
 @end table

data/test/breakpoints_test.rb

@@ -1,9 +1,14 @@
 require_relative 'test_helper'
 
 class TestBreakpoints < TestDsl::TestCase
+  before do
+    @tst_file = fullpath('breakpoint')
+    @tst_file_2 = fullpath('breakpoint2')
+  end
 
   describe 'setting breakpoint in the current file' do
     before { enter 'break 10' }
+
     subject { Byebug.breakpoints.first }
 
     def check_subject(field, value)
@@ -11,8 +16,7 @@ class TestBreakpoints < TestDsl::TestCase
     end
 
     it('must have correct pos') { check_subject(:pos, 10) }
-    it('must have correct source') {
-      check_subject(:source, fullpath('breakpoint')) }
+    it('must have correct source') { check_subject(:source, @tst_file) }
     it('must have correct expression') { check_subject(:expr, nil) }
     it('must have correct hit count') { check_subject(:hit_count, 0) }
     it('must have correct hit value') { check_subject(:hit_value, 0) }
@@ -20,8 +24,7 @@ class TestBreakpoints < TestDsl::TestCase
     it('must return right response') do
       id = nil
       debug_file('breakpoint') { id = subject.id }
-      check_output_includes \
-        "Created breakpoint #{id} at #{fullpath('breakpoint')}:10"
+      check_output_includes "Created breakpoint #{id} at #{@tst_file}:10"
     end
   end
 
@@ -41,9 +44,8 @@ class TestBreakpoints < TestDsl::TestCase
 
     it 'must show an error' do
       debug_file('breakpoint')
-      check_output_includes \
-        "There are only #{LineCache.size(fullpath('breakpoint'))} lines in" \
-        " file #{fullpath('breakpoint')}", interface.error_queue
+      check_error_includes \
+        "There are only #{LineCache.size(@tst_file)} lines in file #{@tst_file}"
     end
   end
 
@@ -57,9 +59,8 @@ class TestBreakpoints < TestDsl::TestCase
 
     it 'must show an error' do
       debug_file('breakpoint')
-      check_output_includes \
-        "Line 11 is not a stopping point in file #{fullpath('breakpoint')}",
-        interface.error_queue
+      check_error_includes \
+        "Line 11 is not a stopping point in file #{@tst_file}"
     end
   end
 
@@ -71,7 +72,7 @@ class TestBreakpoints < TestDsl::TestCase
 
     it 'must stop at the correct file' do
       enter 'break 14', 'cont'
-      debug_file('breakpoint') { $state.file.must_equal fullpath('breakpoint') }
+      debug_file('breakpoint') { $state.file.must_equal @tst_file }
     end
 
     describe 'show a message' do
@@ -80,13 +81,12 @@ class TestBreakpoints < TestDsl::TestCase
         it 'must show a message with full filename' do
           enter 'break 14', 'cont'
           debug_file('breakpoint') { @id = Byebug.breakpoints.first.id }
-          check_output_includes \
-            "Created breakpoint #{@id} at #{fullpath('breakpoint')}:14"
+          check_output_includes "Created breakpoint #{@id} at #{@tst_file}:14"
         end
       end
 
       describe 'with basename' do
-        temporary_change_hash Byebug::Command.settings, :basename, true
+        temporary_change_hash Byebug.settings, :basename, true
 
         it 'must show a message with basename' do
           enter 'break 14', 'cont'
@@ -99,46 +99,43 @@ class TestBreakpoints < TestDsl::TestCase
 
   describe 'reloading source on change' do
     describe 'autoreload not set' do
-      temporary_change_hash Byebug::Command.settings, :autoreload, false
+      temporary_change_hash Byebug.settings, :autoreload, false
 
       it 'must not reload source' do
         id = nil
         enter \
-          ->{change_line_in_file(fullpath('breakpoint'), 14, ''); 'break 14'},
-          ->{change_line_in_file(fullpath('breakpoint'), 14, 'c = a + b');
+          ->{change_line_in_file(@tst_file, 14, ''); 'break 14'},
+          ->{change_line_in_file(@tst_file, 14, 'c = a + b');
           'cont'}
         debug_file('breakpoint') { id = Byebug.breakpoints.first.id }
-        check_output_includes \
-          "Created breakpoint #{id} at #{fullpath('breakpoint')}:14"
+        check_output_includes "Created breakpoint #{id} at #{@tst_file}:14"
       end
     end
 
     describe 'autoreload set' do
       it 'must reload source' do
         enter \
-          ->{change_line_in_file(fullpath('breakpoint'), 14, ''); 'break 14'},
+          ->{change_line_in_file(@tst_file, 14, ''); 'break 14'},
           # 2nd breakpoint just to reload source code after rolling changes back
-          ->{change_line_in_file(fullpath('breakpoint'), 14, 'c = a + b');
+          ->{change_line_in_file(@tst_file, 14, 'c = a + b');
             'break 15'}, 'cont'
         debug_file 'breakpoint'
-        check_output_includes \
-          "Line 14 is not a stopping point in file #{fullpath('breakpoint')}",
-          interface.error_queue
+        check_error_includes \
+          "Line 14 is not a stopping point in file #{@tst_file}"
       end
     end
   end
 
   describe 'set breakpoint in a file' do
     describe 'successfully' do
-      before { enter "break #{fullpath('breakpoint2')}:3", 'cont' }
+      before { enter "break #{@tst_file_2}:3", 'cont' }
 
       it 'must stop at the correct line' do
         debug_file('breakpoint') { $state.line.must_equal 3 }
       end
 
       it 'must stop at the correct file' do
-        debug_file('breakpoint') {
-          $state.file.must_equal fullpath('breakpoint2') }
+        debug_file('breakpoint') { $state.file.must_equal @tst_file_2 }
       end
     end
 
@@ -147,8 +144,9 @@ class TestBreakpoints < TestDsl::TestCase
         enter 'break asf:324'
         debug_file('breakpoint')
       end
+
       it 'must show an error' do
-        check_output_includes 'No source file named asf', interface.error_queue
+        check_error_includes 'No source file named asf'
       end
 
       it 'must ask about setting breakpoint anyway' do
@@ -167,8 +165,7 @@ class TestBreakpoints < TestDsl::TestCase
       end
 
       it 'must stop at the correct file' do
-        debug_file('breakpoint') {
-          $state.file.must_equal fullpath('breakpoint') }
+        debug_file('breakpoint') { $state.file.must_equal @tst_file }
       end
     end
 
@@ -180,8 +177,7 @@ class TestBreakpoints < TestDsl::TestCase
       end
 
       it 'must stop at the correct file' do
-        debug_file('breakpoint') {
-          $state.file.must_equal fullpath('breakpoint') }
+        debug_file('breakpoint') { $state.file.must_equal @tst_file }
       end
     end
 
@@ -189,7 +185,7 @@ class TestBreakpoints < TestDsl::TestCase
       it 'must show an error' do
         enter 'break B.a'
         debug_file('breakpoint')
-        check_output_includes 'Unknown class B.', interface.error_queue
+        check_error_includes 'Unknown class B.'
       end
     end
   end
@@ -203,8 +199,7 @@ class TestBreakpoints < TestDsl::TestCase
 
     it 'must show an error' do
       debug_file('breakpoint')
-      check_output_includes \
-        'Invalid breakpoint location: foo.', interface.error_queue
+      check_error_includes 'Invalid breakpoint location: foo.'
     end
   end
 
@@ -242,24 +237,21 @@ class TestBreakpoints < TestDsl::TestCase
       it 'must show an error if syntax is incorrect' do
         enter 'disable'
         debug_file('breakpoint')
-        check_output_includes \
-          '"disable" must be followed by "display", "breakpoints" or ' \
-          'breakpoint numbers.', interface.error_queue
+        check_error_includes '"disable" must be followed by "display", ' \
+                             '"breakpoints" or breakpoint numbers.'
       end
 
       it 'must show an error if no breakpoints is set' do
         enter 'disable 1'
         debug_file('breakpoint')
-        check_output_includes \
-          'No breakpoints have been set.', interface.error_queue
+        check_error_includes 'No breakpoints have been set.'
       end
 
-      it 'must show an error if not a number is provided as an argument to ' \
-         ' "disable" command' do
+      it 'must show an error if a number is not provided as an argument' do
         enter 'break 14', 'disable foo'
         debug_file('breakpoint')
         check_output_includes \
-          'Disable breakpoints argument "foo" needs to be a number.'
+          '"disable breakpoints" argument "foo" needs to be a number.'
       end
     end
   end
@@ -298,9 +290,8 @@ class TestBreakpoints < TestDsl::TestCase
       it 'must show an error if syntax is incorrect' do
         enter 'enable'
         debug_file('breakpoint')
-        check_output_includes \
-          '"enable" must be followed by "display", "breakpoints" or ' \
-          'breakpoint numbers.', interface.error_queue
+        check_error_includes '"enable" must be followed by "display", ' \
+                             '"breakpoints" or breakpoint numbers.'
       end
     end
   end
@@ -333,9 +324,8 @@ class TestBreakpoints < TestDsl::TestCase
     it 'must show an error when conditional syntax is wrong' do
       enter 'break 14 ifa b == 3', 'break 15', 'cont'
       debug_file('breakpoint') { $state.line.must_equal 15 }
-      check_output_includes \
-        'Expecting "if" in breakpoint condition; got: ifa b == 3.',
-        interface.error_queue
+      check_error_includes \
+        'Expecting "if" in breakpoint condition; got: ifa b == 3.'
     end
 
     describe 'enabling with wrong conditional syntax' do
@@ -351,25 +341,22 @@ class TestBreakpoints < TestDsl::TestCase
 
       it 'must show an error' do
         debug_file('breakpoint')
-        check_output_includes \
-          'Expression "b -=( 3" syntactically incorrect; breakpoint remains ' \
-          'disabled.', interface.error_queue
+        check_error_includes 'Expression "b -=( 3" syntactically incorrect; ' \
+                             'breakpoint remains disabled.'
       end
     end
 
     it 'must show an error if no file or line is specified' do
       enter 'break ifa b == 3', 'break 15', 'cont'
       debug_file('breakpoint') { $state.line.must_equal 15 }
-      check_output_includes \
-        'Invalid breakpoint location: ifa b == 3.', interface.error_queue
+      check_error_includes 'Invalid breakpoint location: ifa b == 3.'
     end
 
     it 'must show an error if expression syntax is invalid' do
       enter 'break if b -=) 3', 'break 15', 'cont'
       debug_file('breakpoint') { $state.line.must_equal 15 }
-      check_output_includes \
-        'Expression "b -=) 3" syntactically incorrect; breakpoint disabled.',
-        interface.error_queue
+      check_error_includes \
+        'Expression "b -=) 3" syntactically incorrect; breakpoint disabled.'
     end
   end
 
@@ -394,12 +381,4 @@ class TestBreakpoints < TestDsl::TestCase
       check_output_includes /b\[reak\] file:line \[if expr\]/
     end
   end
-
-  describe 'Post Mortem' do
-    it 'must be able to set breakpoints in post-mortem mode' do
-      enter 'cont', 'break 12', 'cont'
-      debug_file('post_mortem') { $state.line.must_equal 12 }
-    end
-  end
-
 end