byebug 2.3.1 → 2.4.0

data/lib/byebug/interfaces/script_interface.rb

@@ -0,0 +1,45 @@
+module Byebug
+  class ScriptInterface < Interface
+    attr_accessor :command_queue, :history_length, :history_save, :histfile
+    attr_accessor :restart_file
+
+    def initialize(file, out, verbose=false)
+      super()
+      @command_queue = []
+      @file = file.respond_to?(:gets) ? file : open(file)
+      @out = out
+      @verbose = verbose
+      @history_save = false
+      @history_length = 256
+      @histfile = ''
+    end
+
+    def finalize
+    end
+
+    def read_command(prompt)
+      while result = @file.gets
+        puts "# #{result}" if @verbose
+        next if result =~ /^\s*#/
+        next if result.strip.empty?
+        return result.chomp
+      end
+    end
+
+    def readline_support?
+      false
+    end
+
+    def confirm(prompt)
+      'y'
+    end
+
+    def print(*args)
+      @out.printf(*args)
+    end
+
+    def close
+      @file.close
+    end
+  end
+end

data/lib/byebug/processor.rb

@@ -58,7 +58,7 @@ module Byebug
 
     def self.protect(mname)
       alias_method "__#{mname}", mname
-      module_eval %{
+      module_eval <<-END, __FILE__, __LINE__+1
         def #{mname}(*args)
           @mutex.synchronize do
             return unless @interface
@@ -72,7 +72,7 @@ module Byebug
           print "INTERNAL ERROR!!! #\{$!\}\n" rescue nil
           print $!.backtrace.map{|l| "\t#\{l\}"}.join("\n") rescue nil
         end
-      }
+      END
     end
 
     def at_breakpoint(context, breakpoint)
@@ -87,7 +87,6 @@ module Byebug
       file = CommandProcessor.canonic_file(context.frame_file(0))
       line = context.frame_line(0)
       print "Catchpoint at %s:%d: `%s' (%s)\n", file, line, excpt, excpt.class
-      print_backtrace
     end
     protect :at_catchpoint
 
@@ -129,24 +128,22 @@ module Byebug
       # @return List of commands acceptable to run bound to the current state
       #
       def always_run(context, file, line, run_level)
-        event_cmds = Command.commands.select{|cmd| cmd.event }
+        cmds = Command.commands
 
         # Remove some commands in post-mortem
-        event_cmds = event_cmds.find_all do |cmd|
-          cmd.allow_in_post_mortem
-        end if context.dead?
+        cmds = cmds.find_all { |cmd| cmd.allow_in_post_mortem } if context.dead?
 
-        state = State.new(event_cmds, context, @display, file, @interface, line)
+        state = State.new(cmds, context, @display, file, @interface, line)
 
         # Change default when in irb or code included in command line
         Command.settings[:autolist] = 0 if ['(irb)', '-e'].include?(file)
 
         # Bind commands to the current state.
-        commands = event_cmds.map{|cmd| cmd.new(state)}
+        commands = cmds.map { |cmd| cmd.new(state) }
+
+        commands.select { |cmd| cmd.class.always_run >= run_level }
+                .each { |cmd| cmd.execute }
 
-        commands.select do |cmd|
-          cmd.class.always_run >= run_level
-        end.each {|cmd| cmd.execute}
         return state, commands
       end
 
@@ -175,7 +172,12 @@ module Byebug
       #
       def process_commands(context, file, line)
         state, commands = always_run(context, file, line, 1)
-        $state = Command.settings[:testing] ? state : nil
+
+        if Command.settings[:testing]
+          Thread.current.thread_variable_set('state', state)
+        else
+          Thread.current.thread_variable_set('state', nil)
+        end
 
         preloop(commands, context)
         print state.location if Command.settings[:autolist] == 0

data/lib/byebug/version.rb

@@ -1,3 +1,3 @@
 module Byebug
-  VERSION = '2.3.1'
+  VERSION = '2.4.0'
 end

data/test/breakpoints_test.rb

@@ -1,5 +1,3 @@
-require_relative 'test_helper'
-
 class BreakpointExample
   def self.a(num)
     4
@@ -93,12 +91,12 @@ class TestBreakpoints < TestDsl::TestCase
   describe 'stopping at breakpoint' do
     it 'must stop at the correct line' do
       enter 'break 5', 'cont'
