byebug 1.0.2 → 1.0.3

data/test/list_test.rb

@@ -1,167 +1,192 @@
 require_relative 'test_helper'
 
-describe "List Command" do
+describe 'List Command' do
   include TestDsl
 
-  describe "List Command Setup" do
+  describe 'List Command (Setup)' do
+
     before { LineCache.clear_file_cache }
-    after  { LineCache.clear_file_cache }
 
-    describe "listsize" do
-      before { Byebug::Command.settings[:listsize] = 3 }
+    describe 'listsize' do
+      before do
+        Byebug::Command.settings[:listsize] = 3
+        Byebug::Command.settings[:autolist] = 0
+      end
 
-      it "must show lines according to :listsize setting" do
+      it 'must show lines according to :listsize setting' do
         enter 'set listsize 4', 'break 5', 'cont', 'list'
         debug_file 'list'
         check_output_includes "[3, 6] in #{fullpath('list')}"
       end
 
-      it "must not set it if the param is not an integer" do
+      it 'must not set it if the param is not an integer' do
         enter 'set listsize 4.0', 'break 5', 'cont', 'list'
         debug_file 'list'
         check_output_includes "[4, 6] in #{fullpath('list')}"
       end
+
+      it 'must move range up when it goes before begining of file' do
+        enter 'set listsize 10', 'break 3', 'cont', 'list'
+        debug_file 'list'
+        check_output_includes "[1, 10] in #{fullpath('list')}"
+      end
+
+      it 'must move range down when it goes after end of file' do
+        enter 'set listsize 10', 'break 10', 'cont', 'list'
+        debug_file 'list'
+        check_output_includes "[3, 12] in #{fullpath('list')}"
+      end
+
+      it 'must list whole file if number of lines is smaller than listsize' do
+        enter 'set listsize 13', 'list'
+        debug_file 'list'
+        check_output_includes "[1, 12] in #{fullpath('list')}"
+      end
+
     end
 
-    describe "without arguments" do
+    describe 'without arguments' do
       before { Byebug::Command.settings[:listsize] = 3 }
 
-      it "must show surrounding lines with the first call" do
+      it 'must show surrounding lines with the first call' do
         enter 'break 5', 'cont', 'list'
         debug_file 'list'
         check_output_includes \
-          "[4, 6] in #{fullpath('list')}", "4  4", "=> 5  5", "6  6"
+          "[4, 6] in #{fullpath('list')}", '4  4', '=> 5  5', '6  6'
       end
 
-      it "must list forward after second call" do
+      it 'must list forward after second call' do
         enter 'break 5', 'cont', 'list', 'list'
         debug_file 'list'
         check_output_includes \
-          "[7, 9] in #{fullpath('list')}", "7  7", "8  8", "9  9"
+          "[7, 9] in #{fullpath('list')}", '7  7', '8  8', '9  9'
       end
     end
 
-    describe "list backward" do
+    describe 'list backward' do
       before { Byebug::Command.settings[:listsize] = 3 }
 
-      it "must show surrounding lines with the first call" do
+      it 'must show surrounding lines with the first call' do
         enter 'break 5', 'cont', 'list -'
         debug_file 'list'
         check_output_includes \
-          "[4, 6] in #{fullpath('list')}", "4  4", "=> 5  5", "6  6"
+          "[4, 6] in #{fullpath('list')}", '4  4', '=> 5  5', '6  6'
       end
 
-      it "must list backward after second call" do
+      it 'must list backward after second call' do
         enter 'break 5', 'cont', 'list -', 'list -'
         debug_file 'list'
         check_output_includes \
-          "[1, 3] in #{fullpath('list')}", "1  byebug", "2  2", "3  3"
+          "[1, 3] in #{fullpath('list')}", '1  byebug', '2  2', '3  3'
       end
     end
 
 
-    describe "list surrounding" do
+    describe 'list surrounding' do
       before { Byebug::Command.settings[:listsize] = 3 }
 
-      it "must show the surrounding lines with =" do
+      it 'must show the surrounding lines with =' do
         enter 'break 5', 'cont', 'list ='
         debug_file 'list'
         check_output_includes \
