byebug 2.1.1 → 2.2.0

data/test/support/test_dsl.rb

@@ -49,6 +49,14 @@ module TestDsl
     (Pathname.new(__FILE__) + "../../examples/#{filename}.rb").cleanpath.to_s
   end
 
+  #
+  # Shorten a fullpath
+  #
+  def shortpath(fullpath)
+    separator = File::ALT_SEPARATOR || File::SEPARATOR
+    "...#{separator}" + fullpath.split(separator)[-3..-1].join(separator)
+  end
+
   #
   # Adds commands to the input queue, so they will be later retrieved by
   # Processor, i.e., it emulates user's input.
@@ -150,7 +158,9 @@ module TestDsl
 
   def change_line_in_file(file, line, new_line_content)
     old_content = File.read(file)
-    new_content = old_content.split("\n").tap { |c| c[line - 1] = new_line_content }.join("\n")
+    new_content = old_content.split("\n")
+                             .tap { |c| c[line - 1] = new_line_content }
+                             .join("\n") + "\n"
     File.open(file, 'w') { |f| f.write(new_content) }
   end
 

data/test/test_helper.rb

@@ -6,3 +6,12 @@ require 'byebug'
 Dir.glob(File.expand_path("../support/*.rb", __FILE__)).each { |f| require f }
 
 Byebug.settings[:testing] = true
+
+class DummyObject
+  def initialize(*args)
+  end
+end
+
+# Init globals to avoid warnings
+$bla = nil
+$binding = binding # this is from irb...

data/test/thread_test.rb

@@ -1,56 +1,86 @@
 require_relative 'test_helper'
 
+class ThreadExample
+  def initialize
+    Thread.main[:should_break] = false
+  end
+
+  def launch
+    @t1 = Thread.new do
+      while true
+        break if Thread.main[:should_break]
+        sleep 0.02
+      end
+    end
+
+    @t2 = Thread.new do
+      while true
+        sleep 0.02
+      end
+    end
+
+    @t1.join
+    Thread.main[:should_break]
+  end
+
+  def kill
+    @t2.kill
+  end
+end
+
 class TestThread < TestDsl::TestCase
   let(:release) { 'eval Thread.main[:should_break] = true' }
 
   describe 'list' do
     it 'must show current thread by "plus" sign' do
       thnum = nil
-      enter 'break 8', 'cont', 'thread list', release
+      enter "break #{__FILE__}:9", 'cont', 'thread list', release
       debug_file('thread') { thnum = Byebug.contexts.first.thnum }