-      debug_file('breakpoint') { $state.line.must_equal 5 }
+      debug_file('breakpoint') { state.line.must_equal 5 }
     end
 
     it 'must stop at the correct file' do
       enter 'break 5', 'cont'
-      debug_file('breakpoint') { $state.file.must_equal @tst_file }
+      debug_file('breakpoint') { state.file.must_equal @tst_file }
     end
 
     describe 'show a message' do
@@ -151,14 +149,14 @@ class TestBreakpoints < TestDsl::TestCase
 
   describe 'set breakpoint in a file' do
     describe 'successfully' do
-      before { enter "break #{__FILE__}:5", 'cont' }
+      before { enter "break #{__FILE__}:3", 'cont' }
 
       it 'must stop at the correct line' do
-        debug_file('breakpoint') { $state.line.must_equal 5 }
+        debug_file('breakpoint') { state.line.must_equal 3 }
       end
 
       it 'must stop at the correct file' do
-        debug_file('breakpoint') { $state.file.must_equal __FILE__ }
+        debug_file('breakpoint') { state.file.must_equal __FILE__ }
       end
     end
 
@@ -184,11 +182,11 @@ class TestBreakpoints < TestDsl::TestCase
       before { enter 'break BreakpointExample#b', 'cont' }
 
       it 'must stop at the correct line' do
-        debug_file('breakpoint') { $state.line.must_equal 7 }
+        debug_file('breakpoint') { state.line.must_equal 5 }
       end
 
       it 'must stop at the correct file' do
-        debug_file('breakpoint') { $state.file.must_equal __FILE__ }
+        debug_file('breakpoint') { state.file.must_equal __FILE__ }
       end
     end
 
@@ -196,11 +194,11 @@ class TestBreakpoints < TestDsl::TestCase
       before { enter 'break BreakpointExample.a', 'cont' }
 
       it 'must stop at the correct line' do
-        debug_file('breakpoint') { $state.line.must_equal 4 }
+        debug_file('breakpoint') { state.line.must_equal 2 }
       end
 
       it 'must stop at the correct file' do
-        debug_file('breakpoint') { $state.file.must_equal __FILE__ }
+        debug_file('breakpoint') { state.file.must_equal __FILE__ }
       end
     end
 
@@ -240,7 +238,7 @@ class TestBreakpoints < TestDsl::TestCase
 
         it 'must not stop on the disabled breakpoint' do
           enter 'cont'
-          debug_file('breakpoint') { $state.line.must_equal 6 }
+          debug_file('breakpoint') { state.line.must_equal 6 }
         end
       end
 
@@ -259,7 +257,7 @@ class TestBreakpoints < TestDsl::TestCase
             enter 'cont'
             debug_file('breakpoint')
             # Obscure assert to check for program termination
-            $state.proceed.must_equal true
+            state.proceed.must_equal true
           end
         end
 
@@ -313,7 +311,7 @@ class TestBreakpoints < TestDsl::TestCase
 
         it 'must stop on the enabled breakpoint' do
           enter 'cont'
-          debug_file('breakpoint') { $state.line.must_equal 5 }
+          debug_file('breakpoint') { state.line.must_equal 5 }
         end
       end
 
@@ -330,12 +328,12 @@ class TestBreakpoints < TestDsl::TestCase
 
           it 'must stop on the first breakpoint' do
             enter 'cont'
-            debug_file('breakpoint') { $state.line.must_equal 5 }
+            debug_file('breakpoint') { state.line.must_equal 5 }
           end
 
           it 'must stop on the last breakpoint' do
             enter 'cont', 'cont'
-            debug_file('breakpoint') { $state.line.must_equal 6 }
+            debug_file('breakpoint') { state.line.must_equal 6 }
           end
         end
 
@@ -351,7 +349,7 @@ class TestBreakpoints < TestDsl::TestCase
 
           it 'must stop only on the enabled breakpoint' do
             enter 'cont'
-            debug_file('breakpoint') { $state.line.must_equal 6 }
+            debug_file('breakpoint') { state.line.must_equal 6 }
           end
         end
       end
@@ -377,24 +375,24 @@ class TestBreakpoints < TestDsl::TestCase
 
     it 'must not stop on the disabled breakpoint' do
       enter 'cont'