-          "[4, 6] in #{fullpath('list')}", "4  4", "=> 5  5", "6  6"
+          "[4, 6] in #{fullpath('list')}", '4  4', '=> 5  5', '6  6'
       end
     end
 
-    describe "autolist" do
+    describe 'autolist' do
       before { Byebug::Command.settings[:listsize] = 3 }
 
-      it "must show the surronding lines even without 'list' command if autolist is enabled" do
+      it 'must show the surronding lines after stop if autolist is enabled' do
         enter 'set autolist', 'break 5', 'cont'
         debug_file 'list'
         check_output_includes \
-          "[4, 6] in #{fullpath('list')}", "4  4", "=> 5  5", "6  6"
+          "[4, 6] in #{fullpath('list')}", '4  4', '=> 5  5', '6  6'
       end
     end
 
-    describe "specified lines" do
+    describe 'specified lines' do
       before { Byebug::Command.settings[:listsize] = 3 }
 
-      it "must show with mm-nn" do
+      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  4', '5  5', '6  6'
       end
 
-      it "must show with mm,nn" do
+      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  4', '5  5', '6  6'
       end
 
-      it "must show surroundings with mm-" do
+      it 'must show surroundings with mm-' do
         enter 'list 4-'
         debug_file 'list'
         check_output_includes \
-          "[3, 5] in #{fullpath('list')}", "3  3", "4  4", "5  5"
+          "[3, 5] in #{fullpath('list')}", '3  3', '4  4', '5  5'
       end
 
-      it "must show surroundings with mm," do
+      it 'must show surroundings with mm,' do
         enter 'list 4,'
         debug_file 'list'
         check_output_includes \
-          "[3, 5] in #{fullpath('list')}", "3  3", "4  4", "5  5"
+          "[3, 5] in #{fullpath('list')}", '3  3', '4  4', '5  5'
       end
 
-      it "must show nothing if there is no such lines" do
+      it 'must show nothing if there is no such lines' do
         enter 'list 44,44'
         debug_file 'list'
-        check_output_includes "[44, 44] in #{fullpath('list')}"
+        check_error_includes 'Invalid line range'
+        check_output_doesnt_include "[44, 44] in #{fullpath('list')}"
         check_output_doesnt_include /^44  \S/
       end
 
-      it "must show nothing if range is incorrect" do
+      it 'must show nothing if range is incorrect' do
         enter 'list 5,4'
         debug_file 'list'
         check_output_includes "[5, 4] in #{fullpath('list')}"
-        check_output_doesnt_include "5  5"
-        check_output_doesnt_include "4  4"
+        check_output_doesnt_include '5  5'
+        check_output_doesnt_include '4  4'
       end
     end
 
-    describe "reload source" do
-      before { Byebug::Command.settings[:reload_source_on_change] = false }
-      after { change_line_in_file(fullpath('list'), 4, '4') }
+    describe 'reload source' do
+      after do
+        change_line_in_file(fullpath('list'), 4, '4')
+        Byebug::Command.settings[:reload_source_on_change] = true
+      end
 
-      it "must not reload if setting is false" do
+      it 'must not reload if setting is false' do
         enter 'set noautoreload', -> do
           change_line_in_file(fullpath('list'), 4, '100')
           'list 4-4'
         end
         debug_file 'list'
-        check_output_includes "4  4"
+        check_output_includes '4  4'
       end
 
-      it "must reload if setting is true" do
+      it 'must reload if setting is true' do
         enter 'set autoreload', -> do
           change_line_in_file(fullpath('list'), 4, '100')
           'list 4-4'
         end
         debug_file 'list'
-        check_output_includes "4  100"
+        check_output_includes '4  100'
       end
     end
 
-    it "must show an error when there is no such file" do
-      enter ->{state.file = "blabla"; 'list 4-4'}
+    it 'must show an error when there is no such file' do
+      enter ->{state.file = 'blabla'; 'list 4-4'}
       debug_file 'list'
