byebug 3.0.0 → 3.1.0

data/test/interrupt_test.rb

@@ -1,54 +1,60 @@
-class InterruptExample
-  def self.a(num)
-    num += 2
-    b(num)
-  end
+module InterruptTest
+  class Example
+    def self.a(num)
+      num += 2
+      b(num)
+    end
 
-  def self.b(num)
-    v2 = 5 if 1 == num ; [1, 2, v2].map { |a| a.to_f }
-    c(num)
-  end
+    def self.b(num)
+      v2 = 5 if 1 == num ; [1, 2, v2].map { |a| a.to_f }
+      c(num)
+    end
 
-  def self.c(num)
-    num += 4
-    num
+    def self.c(num)
+      num += 4
+      num
+    end
   end
-end
-
-class TestInterrupting < TestDsl::TestCase
-  describe 'Interrupt Command' do
 
-    describe 'method call behaviour' do
-
-      it 'must interrupt on the next line' do
-        enter 'interrupt'
-        enter 'continue'
-        debug_file('interrupt') do
-          state.line.must_equal 3
-          state.file.must_equal __FILE__
+  class InterruptTestCase < TestDsl::TestCase
+    before do
+      @example = -> do
+        byebug
+        ex = Example.a(7)
+        2.times do
+          ex += 1
         end
+        Example.b(ex)
       end
+    end
 
-      describe 'when forcestep is set' do
-        temporary_change_hash Byebug.settings, :forcestep, true
-
+    describe 'Interrupt Command' do
+      describe 'method call behaviour' do
         it 'must interrupt on the next line' do
-          enter 'interrupt'
-          enter 'continue'
-          debug_file('interrupt') do
-            state.line.must_equal 3
+          enter 'interrupt', 'continue'
+          debug_proc(@example) do
+            state.line.must_equal 4
             state.file.must_equal __FILE__
           end
         end
 
-        describe 'block behaviour' do
-          before { enter 'break 4', 'cont' }
+        describe 'when forcestep is set' do
+          temporary_change_hash Byebug::Setting, :forcestep, true
+
+          it 'must interrupt on the next line' do
+            enter 'interrupt', 'continue'
+            debug_proc(@example) do
+              state.line.must_equal 4
+              state.file.must_equal __FILE__
+            end
+          end
+
+          describe 'block behaviour' do
+            before { enter 'break 24', 'cont' }
 
-          it 'must step into blocks' do
-            enter 'interrupt'
-            enter 'continue'
-            debug_file('interrupt') do
-              state.line.must_equal 5
+            it 'must step into blocks' do
+              enter 'interrupt', 'continue'
+              debug_proc(@example) { state.line.must_equal 25 }
             end
           end
         end

data/test/kill_test.rb

@@ -1,41 +1,50 @@
-class KillExample
-  def self.kill_me
-    'dieeee'
+module KillTest
+  class Example
+    def self.kill_me
+      'dieeee'
+    end
   end
-end
 
-class TestKill < TestDsl::TestCase
-  it 'must send signal to some pid' do
-    Process.expects(:kill).with('USR1', Process.pid)
-    enter 'kill USR1'
-    debug_file('kill')
-  end
+  class KillTestCase < TestDsl::TestCase
+    before do
+      @example = -> do
+        byebug
+        Example.kill_me
+      end
+    end
 
-  it 'must close interface when sending KILL signal explicitly' do
-    Process.stubs(:kill).with('KILL', Process.pid)
-    interface.expects(:close)
-    enter 'kill KILL'
-    debug_file('kill')
-  end
+    it 'must send signal to some pid' do
+      Process.expects(:kill).with('USR1', Process.pid)
+      enter 'kill USR1'
+      debug_proc(@example)
+    end
 
-  it 'must ask confirmation when sending KILL implicitly' do
-    Process.expects(:kill).with('KILL', Process.pid)
-    enter 'kill', 'y'
-    debug_file('kill')
-    check_output_includes 'Really kill? (y/n)', interface.confirm_queue
-  end
+    it 'must close interface when sending KILL signal explicitly' do
+      Process.stubs(:kill).with('KILL', Process.pid)
+      interface.expects(:close)
+      enter 'kill KILL'
+      debug_proc(@example)
+    end
 
-  describe 'unknown signal' do
-    it 'must not send the signal' do
-      Process.expects(:kill).with('BLA', Process.pid).never
-      enter 'kill BLA'
-      debug_file('kill')
+    it 'must ask confirmation when sending KILL implicitly' do
+      Process.expects(:kill).with('KILL', Process.pid)
+      enter 'kill', 'y'
+      debug_proc(@example)
+      check_output_includes 'Really kill? (y/n)', interface.confirm_queue
     end
 