-      debug_file('breakpoint') { $state.line.must_equal 6 }
+      debug_file('breakpoint') { state.line.must_equal 6 }
     end
   end
 
   describe 'Conditional breakpoints' do
     it 'must stop if the condition is true' do
       enter 'break 5 if z == 5', 'break 6', 'cont'
-      debug_file('breakpoint') { $state.line.must_equal 5 }
+      debug_file('breakpoint') { state.line.must_equal 5 }
     end
 
     it 'must skip if the condition is false' do
       enter 'break 5 if z == 3', 'break 6', 'cont'
-      debug_file('breakpoint') { $state.line.must_equal 6 }
+      debug_file('breakpoint') { state.line.must_equal 6 }
     end
 
     it 'must show an error when conditional syntax is wrong' do
       enter 'break 5 ifa z == 3', 'break 6', 'cont'
-      debug_file('breakpoint') { $state.line.must_equal 6 }
+      debug_file('breakpoint') { state.line.must_equal 6 }
       check_error_includes \
         'Expecting "if" in breakpoint condition; got: ifa z == 3.'
     end
@@ -419,13 +417,13 @@ class TestBreakpoints < TestDsl::TestCase
 
     it 'must show an error if no file or line is specified' do
       enter 'break ifa z == 3', 'break 6', 'cont'
-      debug_file('breakpoint') { $state.line.must_equal 6 }
+      debug_file('breakpoint') { state.line.must_equal 6 }
       check_error_includes 'Invalid breakpoint location: ifa z == 3.'
     end
 
     it 'must show an error if expression syntax is invalid' do
       enter 'break if z -=) 3', 'break 6', 'cont'
-      debug_file('breakpoint') { $state.line.must_equal 6 }
+      debug_file('breakpoint') { state.line.must_equal 6 }
       check_error_includes \
         'Expression "z -=) 3" syntactically incorrect; breakpoint disabled.'
     end
@@ -434,13 +432,13 @@ class TestBreakpoints < TestDsl::TestCase
   describe 'Stopping through `byebug` keyword' do
     describe 'when not the last instruction of a method' do
       it 'must stop in the next line' do
-        debug_file('breakpoint') { $state.line.must_equal 4 }
+        debug_file('breakpoint') { state.line.must_equal 4 }
       end
     end
 
     describe 'when last instruction of a method' do
       it 'must stop right before returning from the frame' do
-        debug_file('breakpoint_deep') { $state.line.must_equal 27 }
+        debug_file('breakpoint_deep') { state.line.must_equal 25 }
       end
     end
   end

data/test/conditions_test.rb

@@ -1,5 +1,3 @@
-require_relative 'test_helper'
-
 class TestConditions < TestDsl::TestCase
 
   describe 'setting condition' do
@@ -14,11 +12,11 @@ class TestConditions < TestDsl::TestCase
       end
 
       it 'must stop at the breakpoint if condition is true' do
-        debug_file('conditions') { $state.line.must_equal 3 }
+        debug_file('conditions') { state.line.must_equal 3 }
       end
 
       it 'must work with full command name too' do
-        debug_file('conditions') { $state.line.must_equal 3 }
+        debug_file('conditions') { state.line.must_equal 3 }
       end
     end
 
@@ -27,7 +25,7 @@ class TestConditions < TestDsl::TestCase
 
       it 'must not stop at the breakpoint if condition is false' do
         enter ->{ "cond #{Byebug.breakpoints.first.id} b == 3" }, 'cont'
-        debug_file('conditions') { $state.line.must_equal 4 }
+        debug_file('conditions') { state.line.must_equal 4 }
       end
 
       it 'must assign expression to breakpoint in spite of incorrect syntax' do
@@ -38,7 +36,7 @@ class TestConditions < TestDsl::TestCase
 
       it 'must ignore the condition if when incorrect syntax' do
         enter ->{ "cond #{Byebug.breakpoints.first.id} b ==" },  'cont'
-        debug_file('conditions') { $state.line.must_equal 4 }
+        debug_file('conditions') { state.line.must_equal 4 }
       end
     end
   end
@@ -52,7 +50,7 @@ class TestConditions < TestDsl::TestCase
     end
 
     it 'must unconditionally stop on the breakpoint' do
-      debug_file('conditions') { $state.line.must_equal 3 }
+      debug_file('conditions') { state.line.must_equal 3 }
     end
   end
 