-      check_output_includes "No sourcefile available for blabla",
+      check_output_includes 'No sourcefile available for blabla',
                             interface.error_queue
     end
 
-    describe "Post Mortem" do
-      it "must work in post-mortem mode" do
-        skip("No post morten mode for now")
+    describe 'Post Mortem' do
+      it 'must work in post-mortem mode' do
+        skip('No post morten mode for now')
         enter 'cont', 'list'
         debug_file 'post_mortem'
         check_output_includes "[7, 9] in #{fullpath('post_mortem')}"
@@ -169,4 +194,5 @@ describe "List Command" do
     end
 
   end
+
 end

data/test/method_test.rb

@@ -3,8 +3,13 @@ require_relative 'test_helper'
 describe "Method Command" do
   include TestDsl
 
-  # TODO: Need to write tests for 'method signature' command, but I can't install the 'ruby-internal' gem
-  # on my machine, it fails to build gem native extension.
+  # TODO: Need to write tests for 'method signature' command, but I can't
+  # install the 'ruby-internal' gem on my machine, it fails to build gem native
+  # extension.
+
+  def after_setup
+    Byebug::Command.settings[:autolist] = 0
+  end
 
   describe "show instance method of a class" do
     it "must show using full command name" do
@@ -61,9 +66,9 @@ describe "Method Command" do
   describe "Post Mortem" do
     it "must work in post-mortem mode" do
       skip("No post morten mode for now")
-      #enter 'cont', 'm i self'
-      #debug_file 'post_mortem'
-      #check_output_includes /to_s/
+      enter 'cont', 'm i self'
+      debug_file 'post_mortem'
+      check_output_includes /to_s/
     end
   end
 

data/test/post_mortem_test.rb

@@ -1,27 +1,29 @@
 require_relative 'test_helper'
 
-# XXX: No post morten mode for now
-#
-#describe "Post Mortem" do
-#  include TestDsl
-#
-#  it "must enter into port mortem mode" do
-#    enter 'cont'
-#    debug_file("post_mortem") { Byebug.post_mortem?.must_equal true }
-#  end
-#
-#  it "must stop at the correct line" do
-#    enter 'cont'
-#    debug_file("post_mortem") { state.line.must_equal 8 }
-#  end
-#
-#  it "must exit from post mortem mode after stepping command" do
-#    enter 'cont', 'break 12', 'cont'
-#    debug_file("post_mortem") { Byebug.post_mortem?.must_equal false }
-#  end
-#
-#  it "must save the raised exception" do
-#    enter 'cont'
-#    debug_file("post_mortem") { Byebug.last_exception.must_be_kind_of RuntimeError }
-#  end
-#end
+describe 'Post Mortem' do
+  include TestDsl
+
+  it 'must enter into post mortem mode' do
+    skip('No post morten mode for now')
+    enter 'cont'
+    debug_file('post_mortem') { Byebug.post_mortem?.must_equal true }
+  end
+
+  it 'must stop at the correct line' do
+    skip('No post morten mode for now')
+    enter 'cont'
+    debug_file('post_mortem') { state.line.must_equal 8 }
+  end
+
+  it 'must exit from post mortem mode after stepping command' do
+    skip('No post morten mode for now')
+    enter 'cont', 'break 12', 'cont'
+    debug_file('post_mortem') { Byebug.post_mortem?.must_equal false }
+  end
+
+  it 'must save the raised exception' do
+    skip('No post morten mode for now')
+    enter 'cont'
+    debug_file('post_mortem') { Byebug.last_exception.must_be_kind_of RuntimeError }
+  end
+end

data/test/reload_test.rb

@@ -1,49 +1,49 @@
 require_relative 'test_helper'
 
-describe "Reload Command" do
+describe 'Reload Command' do
   include TestDsl
 
-  describe "Reload Command (Setup)" do
+  describe 'autoreloading' do
+    after { Byebug::Command.settings[:reload_source_on_change] = true }
 
-    before { Byebug::Command.settings[:reload_source_on_change] = false }
-
-    it "must notify that automatic reloading is off" do
+    it 'must notify that automatic reloading is on by default' do
       enter 'reload'
       debug_file 'reload'
