byebug 1.4.1 → 1.4.2

data/test/examples/reload.rb

@@ -1,6 +1,6 @@
 byebug
-2
-3
-4
-5
-6
+a = 2
+a = 3
+a = 4
+a = 5
+a = 6

data/test/examples/repl.rb

@@ -0,0 +1,6 @@
+byebug
+a = 2
+a = 3
+a = 4
+a = 5
+a = 6

data/test/examples/save.rb

@@ -1,3 +1,3 @@
 byebug
-2
-3
+a = 2
+a = 3

data/test/examples/set.rb

@@ -1,3 +1,3 @@
 byebug
-2
-3
+a = 2
+a = 3

data/test/examples/source.rb

@@ -1,3 +1,3 @@
 byebug
-2
-3
+a = 2
+a = 3

data/test/finish_test.rb

@@ -36,7 +36,7 @@ class TestFinish < TestDsl::TestCase
   end
 
   describe 'Post Mortem' do
-    before { Byebug::Command.settings[:autoeval] = false }
+    temporary_change_hash Byebug::Command.settings, :autoeval, false
 
     it 'must not work in post-mortem mode' do
       enter 'cont', 'finish'

data/test/help_test.rb

@@ -16,26 +16,42 @@ class TestHelp < TestDsl::TestCase
         'Type "help <command-name>" for help on a specific command',
         'Available commands:', columnize(available_commands, 50)
     end
-  end
 
-  it 'must work when shortcut used' do
-    enter 'h'
-    debug_file 'help'
-    check_output_includes \
-      'Type "help <command-name>" for help on a specific command'
+    it 'must work when shortcut used' do
+      enter 'h'
+      debug_file 'help'
+      check_output_includes \
+        'Type "help <command-name>" for help on a specific command'
+    end
   end
 
-  it 'must show an error if an undefined command is specified' do
-    enter 'help foobar'
-    debug_file 'help'
-    check_output_includes \
-      'Undefined command: "foobar".  Try "help".', interface.error_queue
+  describe 'when typed with a command'  do
+    it 'must show an error if an undefined command is specified' do
+      enter 'help foobar'
+      debug_file 'help'
+      check_output_includes \
+        'Undefined command: "foobar".  Try "help".', interface.error_queue
+    end
+
+    it "must show a command's help" do
+      enter 'help break'
+      debug_file 'help'
+      check_output_includes \
+        "b[reak] file:line [if expr]\n" \
+        "b[reak] class(.|#)method [if expr]\n\n" \
+        "Set breakpoint to some position, (optionally) if expr == true\n"
+    end
   end
 
-  it 'must show a command\'s help' do
-    enter 'help break'
-    debug_file 'help'
-    check_output_includes Byebug::BreakCommand.help(nil)
+  describe 'when typed with command and subcommand' do
+    it "must show subcommand's long help" do
+      enter 'help info breakpoints'
+      debug_file 'help'
+      check_output_includes \
+        "Status of user-settable breakpoints.\n" \
+        "Without argument, list info about all breakpoints. " \
+        "With an integer argument, list info on that breakpoint."
+    end
   end
 
   describe 'Post Mortem' do

data/test/list_test.rb

@@ -43,16 +43,16 @@ class TestList < TestDsl::TestCase
       enter 'break 5', 'cont'
       debug_file 'list'
       check_output_includes "[1, 10] in #{fullpath('list')}", '1: byebug',
-        '2: 2', '3: 3', '4: 4', '=>  5: 5', '6: 6', '7: 7', '8: 8', '9: 9',
-        '10: 10'
+        '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
 
     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: 11',
-        '12: 12', '13: 13', '14: 14', '15: 15', '16: 16', '17: 17', '18: 18',
-        '19: 19', '20: 20'
+      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'
     end
   end
 
@@ -62,17 +62,17 @@ class TestList < TestDsl::TestCase
     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: 10',
-        '11: 11', '12: 12', '13: 13', '14: 14', '=> 15: 15', '16: 16', '17: 17',
-        '18: 18', '19: 19'
+      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'
     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: 2', '3: 3', '4: 4', '5: 5', '6: 6', '7: 7', '8: 8', '9: 9',