-    it 'must show an error' do
-      enter 'kill BLA'
-      debug_file('kill')
-      check_error_includes 'signal name BLA is not a signal I know about'
+    describe 'unknown signal' do
+      it 'must not send the signal' do
+        Process.expects(:kill).with('BLA', Process.pid).never
+        enter 'kill BLA'
+        debug_proc(@example)
+      end
+
+      it 'must show an error' do
+        enter 'kill BLA'
+        debug_proc(@example)
+        check_error_includes 'signal name BLA is not a signal I know about'
+      end
     end
   end
 end

data/test/list_test.rb

@@ -1,171 +1,204 @@
-class TestList < TestDsl::TestCase
-  describe 'listsize' do
-    it 'must show lines according to :listsize setting' do
-      enter 'break 5', 'cont'
-      debug_file 'list'
-      check_output_includes "[1, 10] in #{fullpath('list')}"
+module ListTest
+  class ListTestCase < TestDsl::TestCase
+    before do
+      @example = -> do
+        byebug
+        a = 6
+        a = 7
+        a = 8
+        a = 9
+        a = 10
+        a = 11
+        a = 12
+        a = 13
+        a = 14
+        a = 15
+        a = 16
+        a = 17
+        a = 18
+        a = 19
+        a = 20
+        a = 21
+        a = 22
+        a = 23
+        a = 24
+        a = 25
+        a = '%26'
+      end
     end
 
-    it 'must not set it if the param is not an integer' do
-      enter 'set listsize 4.0', 'break 5', 'cont'
-      debug_file 'list'
-      check_output_includes "[1, 10] in #{fullpath('list')}"
+    def lines_between(min, max, mark_current = true)
+      lines = [*File.open(__FILE__)][min-1..max-1]
+      numbers = (min..max).to_a
+      output = numbers.zip(lines).map { |l| sprintf("%2d: %s", l[0], l[1]) }
+      if mark_current
+        middle = (output.size/2.0).ceil
+        output[middle] = "=> #{output[middle]}"
+      end
+      output
     end
 
-    it 'must move range up when it goes before begining of file' do
-      enter 'break 3', 'cont'
-      debug_file 'list'
-      check_output_includes "[1, 10] in #{fullpath('list')}"
-    end
+    describe 'listsize' do
+      it 'must show lines according to :listsize setting' do
+        debug_proc(@example)
+        check_output_includes "[1, 10] in #{__FILE__}"
+      end
 
-    it 'must move range down when it goes after end of file' do
-      enter 'break 10', 'cont'
-      debug_file 'list'
-      check_output_includes "[5, 14] in #{fullpath('list')}"
-    end
+      it 'must not set it if the param is not an integer' do
+        enter 'set listsize 4.0', 'list'
+        debug_proc(@example)
+        check_output_includes "[1, 10] in #{__FILE__}"
+      end
 
-    describe 'very large' do
-      temporary_change_hash Byebug.settings, :listsize, 50
+      describe 'when it goes before beginning of file' do
+        temporary_change_hash Byebug::Setting, :listsize, 12
 
-      it 'must list whole file if number of lines is smaller than listsize' do
-        enter 'break 3', 'cont'
-        debug_file 'list'
-        check_output_includes "[1, 23] in #{fullpath('list')}"
+        it 'must move range up' do
+          enter 'list'
+          debug_proc(@example)
+          check_output_includes "[1, 12] in #{__FILE__}"
+        end
       end
-   end
-  end
 
-  describe 'without arguments' do
-    it 'must show surrounding lines with the first call' do
-      enter 'break 5', 'cont'
-      debug_file 'list'
-      check_output_includes "[1, 10] in #{fullpath('list')}", '1: byebug',
-        '2: a = 2', '3: a = 3', '4: a = 4', '=>  5: a = 5', '6: a = 6',
-        '7: a = 7', '8: a = 8', '9: a = 9', '10: a = 10'
-    end
+      describe 'when it goes after the end of file' do
+        it 'must move range down' do
+          skip "Can't test this with the current setup"
+        end
+      end
+
+      describe 'very large' do
+        temporary_change_hash Byebug::Setting, :listsize, 1000
 