-      check_output_includes "Source code is reloaded. Automatic reloading is off."
+      check_output_includes \
+        'Source code is reloaded. Automatic reloading is on.'
     end
 
-    it "must notify that automatic reloading is on" do
-      enter 'set autoreload', 'reload'
+    it 'must notify that automatic reloading is off if setting changed' do
+      enter 'set noautoreload', 'reload'
       debug_file 'reload'
-      check_output_includes "Source code is reloaded. Automatic reloading is on."
+      check_output_includes \
+        'Source code is reloaded. Automatic reloading is off.'
     end
+  end
 
-    describe "reloading" do
-      after { change_line_in_file(fullpath('reload'), 4, '4') }
-      it "must reload the code" do
-        enter 'break 3', 'cont', 'l 4-4', -> do
-          change_line_in_file(fullpath('reload'), 4, '100')
-          'reload'
-        end, 'l 4-4'
-        debug_file 'reload'
-        check_output_includes "4  100"
-      end
+  describe 'reloading' do
+    after { change_line_in_file(fullpath('reload'), 4, '4') }
+    it 'must reload the code' do
+      enter 'break 3', 'cont', 'l 4-4', -> do
+        change_line_in_file(fullpath('reload'), 4, '100')
+        'reload'
+      end, 'l 4-4'
+      debug_file 'reload'
+      check_output_includes '4  100'
     end
+  end
 
-    describe "Post Mortem" do
-       after { change_line_in_file(fullpath('post_mortem'), 7, '        z = 4') }
-      it "must work in post-mortem mode" do
-        skip("No post morten mode for now")
-        enter 'cont', -> do
-          change_line_in_file(fullpath('post_mortem'), 7, 'z = 100')
-          'reload'
-        end, 'l 7-7'
-        debug_file 'post_mortem'
-        check_output_includes "7  z = 100"
-      end
+  describe 'Post Mortem' do
+     after { change_line_in_file(fullpath('post_mortem'), 7, '        z = 4') }
+    it 'must work in post-mortem mode' do
+      skip('No post morten mode for now')
+      enter 'cont', -> do
+        change_line_in_file(fullpath('post_mortem'), 7, 'z = 100')
+        'reload'
+      end, 'l 7-7'
+      debug_file 'post_mortem'
+      check_output_includes '7  z = 100'
     end
-
   end
 
 end

data/test/restart_test.rb

@@ -1,6 +1,6 @@
 require_relative 'test_helper'
 
-describe "Restart Command (test setup)" do
+describe 'Restart Command' do
   include TestDsl
 
   def must_restart
@@ -8,150 +8,146 @@ describe "Restart Command (test setup)" do
     Byebug::RestartCommand.any_instance.expects(:exec)
   end
 
-  describe "Restart Command" do
-
+  describe 'usual restarting' do
     before do
-      @old_consts = {}
-      @old_hashes = {}
-      set_tmp_const(Byebug,
-        "INITIAL_DIR", Pathname.new(__FILE__ + "/../..").realpath.to_s)
-      set_tmp_const(Byebug,
-        "PROG_SCRIPT", Pathname.new(fullpath('restart')).
-                       relative_path_from(Pathname.new(Byebug::INITIAL_DIR)).
-                       cleanpath.to_s)
-      set_tmp_const(Byebug, "RDEBUG_SCRIPT", 'byebug_script')
-      set_tmp_hash(Byebug::Command.settings, :argv, ['argv'])
-      Byebug::RestartCommand.any_instance.stubs(:exec).
-                                       with("#{Byebug::RDEBUG_SCRIPT} argv")
-    end
-
-    after do
-      restore_tmp_const(Byebug, "INITIAL_DIR")
-      restore_tmp_const(Byebug, "PROG_SCRIPT")
-      restore_tmp_const(Byebug, "RDEBUG_SCRIPT")
-      restore_tmp_hash(Byebug::Command.settings, :argv)
+      force_set_const Byebug, 'BYEBUG_SCRIPT', 'byebug_script'
     end
 