-        '10: 10'
+        '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
 
@@ -83,8 +83,8 @@ class TestList < TestDsl::TestCase
       enter 'break 5', 'cont', 'list ='
       debug_file 'list'
       check_output_includes "[1, 10] in #{fullpath('list')}", '1: byebug',
-        '2: 2', '3: 3', '4: 4', '=>  5: 5', '6: 6', '7: 7', '8: 8', '9: 9',
-        '10: 10'
+        '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
 
@@ -93,14 +93,14 @@ class TestList < TestDsl::TestCase
       enter 'list 4-6'
       debug_file 'list'
       check_output_includes \
-        "[4, 6] in #{fullpath('list')}", '4: 4', '5: 5', '6: 6'
+        "[4, 6] in #{fullpath('list')}", '4: a = 4', '5: a = 5', '6: a = 6'
     end
 
     it 'must show with mm,nn' do
       enter 'list 4,6'
       debug_file 'list'
       check_output_includes \
-        "[4, 6] in #{fullpath('list')}", '4: 4', '5: 5', '6: 6'
+        "[4, 6] in #{fullpath('list')}", '4: a = 4', '5: a = 5', '6: a = 6'
     end
 
     it 'must show nothing if there is no such lines' do
@@ -122,38 +122,40 @@ class TestList < TestDsl::TestCase
     it 'must show surroundings with mm-' do
       enter 'list 14-'
       debug_file 'list'
-      check_output_includes "[9, 18] in #{fullpath('list')}", '9: 9', '10: 10',
-        '11: 11', '12: 12', '13: 13', '14: 14', '15: 15', '16: 16', '17: 17',
-        '18: 18'
+      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'
     end
 
     it 'must show surroundings with mm,' do
       enter 'list 14,'
       debug_file 'list'
-      check_output_includes "[9, 18] in #{fullpath('list')}", '9: 9', '10: 10',
-        '11: 11', '12: 12', '13: 13', '14: 14', '15: 15', '16: 16', '17: 17',
-        '18: 18'
+      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'
     end
   end
 
   describe 'reload source' do
-    after  { change_line_in_file(fullpath('list'), 4, '4')   }
+    after  { change_line_in_file(fullpath('list'), 4, 'a = 4')   }
 
     describe 'when autoreload is false' do
       temporary_change_hash Byebug::Command.settings, :autoreload, false
 
       it 'must not reload listing with file changes' do
-        enter -> { change_line_in_file fullpath('list'), 4, '100' ; 'list 4-4' }
+        enter -> { change_line_in_file fullpath('list'), 4, 'a = 100' ;
+                   'list 4-4' }
         debug_file 'list'
-        check_output_includes '4: 4'
+        check_output_includes '4: a = 4'
       end
     end
 
     describe 'when autoreload is true' do
       it 'must reload listing with file changes' do
-        enter -> { change_line_in_file fullpath('list'), 4, '100' ; 'list 4-4' }
+        enter -> { change_line_in_file fullpath('list'), 4, 'a = 100' ;
+                   'list 4-4' }
         debug_file 'list'
-        check_output_includes '4: 100'
+        check_output_includes '4: a = 100'
       end
     end
   end

data/test/reload_test.rb

@@ -21,14 +21,14 @@ class TestReload < TestDsl::TestCase
   end
 
   describe 'reloading' do
-    after { change_line_in_file(fullpath('reload'), 4, '4') }
+    after { change_line_in_file(fullpath('reload'), 4, 'a = 4') }
     it 'must reload the code' do
       enter 'break 3', 'cont', 'l 4-4', -> do
-        change_line_in_file(fullpath('reload'), 4, '100')
+        change_line_in_file(fullpath('reload'), 4, 'a = 100')
         'reload'
       end, 'l 4-4'
       debug_file 'reload'
-      check_output_includes '4: 100'
+      check_output_includes '4: a = 100'
     end
   end
 

data/test/repl_test.rb