-      check_output_includes /\+ #{thnum} #<Thread:\S+ run>\t#{fullpath('thread')}:8/
+      check_output_includes(/\+ #{thnum} #<Thread:\S+ run>\t#{__FILE__}:9/)
     end
 
     it 'must work with shortcut' do
       thnum = nil
-      enter 'break 8', 'cont', 'th list', release
+      enter "break #{__FILE__}:9", 'cont', 'th list', release
       debug_file('thread') { thnum = Byebug.contexts.first.thnum }
-      check_output_includes /\+ #{thnum} #<Thread:\S+ run>\t#{fullpath('thread')}:8/
+      check_output_includes(/\+ #{thnum} #<Thread:\S+ run>\t#{__FILE__}:9/)
     end
 
     it 'must show 3 available threads' do
-      enter 'break 21', 'cont', 'thread list', release
+      enter "break #{__FILE__}:22", 'cont', 'thread list', release
       debug_file 'thread'
-      check_output_includes /(\+)?\d+ #<Thread:\S+ (sleep|run)>/,
+      check_output_includes(/(\+)?\d+ #<Thread:\S+ (sleep|run)>/,
                             /(\+)?\d+ #<Thread:\S+ (sleep|run)>/,
-                            /(\+)?\d+ #<Thread:\S+ (sleep|run)>/
+                            /(\+)?\d+ #<Thread:\S+ (sleep|run)>/)
     end
   end
 
   describe 'stop' do
     it 'must mark thread as suspended' do
       thnum = nil
-      enter 'c 21', ->{ "thread stop #{Byebug.contexts.last.thnum}" }, release
+      enter "break #{__FILE__}:22", 'cont',
+            ->{ "thread stop #{Byebug.contexts.last.thnum}" }, release
       debug_file('thread') { thnum = Byebug.contexts.last.thnum }
-      check_output_includes /\$ #{thnum} #<Thread:/
+      check_output_includes(/\$ #{thnum} #<Thread:/)
     end
 
     it 'must actually suspend thread execution' do
-      enter 'c 21', 'trace on',
+      enter "break #{__FILE__}:22", 'cont', 'trace on',
             ->{ "thread stop #{Byebug.contexts.last.thnum}" }, release
       debug_file('thread')
-      check_output_doesnt_include /Tracing: #{fullpath('thread')}:16/,
-                                  /Tracing: #{fullpath('thread')}:17/
+      check_output_doesnt_include(/Tracing: #{__FILE__}:17/,
+                                  /Tracing: #{__FILE__}:18/)
     end
 
     it 'must show error message if thread number is not specified' do
-      enter 'break 8', 'cont', 'thread stop', release
+      enter "break #{__FILE__}:9", 'cont', 'thread stop', release
       debug_file 'thread'
       check_error_includes '"thread stop" needs a thread number'
     end
 
     it 'must show error message when trying to stop current thread' do
-      enter 'cont 8', ->{"thread stop #{Byebug.contexts.first.thnum}"}, release
+      enter "break #{__FILE__}:9", 'cont',
+            ->{"thread stop #{Byebug.contexts.first.thnum}"}, release
       debug_file 'thread'
       check_error_includes "It's the current thread"
     end
@@ -59,27 +89,29 @@ class TestThread < TestDsl::TestCase
   describe 'resume' do
     it 'must mark remove thread from the suspended state' do
       thnum = nil
-      enter 'cont 21',
+      enter "break #{__FILE__}:22", 'cont',
             -> { thnum = Byebug.contexts.last.thnum ; "thread stop #{thnum}" },
             -> { "thread resume #{thnum}" }, release
       debug_file('thread') { Byebug.contexts.last.suspended?.must_equal false }
-      check_output_includes /\$ #{thnum} #<Thread:/, /#{thnum} #<Thread:/
+      check_output_includes(/\$ #{thnum} #<Thread:/, /#{thnum} #<Thread:/)
     end
 
     it 'must show error message if thread number is not specified' do
-      enter 'break 8', 'cont', 'thread resume', release
+      enter "break #{__FILE__}:9", 'cont', 'thread resume', release
       debug_file 'thread'
       check_error_includes '"thread resume" needs a thread number'
     end
 
     it 'must show error message when trying to resume current thread' do
-      enter 'c 8', ->{ "thread resume #{Byebug.contexts.first.thnum}" }, release
+      enter "break #{__FILE__}:9", 'cont',
+            ->{ "thread resume #{Byebug.contexts.first.thnum}" }, release
       debug_file 'thread'
       check_error_includes "It's the current thread"
     end
 
     it 'must show error message if it is not stopped' do
-      enter 'c 21', ->{ "thread resume #{Byebug.contexts.last.thnum}" }, release
+      enter "break #{__FILE__}:22", 'cont',
+            ->{ "thread resume #{Byebug.contexts.last.thnum}" }, release
       debug_file 'thread'
       check_error_includes 'Already running'
     end
@@ -87,18 +119,20 @@ class TestThread < TestDsl::TestCase
 
   describe 'switch' do
     it 'must switch to another thread' do
-      enter 'c 21', ->{ "thread switch #{Byebug.contexts.last.thnum}" }, release
-      debug_file('thread') { $state.line.must_equal 16 }
+      enter "break #{__FILE__}:22", 'cont',
+            ->{ "thread switch #{Byebug.contexts.last.thnum}" }, release
+      debug_file('thread') { $state.line.must_equal 17 }
     end
 
     it 'must show error message if thread number is not specified' do
-      enter 'break 8', 'cont', 'thread switch', release
+      enter "break #{__FILE__}:9", 'cont', 'thread switch', release
       debug_file 'thread'
       check_error_includes '"thread switch" needs a thread number'
     end
 
     it 'must show error message when trying to switch current thread' do
-      enter 'c 8', ->{ "thread switch #{Byebug.contexts.first.thnum}" }, release
+      enter "break #{__FILE__}:9", 'cont',
+            ->{ "thread switch #{Byebug.contexts.first.thnum}" }, release
       debug_file 'thread'
       check_error_includes "It's the current thread"
     end

data/test/trace_test.rb

@@ -1,7 +1,6 @@
 require_relative 'test_helper'
 
 class TestTrace < TestDsl::TestCase
-
   before do
     untrace_var(:$bla) if defined?($bla)
   end

data/test/variables_test.rb

@@ -1,16 +1,35 @@
 require_relative 'test_helper'
 
-class TestVariables < TestDsl::TestCase
+class VariablesExample
+  SOMECONST = 'foo' unless defined?(SOMECONST)
+
+  def initialize
+    @inst_a = 1
+    @inst_b = 2
+    @inst_c = "1" * 40
+    @inst_d = BasicObject.new
+    @@class_c = 3
+  end
 
+  def run
+    a = 4
+    b = [1, 2, 3].map do |i|
+      a * i
+    end
+    b
+  end
+end
+
+class TestVariables < TestDsl::TestCase
   describe 'class variables' do
     it 'must show variables' do
-      enter 'break 19', 'cont', 'var class'
+      enter "break #{__FILE__}:19", 'cont', 'var class'
       debug_file 'variables'
       check_output_includes '@@class_c = 3'
     end
 
     it 'must be able to use shortcut' do
-      enter 'break 19', 'cont', 'v cl'
+      enter "break #{__FILE__}:19", 'cont', 'v cl'
       debug_file 'variables'
       check_output_includes '@@class_c = 3'
     end
@@ -18,19 +37,19 @@ class TestVariables < TestDsl::TestCase
 
   describe 'constants' do
     it 'must show constants' do
-      enter 'break 25', 'cont', 'var const VariablesExample'
+      enter 'break 4', 'cont', 'var const VariablesExample'
       debug_file 'variables'
       check_output_includes 'SOMECONST => "foo"'
     end
 
     it 'must be able to use shortcut' do
-      enter 'break 25', 'cont', 'v co VariablesExample'
+      enter 'break 4', 'cont', 'v co VariablesExample'
       debug_file 'variables'
       check_output_includes 'SOMECONST => "foo"'
     end
 
     it 'must show error message if given object is not a class or a module' do
-      enter 'break 25', 'cont', 'var const v'
+      enter 'break 4', 'cont', 'var const v'
       debug_file 'variables'
       check_output_includes 'Should be Class/Module: v'
     end
@@ -38,39 +57,39 @@ class TestVariables < TestDsl::TestCase
 
   describe 'globals' do
     it 'must show global variables' do
-      enter 'break 25', 'cont', 'var global'
+      enter 'break 4', 'cont', 'var global'
       debug_file 'variables'
-      check_output_includes '$glob = 100'
+      check_output_includes '$VERBOSE = true'
     end
 
     it 'must be able to use shortcut' do
-      enter 'break 25', 'cont', 'v g'
+      enter 'break 4', 'cont', 'v g'
       debug_file 'variables'
-      check_output_includes '$glob = 100'
+      check_output_includes '$VERBOSE = true'
     end
   end
 
   describe 'instance variables' do
     it 'must show instance variables of the given object' do
-      enter 'break 25', 'cont', 'var instance v'
+      enter 'break 4', 'cont', 'var instance v'
       debug_file 'variables'
       check_output_includes '@inst_a = 1', '@inst_b = 2'
     end
 
     it 'must show instance variables of self' do
-      enter 'break 11', 'cont', 'var instance'
+      enter "break #{__FILE__}:11", 'cont', 'var instance'
       debug_file 'variables'
       check_output_includes '@inst_a = 1', '@inst_b = 2'
     end
 
     it 'must show instance variables' do
-      enter 'break 25', 'cont', 'var instance v'
+      enter 'break 4', 'cont', 'var instance v'
       debug_file 'variables'
       check_output_includes '@inst_a = 1', '@inst_b = 2'
     end
 
     it 'must be able to use shortcut' do
-      enter 'break 25', 'cont', 'v ins v'
+      enter 'break 4', 'cont', 'v ins v'
       debug_file 'variables'
       check_output_includes '@inst_a = 1', '@inst_b = 2'
     end
@@ -79,14 +98,14 @@ class TestVariables < TestDsl::TestCase
       temporary_change_hash Byebug.settings, :width, 20
 
       it 'must cut long variable values according it' do
-        enter 'break 25', 'cont', 'var instance v'
+        enter 'break 4', 'cont', 'var instance v'
         debug_file 'variables'
         check_output_includes '@inst_c = "1111111111111111...'
       end
     end
 
     it 'must show error if value doesn\'t have #to_s/#inspect methods' do
-      enter 'break 25', 'cont', 'var instance v'
+      enter 'break 4', 'cont', 'var instance v'
       debug_file 'variables'
       check_output_includes '@inst_d = *Error in evaluation*'
     end
@@ -94,7 +113,7 @@ class TestVariables < TestDsl::TestCase
 
   describe 'local variables' do
     it 'must show local variables' do
-      enter 'break 17', 'cont', 'var local'
+      enter "break #{__FILE__}:17", 'cont', 'var local'
       debug_file 'variables'
       check_output_includes 'a => 4', 'b => nil', 'i => 1'
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: byebug
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - David Rodriguez
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-10 00:00:00.000000000 Z
+date: 2013-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: columnize
@@ -167,7 +167,6 @@ files:
 - test/edit_test.rb
 - test/eval_test.rb
 - test/examples/breakpoint.rb
-- test/examples/breakpoint2.rb
 - test/examples/breakpoint_deep.rb
 - test/examples/conditions.rb
 - test/examples/continue.rb
@@ -180,7 +179,6 @@ files:
 - test/examples/help.rb
 - test/examples/info.rb
 - test/examples/info2.rb
-- test/examples/jump.rb
 - test/examples/kill.rb
 - test/examples/list.rb
 - test/examples/method.rb
@@ -191,7 +189,6 @@ files:
 - test/examples/restart.rb
 - test/examples/save.rb
 - test/examples/set.rb
-- test/examples/set_annotate.rb
 - test/examples/settings.rb
 - test/examples/show.rb
 - test/examples/source.rb
@@ -245,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.8
+rubygems_version: 2.1.4
 signing_key: 
 specification_version: 4
 summary: Ruby 2.0 fast debugger - base + cli
@@ -257,7 +254,6 @@ test_files:
 - test/edit_test.rb
 - test/eval_test.rb
 - test/examples/breakpoint.rb
-- test/examples/breakpoint2.rb
 - test/examples/breakpoint_deep.rb
 - test/examples/conditions.rb
 - test/examples/continue.rb
@@ -270,7 +266,6 @@ test_files:
 - test/examples/help.rb
 - test/examples/info.rb
 - test/examples/info2.rb
-- test/examples/jump.rb
 - test/examples/kill.rb
 - test/examples/list.rb
 - test/examples/method.rb
@@ -281,7 +276,6 @@ test_files:
 - test/examples/restart.rb
 - test/examples/save.rb
 - test/examples/set.rb
-- test/examples/set_annotate.rb
 - test/examples/settings.rb
 - test/examples/show.rb
 - test/examples/source.rb

data/test/examples/breakpoint2.rb

@@ -1,7 +0,0 @@
-d = 4
-c = 3
-e = 3 + 4
-f = e + 5
-
-BreakpointExample.a
-BreakpointExample.new.b

data/test/examples/jump.rb

@@ -1,14 +0,0 @@
-byebug
-
-class JumpExample
-  def a
-    a = 2
-    b = 3
-    c = 4
-    d = 5
-    e = 6
-    f = 7
-  end
-end
-
-JumpExample.new.a

data/test/examples/set_annotate.rb

@@ -1,12 +0,0 @@
-byebug
-
-class AnnotateExample
-  def a
-    @b = 3
-    @@c = 4
-    d = 5
-    e = 6
-  end
-end
-
-AnnotateExample.new.a