-    it "must be restarted with arguments" do
+    it 'must be restarted with arguments' do
       Byebug::RestartCommand.any_instance.expects(:exec).
-             with("#{Byebug::RDEBUG_SCRIPT} test/examples/restart.rb 1 2 3")
+        with("#{Byebug::BYEBUG_SCRIPT} 1 2 3")
       enter 'restart 1 2 3'
-      debug_file('restart')
+      debug_file 'restart'
     end
 
-    it "must be restarted without arguments" do
-      Byebug::RestartCommand.
-        any_instance.expects(:exec).with("#{Byebug::RDEBUG_SCRIPT} argv")
+    it 'arguments must be correctly escaped' do
+      Byebug::Command.settings[:argv] = ['argv1', 'argv 2']
+      Byebug::RestartCommand.any_instance.expects(:exec).with \
+        "#{Byebug::BYEBUG_SCRIPT} argv1 argv\\ 2"
       enter 'restart'
-      debug_file('restart')
+      debug_file 'restart'
     end
 
-    it "must specify arguments by 'set' command" do
-      temporary_change_hash_value(Byebug::Command.settings, :argv, []) do
-        Byebug::RestartCommand.any_instance.expects(:exec).
-                                      with("#{Byebug::RDEBUG_SCRIPT} 1 2 3")
-        enter 'set args 1 2 3', 'restart'
-        debug_file('restart')
-      end
+    it 'must specify arguments by "set" command' do
+      Byebug::Command.settings[:argv] = []
+      Byebug::RestartCommand.any_instance.expects(:exec).
+        with("#{Byebug::BYEBUG_SCRIPT} 1 2 3")
+      enter 'set args 1 2 3', 'restart'
+      debug_file 'restart'
     end
+  end
 
-    describe "messaging" do
-      before { enter 'restart' }
+  describe 'messaging' do
+    before { enter 'restart' }
 
-      describe "reexecing" do
-        it "must restart and show a message about reexecing" do
-          must_restart
-          debug_file('restart')
-          check_output_includes "Re exec'ing:\n\t#{Byebug::RDEBUG_SCRIPT}" \
-                                " argv"
-        end
+    describe 'reexecing' do
+      it 'must restart and show a message about reexecing' do
+        force_set_const Byebug, 'BYEBUG_SCRIPT', 'byebug_script'
+        Byebug::Command.settings[:argv] = ['argv']
+        must_restart
+        debug_file 'restart'
+        check_output_includes \
+          "Re exec'ing:\n\t#{Byebug::BYEBUG_SCRIPT} argv"
       end
+    end
 
-      describe "no script is specified and don't use $0" do
-        before do
-          set_tmp_const(Byebug, "PROG_SCRIPT", :__undefined__)
-          set_tmp_const(Byebug, "DEFAULT_START_SETTINGS",
-                              init: false, post_mortem: false, tracing: nil)
-        end
-        after do
-          restore_tmp_const(Byebug, "PROG_SCRIPT")
-          restore_tmp_const(Byebug, "DEFAULT_START_SETTINGS")
-        end
-
-        it "must not restart and show error messages instead" do
-          must_restart.never
-          debug_file('restart')
-          check_output_includes "Don't know name of debugged program", interface.error_queue
-        end
+    describe 'no script specified and no $0 used instead' do
+      before do
+        force_unset_const Byebug, 'PROG_SCRIPT'
+        force_set_const Byebug,
+                        'DEFAULT_START_SETTINGS',
+                        init: false, post_mortem: false, tracing: nil
       end
 
-      it "must use prog_script from $0 if PROG_SCRIPT is undefined" do
-        $0 = 'prog-0'
-        Byebug.send(:remove_const, "PROG_SCRIPT")
-        force_set_const(Byebug, "DEFAULT_START_SETTINGS", init: true, post_mortem: false, tracing: nil)
-        debug_file('restart')
-        check_output_includes "Ruby program prog-0 doesn't exist", interface.error_queue
+      it 'must not restart and show error messages instead' do
+        must_restart.never
+        debug_file 'restart'
+        check_output_includes 'Don\'t know name of debugged program',
+                              interface.error_queue
       end