@@ -13,26 +13,26 @@ class TestRepl < TestDsl::TestCase
     it 'must support next command' do
       irb.stubs(:eval_input).throws(:IRB_EXIT, :next)
       enter 'irb'
-      debug_file('irb') { state.line.must_equal 3 }
+      debug_file('repl') { state.line.must_equal 3 }
     end
 
     it 'must support step command' do
       irb.stubs(:eval_input).throws(:IRB_EXIT, :step)
       enter 'irb'
-      debug_file('irb') { state.line.must_equal 3 }
+      debug_file('repl') { state.line.must_equal 3 }
     end
 
     it 'must support cont command' do
       irb.stubs(:eval_input).throws(:IRB_EXIT, :cont)
       enter 'break 4', 'irb'
-      debug_file('irb') { state.line.must_equal 4 }
+      debug_file('repl') { state.line.must_equal 4 }
     end
 
     describe 'autoirb' do
       it 'must call irb automatically after breakpoint' do
         irb.expects(:eval_input)
         enter 'set autoirb', 'break 4', 'cont', 'set noautoirb'
-        debug_file 'irb'
+        debug_file 'repl'
       end
     end
 
@@ -43,7 +43,7 @@ class TestRepl < TestDsl::TestCase
         byebug_state = nil
         irb.stubs(:eval_input).calls { byebug_state = $byebug_state }
         enter 'irb -d'
-        debug_file 'irb'
+        debug_file 'repl'
         byebug_state.must_be_kind_of Byebug::CommandProcessor::State
       end
 
@@ -51,7 +51,7 @@ class TestRepl < TestDsl::TestCase
         byebug_state = nil
         irb.stubs(:eval_input).calls { byebug_state = $byebug_state }
         enter 'irb'
-        debug_file 'irb'
+        debug_file 'repl'
         byebug_state.must_be_nil
       end
     end
@@ -91,13 +91,13 @@ class TestRepl < TestDsl::TestCase
 
       it 'must set $byebug_state if irb is in the debug mode' do
         enter 'pry -d'
-        debug_file 'irb'
+        debug_file 'repl'
         $byebug_state.must_be_kind_of Byebug::CommandProcessor::State
       end
 
       it 'must not set $byebug_state if irb is not in the debug mode' do
         enter 'pry'
-        debug_file 'pry'
+        debug_file 'repl'
         $byebug_state.must_be_nil
       end
     end

data/test/set_test.rb

@@ -71,7 +71,7 @@ class TestSet < TestDsl::TestCase
   describe 'testing' do
     describe '$byebug_state' do
       describe 'when setting "testing" to on' do
-        temporary_change_hash Byebug::Command.settings, :testing, 0
+        temporary_change_hash Byebug::Command.settings, :testing, false
 
         it 'must get set' do
           enter 'set testing', 'break 3', 'cont'
@@ -81,7 +81,7 @@ class TestSet < TestDsl::TestCase
       end
 
       describe 'when setting "testing" to off' do
-        temporary_change_hash Byebug::Command.settings, :testing, 1
+        temporary_change_hash Byebug::Command.settings, :testing, true
 
         it 'must get unset' do
           enter 'set notesting', 'break 3', 'cont'
@@ -89,16 +89,6 @@ class TestSet < TestDsl::TestCase
         end
       end
     end
-
-    describe 'basename' do
-      temporary_change_hash Byebug::Command.settings, :basename, false
-
-      it 'must get set if "testing" is on' do
-        enter 'set testing'
-        debug_file('set')
-        Byebug::Command.settings[:basename].must_equal true
-      end
-    end
   end
 
   describe 'history' do

data/test/support/test_dsl.rb

@@ -1,55 +1,42 @@
 module TestDsl
 
-  module ClassUtils
-
-    def temporary_change_hash hash, key, value
-      mod = Module.new do
-        extend Minitest::Spec::DSL
-
-        before do
-          @old_hashes ||= {}
-          @old_hashes.merge!({ hash => { key => hash[key] } }) do |k, v1, v2|
-            v1.merge(v2)
-          end
-          hash[key] = value
-        end
+  class TestBase < MiniTest::Spec
 