-    it 'must list forward after second call' do
-      enter 'break 5', 'cont', 'list'
-      debug_file 'list'
-      check_output_includes "[11, 20] in #{fullpath('list')}", '11: a = 11',
-        '12: a = 12', '13: a = 13', '14: a = 14', '15: a = 15', '16: a = 16',
-        '17: a = 17', '18: a = 18', '19: a = 19', '20: a = 20'
+        it 'must list whole file if number of lines is smaller than listsize' do
+          n_lines = %x{wc -l #{__FILE__}}.split.first.to_i
+          debug_proc(@example)
+          check_output_includes "[1, #{n_lines}] in #{__FILE__}"
+        end
+     end
     end
-  end
 
-  describe 'list backwards' do
-    temporary_change_hash Byebug.settings, :autolist, 0
+    describe 'without arguments' do
+      it 'must show surrounding lines with the first call' do
+        enter 'break 8', 'cont'
+        debug_proc(@example)
+        check_output_includes("[3, 12] in #{__FILE__}", *lines_between(3, 12))
+      end
 
-    it 'must show surrounding lines with the first call' do
-      enter 'break 15', 'cont', 'list -'
-      debug_file 'list'
-      check_output_includes "[10, 19] in #{fullpath('list')}", '10: a = 10',
-        '11: a = 11', '12: a = 12', '13: a = 13', '14: a = 14', '=> 15: a = 15',
-        '16: a = 16', '17: a = 17', '18: a = 18', '19: a = 19'
+      it 'must list forward after second call' do
+        enter 'break 8', 'cont', 'list'
+        debug_proc(@example)
+        check_output_includes("[13, 22] in #{__FILE__}",
+                              *lines_between(13, 22, false))
+      end
     end
 
-    it 'must list backward after second call' do
-      enter 'break 15', 'cont', 'list -', 'list -'
-      debug_file 'list'
-      check_output_includes "[1, 10] in #{fullpath('list')}", '1: byebug',
-        '2: a = 2', '3: a = 3', '4: a = 4', '5: a = 5', '6: a = 6', '7: a = 7',
-        '8: a = 8', '9: a = 9', '10: a = 10'
-    end
-  end
+    describe 'list backwards' do
+      temporary_change_hash Byebug::Setting, :autolist, false
 
-  describe 'list surrounding' do
-    temporary_change_hash Byebug.settings, :autolist, 0
+      it 'must show surrounding lines with the first call' do
+        enter 'break 18', 'cont', 'list -'
+        debug_proc(@example)
+        check_output_includes("[13, 22] in #{__FILE__}", *lines_between(13, 22))
+      end
 
-    it 'must show the surrounding lines with =' do
-      enter 'break 5', 'cont', 'list ='
-      debug_file 'list'
-      check_output_includes "[1, 10] in #{fullpath('list')}", '1: byebug',
-        '2: a = 2', '3: a = 3', '4: a = 4', '=>  5: a = 5', '6: a = 6',
-        '7: a = 7', '8: a = 8', '9: a = 9', '10: a = 10'
+      it 'must list backward after second call' do
+        enter 'break 18', 'cont', 'list -', 'list -'
+        debug_proc(@example)
+        check_output_includes("[3, 12] in #{__FILE__}",
+                              *lines_between(3, 12, false))
+      end
     end
-  end
 
-  describe 'specific range' do
-    it 'must show with mm-nn' do
-      enter 'list 4-6'
-      debug_file 'list'
-      check_output_includes \
-        "[4, 6] in #{fullpath('list')}", '4: a = 4', '5: a = 5', '6: a = 6'
-    end
+    describe 'list surrounding' do
+      temporary_change_hash Byebug::Setting, :autolist, false
 
-    it 'must show with mm,nn' do
-      enter 'list 4,6'
-      debug_file 'list'
-      check_output_includes \
-        "[4, 6] in #{fullpath('list')}", '4: a = 4', '5: a = 5', '6: a = 6'
+      it 'must show the surrounding lines with =' do
+        enter 'break 8', 'cont', 'list ='
+        debug_proc(@example)
+        check_output_includes("[3, 12] in #{__FILE__}", *lines_between(3, 12))
+      end
     end
 
-    it 'must show nothing if there is no such lines' do
-      enter 'list 44,44'
-      debug_file 'list'
-      check_error_includes 'Invalid line range'
-      check_output_doesnt_include "[44, 44] in #{fullpath('list')}"
-      check_output_doesnt_include(/^44  \S/)
-    end
+    describe 'specific range' do
+      it 'must show with mm-nn' do
+        enter 'list 7-9'
+        debug_proc(@example)
+        check_output_includes("[7, 9] in #{__FILE__}",
+                              *lines_between(7, 9, false))
+      end
 
-    it 'must show nothing if range is incorrect' do
-      enter 'list 5,4'
-      debug_file 'list'
-      check_output_includes "[5, 4] in #{fullpath('list')}"
-    end
-  end
+      it 'must show with mm,nn' do
+        enter 'list 7,9'
+        debug_proc(@example)
+        check_output_includes("[7, 9] in #{__FILE__}",
+                              *lines_between(7, 9, false))
+      end
+
+      it 'must show nothing if there is no such lines' do
+        enter 'list 500,505'
+        debug_proc(@example)
+        check_error_includes 'Invalid line range'
+        check_output_doesnt_include "[500, 505] in #{__FILE__}"
+        check_output_doesnt_include(/^500  \S/)
+      end
 
-  describe 'arround specific line' do
-    it 'must show surroundings with mm-' do
-      enter 'list 14-'
-      debug_file 'list'
-      check_output_includes "[9, 18] in #{fullpath('list')}", '9: a = 9',
-        '10: a = 10', '11: a = 11', '12: a = 12', '13: a = 13', '14: a = 14',
-        '15: a = 15', '16: a = 16', '17: a = 17', '18: a = 18'
+      it 'must show nothing if range is incorrect' do
+        enter 'list 5,4'
+        debug_proc(@example)
+        check_output_includes "[5, 4] in #{__FILE__}"
+      end
     end
 
-    it 'must show surroundings with mm,' do
-      enter 'list 14,'
-      debug_file 'list'
-      check_output_includes "[9, 18] in #{fullpath('list')}", '9: a = 9',
-        '10: a = 10', '11: a = 11', '12: a = 12', '13: a = 13', '14: a = 14',
-        '15: a = 15', '16: a = 16', '17: a = 17', '18: a = 18'
+    describe 'arround specific line' do
+      it 'must show surroundings with mm-' do
+        enter 'list 17-'
+        debug_proc(@example)
+        check_output_includes("[12, 21] in #{__FILE__}",
+                              *lines_between(12, 21, false))
+      end
+
+      it 'must show surroundings with mm,' do
+        enter 'list 17,'
+        debug_proc(@example)
+        check_output_includes("[12, 21] in #{__FILE__}",
+                              *lines_between(12, 21, false))
+      end
     end
-  end
 
-  describe 'reload source' do
-    after  { change_line_in_file(fullpath('list'), 4, 'a = 4')   }
+    describe 'reload source' do
+      after  { change_line_in_file(__FILE__, 7, '        a = 7')   }
 
-    describe 'when autoreload is false' do
-      temporary_change_hash Byebug.settings, :autoreload, false
+      describe 'when autoreload is false' do
+        temporary_change_hash Byebug::Setting, :autoreload, false
 
-      it 'must not reload listing with file changes' do
-        enter -> { change_line_in_file fullpath('list'), 4, 'a = 100' ;
-                   'list 4-4' }
-        debug_file 'list'
-        check_output_includes '4: a = 4'
+        it 'must not reload listing with file changes' do
+          enter -> { change_line_in_file __FILE__, 7, '        a = 100' ;
+                     'list 7-7' }
+          debug_proc(@example)
+          check_output_includes(/7:\s+a = 7/)
+        end
       end
-    end
 
-    describe 'when autoreload is true' do
-      it 'must reload listing with file changes' do
-        enter -> { change_line_in_file fullpath('list'), 4, 'a = 100' ;
-                   'list 4-4' }
-        debug_file 'list'
-        check_output_includes '4: a = 100'
+      describe 'when autoreload is true' do
+        it 'must reload listing with file changes' do
+          enter -> { change_line_in_file __FILE__, 7, '        a = 100' ;
+                     'list 7-7' }
+          debug_proc(@example)
+          check_output_includes(/7:\s+a = 100/)
+        end
       end
     end
-  end
 
-  it 'must show an error when there is no such file' do
-    enter -> { state.file = 'blabla'; 'list 4-4' }
-    debug_file 'list'
-    check_error_includes 'No sourcefile available for blabla'
-  end
+    it 'must show an error when there is no such file' do
+      enter -> { state.file = 'blabla'; 'list 7-7' }
+      debug_proc(@example)
+      check_error_includes 'No sourcefile available for blabla'
+    end
 
-  it 'must correctly print lines containing % sign' do
-    enter 'list 23'
-    debug_file 'list'
-    check_output_includes "23: a = '%23'"
+    it 'must correctly print lines containing % sign' do
+      enter 'list 26'
+      debug_proc(@example)
+      check_output_includes "26:         a = '%26'"
+    end
   end
 end