+    end
 
-      describe "no script at the specified path" do
-        before { force_set_const(Byebug, "PROG_SCRIPT", 'blabla') }
-
-        it "must not restart" do
-          must_restart.never
-          debug_file('restart')
-        end
-
-        it "must show an error message" do
-          debug_file('restart')
-          check_output_includes "Ruby program blabla doesn't exist", interface.error_queue
-        end
+    describe 'no script specified, $0 used instead' do
+      before do
+        @old_prog_name = $0
+        $0 = 'prog-0'
+        force_unset_const Byebug, 'PROG_SCRIPT'
       end
+      after { $0 = @old_prog_name }
 
-      describe "byebug runner script is not specified" do
+      it 'must use prog_script from $0 if PROG_SCRIPT is undefined' do
+        debug_file 'restart'
+        check_output_includes 'Ruby program prog-0 doesn\'t exist',
+                              interface.error_queue
+      end
+    end
 
-        before { set_tmp_const(Byebug, "RDEBUG_SCRIPT", :__undefined__) }
-        after  { restore_tmp_const(Byebug, "RDEBUG_SCRIPT") }
+    describe 'no script at the specified path' do
+      before do
+        force_set_const Byebug, 'PROG_SCRIPT', 'blabla'
+        force_set_const Byebug,
+                        'DEFAULT_START_SETTINGS',
+                        init: false, post_mortem: false, tracing: nil
+      end
 
-        it "must restart anyway" do
-          must_restart
-          debug_file('restart')
-        end
+      it 'must not restart' do
+        must_restart.never
+        debug_file 'restart'
+      end
 
-        it "must show a warning message" do
-          debug_file('restart')
-          check_output_includes "Byebug was not called from the outset..."
-        end
+      it 'must show an error message' do
+        debug_file 'restart'
+        check_output_includes 'Ruby program blabla doesn\'t exist',
+                              interface.error_queue
+      end
+    end
 
-        it "must show a warning message when prog script is not executable" do
-          debug_file('restart')
-          check_output_includes "Ruby program #{Byebug::PROG_SCRIPT} not " \
-                                "executable... We'll add a call to Ruby."
-        end
+    describe 'byebug runner script is not specified' do
+      before do
+        must_restart
       end
 
-      describe "when can't change the dir to INITIAL_DIR" do
-        before { force_set_const(Byebug, "INITIAL_DIR", "unexisted/path") }
+      it 'must restart anyway' do
+        debug_file 'restart'
+      end
 
-        it "must restart anyway" do
-          must_restart
-          debug_file('restart')
-        end
+      it 'must show a warning message' do
+        debug_file 'restart'
+        check_output_includes 'Byebug was not called from the outset...'
+      end
 
-        it "must show an error message " do
-          debug_file('restart')
-          check_output_includes "Failed to change initial directory unexisted/path"
-        end
+      it 'must show a warning message when prog script is not executable' do
+        debug_file 'restart'
+        check_output_includes "Ruby program #{Byebug::PROG_SCRIPT} not " \
+                              "executable... We'll add a call to Ruby."
       end
     end
 
-    describe "Post Mortem" do
-      it "must work in post-mortem mode" do
-        skip("No post morten mode for now")
+    describe 'when can\'t change the dir to INITIAL_DIR' do
+      before do
+        force_set_const(Byebug, 'INITIAL_DIR', '/unexistent/path')
         must_restart
-        enter 'cont', 'restart'
-        debug_file 'post_mortem'
+      end
+
+      it 'must restart anyway' do
+        debug_file 'restart'
+      end
+
+      it 'must show an error message ' do
+        debug_file 'restart'
+        check_output_includes \
+          'Failed to change initial directory /unexistent/path'
       end
     end
+  end
 
+  describe 'Post Mortem' do
+    it 'must work in post-mortem mode' do
+      skip('No post morten mode for now')
+      must_restart
+      enter 'cont', 'restart'
+      debug_file 'post_mortem'
+    end
   end
+
 end