-        after do
-          hash[key] = @old_hashes[hash][key]
+    def self.temporary_change_hash hash, key, value
+      before do
+        @old_hashes ||= {}
+        @old_hashes.merge!({ hash => { key => hash[key] } }) do |k, v1, v2|
+          v1.merge(v2)
         end
+        hash[key] = value
       end
 
-      include mod
+      after do
+        hash[key] = @old_hashes[hash][key]
+      end
     end
 
-    def temporary_change_const klass, const, value
-      mod = Module.new do
-        extend Minitest::Spec::DSL
-
-        before do
-          @old_consts ||= {}
-          old_value = klass.const_defined?(const) ?
-                      klass.const_get(const) : :__undefined__
-          @old_consts.merge!({ klass => { const => old_value } }) do |k, v1, v2|
-            v1.merge(v2)
-          end
-          klass.send :remove_const, const if klass.const_defined?(const)
-          klass.const_set const, value unless value == :__undefined__
-        end
-
-        after do
-          klass.send :remove_const, const if klass.const_defined?(const)
-          klass.const_set const, @old_consts[klass][const] unless
-            @old_consts[klass][const] == :__undefined__
+    def self.temporary_change_const klass, const, value
+      before do
+        @old_consts ||= {}
+        old_value = klass.const_defined?(const) ?
+                    klass.const_get(const) : :__undefined__
+        @old_consts.merge!({ klass => { const => old_value } }) do |k, v1, v2|
+          v1.merge(v2)
         end
+        klass.send :remove_const, const if klass.const_defined?(const)
+        klass.const_set const, value unless value == :__undefined__
       end
 
-      include mod
+      after do
+        klass.send :remove_const, const if klass.const_defined?(const)
+        klass.const_set const, @old_consts[klass][const] unless
+          @old_consts[klass][const] == :__undefined__
+      end
     end
   end
 
-  class TestCase < Minitest::Spec
-    extend TestDsl::ClassUtils
+  class TestCase < TestBase
     include TestDsl
 
     def setup
@@ -183,5 +170,4 @@ module TestDsl
     new_content = old_content.split("\n").tap { |c| c[line - 1] = new_line_content }.join("\n")
     File.open(file, 'w') { |f| f.write(new_content) }
   end
-
 end

data/test/variables_test.rb

@@ -2,8 +2,6 @@ require_relative 'test_helper'
 
 class TestVariables < TestDsl::TestCase
 
-  temporary_change_hash Byebug::Command.settings, :width, 40
-
   describe 'class variables' do
     it 'must show variables' do
       enter 'break 19', 'cont', 'var class'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: byebug
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - David Rodríguez
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-15 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: columnize
@@ -82,20 +82,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.14.0
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 5.0.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 5.0.3
 description: |-
   Byebug is a Ruby 2.0 debugger. It's implemented using the
       Ruby 2.0 TracePoint C API for execution control and the Debug Inspector C
@@ -189,7 +175,6 @@ files:
 - test/examples/help.rb
 - test/examples/info.rb
 - test/examples/info2.rb
-- test/examples/irb.rb
 - test/examples/jump.rb
 - test/examples/kill.rb
 - test/examples/list.rb
@@ -197,6 +182,7 @@ files:
 - test/examples/post_mortem.rb
 - test/examples/quit.rb
 - test/examples/reload.rb
+- test/examples/repl.rb
 - test/examples/restart.rb
 - test/examples/save.rb
 - test/examples/set.rb
@@ -279,7 +265,6 @@ test_files:
 - test/examples/help.rb
 - test/examples/info.rb
 - test/examples/info2.rb
-- test/examples/irb.rb
 - test/examples/jump.rb
 - test/examples/kill.rb
 - test/examples/list.rb
@@ -287,6 +272,7 @@ test_files:
 - test/examples/post_mortem.rb
 - test/examples/quit.rb
 - test/examples/reload.rb
+- test/examples/repl.rb
 - test/examples/restart.rb
 - test/examples/save.rb
 - test/examples/set.rb