@@ -65,7 +63,7 @@ class TestConditions < TestDsl::TestCase
 
     it 'must not set breakpoint condition if breakpoint id is incorrect' do
       enter 'break 3', 'cond 8 b == 3', 'cont'
-      debug_file('conditions') { $state.line.must_equal 3 }
+      debug_file('conditions') { state.line.must_equal 3 }
     end
   end
 end

data/test/continue_test.rb

@@ -1,5 +1,3 @@
-require_relative 'test_helper'
-
 class ContinueExample
   def self.a(num)
     num + 4
@@ -11,24 +9,24 @@ class TestContinue < TestDsl::TestCase
   describe "successful" do
     it "must continue up to breakpoint if no line specified" do
       enter 'break 4', 'continue'
-      debug_file('continue') { $state.line.must_equal 4 }
+      debug_file('continue') { state.line.must_equal 4 }
     end
 
     it "must work in abbreviated mode too" do
       enter 'break 4', 'cont'
-      debug_file('continue') { $state.line.must_equal 4 }
+      debug_file('continue') { state.line.must_equal 4 }
     end
 
     it "must continue up to specified line" do
       enter 'cont 4'
-      debug_file('continue') { $state.line.must_equal 4 }
+      debug_file('continue') { state.line.must_equal 4 }
     end
   end
 
   describe "unsuccessful" do
     it "must ignore the command if specified line is not valid" do
       enter 'cont 123'
-      debug_file('continue') { $state.line.must_equal 3 }
+      debug_file('continue') { state.line.must_equal 3 }
     end
 
     it "must show error if specified line is not valid" do

data/test/debugger_alias_test.rb

@@ -0,0 +1,5 @@
+class TestDebuggerAlias < MiniTest::Spec
+  it 'aliases "debugger" to "byebug"' do
+    Kernel.method(:debugger).must_equal(Kernel.method(:byebug))
+  end
+end

data/test/display_test.rb

@@ -1,5 +1,3 @@
-require_relative 'test_helper'
-
 class TestDisplay < TestDsl::TestCase
 
   it 'must show expressions' do
@@ -16,7 +14,7 @@ class TestDisplay < TestDsl::TestCase
 
   it 'must save displayed expressions' do
     enter 'display d + 1'
-    debug_file('display') { $state.display.must_equal [[true, 'd + 1']] }
+    debug_file('display') { state.display.must_equal [[true, 'd + 1']] }
   end
 
   it 'displays all expressions available' do
@@ -46,8 +44,8 @@ class TestDisplay < TestDsl::TestCase
         end
 
         it 'must set all expressions saved to "false"' do
-          debug_file('display') {
-           $state.display.must_equal [[false, 'abc'], [false, 'd']] }
+          debug_file('display') { state.display.must_equal [[false, 'abc'],
+                                                            [false, 'd']] }
         end
 
         it 'must not show any output' do
@@ -60,8 +58,8 @@ class TestDisplay < TestDsl::TestCase
         let(:confirm_response) { 'n' }
 
         it 'must set all expressions saved to "false"' do
-          debug_file('display') {
-           $state.display.must_equal [[true, 'abc'], [true, 'd']] }
+          debug_file('display') { state.display.must_equal [[true, 'abc'],
+                                                            [true, 'd']] }
         end
 
         it 'must not show any output' do
@@ -80,8 +78,8 @@ class TestDisplay < TestDsl::TestCase
       end
 
       it 'must set inactive positions' do
-        debug_file('display') {
-         $state.display.must_equal [[nil, 'abc'], [true, 'd']] }
+        debug_file('display') { state.display.must_equal [[nil, 'abc'],
+                                                          [true, 'd']] }
       end
 
       it 'must display only the active position' do
@@ -99,7 +97,7 @@ class TestDisplay < TestDsl::TestCase
   describe 'disable' do
     it 'must disable a position' do
       enter 'display d', 'disable display 1'
-      debug_file('display') { $state.display.must_equal [[false, 'd']] }
+      debug_file('display') { state.display.must_equal [[false, 'd']] }
     end
 
     it 'must show an error if no displays are set' do
@@ -120,7 +118,7 @@ class TestDisplay < TestDsl::TestCase
   describe 'enable' do
     it 'must enable a position' do
       enter 'display d', 'disable display 1', 'enable display 1'
-      debug_file('display') { $state.display.must_equal [[true, 'd']] }
+      debug_file('display') { state.display.must_equal [[true, 'd']] }
     end
   end
 end