byebug 3.4.2 → 3.5.0

data/test/commands/list_test.rb

@@ -49,11 +49,11 @@ module Byebug
       check_output_includes "[1, 12] in #{__FILE__}"
     end
 
-    def test_moves_range_down_when_it_goes_after_the_end_of_file
+    def test_does_not_list_after_the_end_of_file
       n_lines = %x{wc -l #{__FILE__}}.split.first.to_i
       enter 'break 18', 'cont', "list #{n_lines-3}-#{n_lines+6}"
       debug_proc(@example)
-      check_output_includes "[#{n_lines-9}, #{n_lines}] in #{__FILE__}"
+      check_output_includes "[#{n_lines-3}, #{n_lines}] in #{__FILE__}"
     end
 
     def test_lists_the_whole_file_if_number_of_lines_is_smaller_than_listsize
@@ -118,13 +118,13 @@ module Byebug
       debug_proc(@example)
       check_error_includes 'Invalid line range'
       check_output_doesnt_include "[500, 505] in #{__FILE__}"
-      check_output_doesnt_include(/^500  \S/)
     end
 
     def test_lists_nothing_if_invalid_range_is_specified
       enter 'list 5,4'
       debug_proc(@example)
-      check_output_includes "[5, 4] in #{__FILE__}"
+      check_error_includes 'Invalid line range'
+      check_output_doesnt_include "[5, 4] in #{__FILE__}"
     end
 
     def test_list_proper_lines_when_range_around_specific_line_with_hyphen
@@ -150,17 +150,9 @@ module Byebug
       debug_proc(@example)
       check_output_includes "26:         a = '%26'"
     end
-  end
-
-  class ListTestCaseAutoreload < ListTestCase
-    def setup
-      super
-      Setting[:autoreload] = true
-      enter 'list' # force first reading of file
-    end
 
-    def test_lists_file_changes_with_autoreload_enabled
-      enter -> do
+    def test_lists_file_changes_by_default
+      enter 'list', -> do
         change_line_in_file(__FILE__, 7, '        a = 100')
         'list 7-7'
       end
@@ -168,20 +160,12 @@ module Byebug
       check_output_includes(/7:\s+a = 100/)
       change_line_in_file(__FILE__, 7, '        a = 7')
     end
-  end
-
-  class ListTestCaseNoAutoreload < ListTestCase
-    def setup
-      super
-      Setting[:autoreload] = false
-      enter 'list' # force first reading of file
-    end
 
     def test_does_not_list_file_changes_with_autoreload_disabled
-      enter -> do
+      enter 'set noautoreload', 'list', -> do
         change_line_in_file(__FILE__, 7, '        a = 100')
         'list 7-7'
-      end
+      end, 'set autoreload'
       debug_proc(@example)
       check_output_doesnt_include(/7:\s+a = 100/)
       change_line_in_file(__FILE__, 7, '        a = 7')

data/test/commands/pry_test.rb

@@ -1,10 +1,3 @@
-begin
-  require 'pry'
-  has_pry = true
-rescue LoadError
-  has_pry = false
-end
-
 module Byebug
   class PryTestCase < TestCase
     def setup
@@ -30,4 +23,4 @@ module Byebug
       skip 'TODO'
     end
   end
-end if has_pry
+end if defined?(Pry)

data/test/commands/restart_test.rb

@@ -21,7 +21,6 @@ module Byebug
     def must_restart(cmd = nil)
       expectation = RestartCommand.any_instance.expects(:exec)
       expectation = expectation.with(cmd) if cmd
-      expectation
     end
 
     def test_restarts_with_manual_arguments
@@ -32,35 +31,18 @@ module Byebug
       enter 'restart 1 2 3'
       debug_proc(@example)
       check_output_includes "Re exec'ing:\n\t#{cmd}"
-    end
-
-    def test_restart_with_a_default_script_if_nil_script_specified
-      force_set_const(Byebug, 'BYEBUG_SCRIPT', 'byebug_script')
-      Byebug.debugged_program = nil
-      must_restart
-
-      enter 'restart'
-      debug_proc(@example)
-      check_output_includes(/Re exec'ing:\s*#{BYEBUG_SCRIPT} #{$PROGRAM_NAME}/)
-    end
-
-    def test_does_not_restart_when_script_specified_does_not_exist
-      Byebug.debugged_program = 'blabla'
-      must_restart.never
-      enter 'restart'
-      debug_proc(@example)
-      check_error_includes 'Ruby program blabla doesn\'t exist'
+      force_unset_const(Byebug, 'BYEBUG_SCRIPT')
     end
 
     def test_still_restarts_when_byebug_attached_to_running_program
-      force_unset_const(Byebug, 'BYEBUG_SCRIPT')
       must_restart
       enter 'restart'
+
       debug_proc(@example)
       check_output_includes 'Byebug was not called from the outset...'
       check_output_includes \
-        "Ruby program #{Byebug.debugged_program} not executable... " \
-        "We'll wrap it in a ruby call"
+        "Program #{Byebug.debugged_program} not executable... " \
+        "Wrapping it in a ruby call"
     end
   end
 end

data/test/commands/save_test.rb

@@ -53,15 +53,15 @@ module Byebug
     def test_save_without_a_filename_uses_a_default_file
       enter 'save'
       debug_proc(@example)
-      assert_includes File.read(interface.restart_file), 'set autoirb false'
-      File.delete(interface.restart_file)
+      assert_includes File.read(RESTART_FILE), 'set autoirb false'
+      File.delete(RESTART_FILE)
     end
 
     def test_save_without_a_filename_shows_a_message_with_the_file_used
       enter 'save'
       debug_proc(@example)
-      check_output_includes "Saved to '#{interface.restart_file}'"
-      File.delete(interface.restart_file)
+      check_output_includes "Saved to '#{RESTART_FILE}'"
+      File.delete(RESTART_FILE)
     end
   end
 end

data/test/commands/set_test.rb

@@ -105,6 +105,7 @@ module Byebug
       debug_proc(@example)
       assert_equal filename, Setting[:histfile]
       check_output_includes "The command history file is #{filename}"
+      Setting[:histfile] = HistfileSetting::DEFAULT
     end
 
     def test_set_histfile_shows_an_error_message_if_no_filename_is_provided

data/test/runner_test.rb

@@ -47,49 +47,56 @@ module Byebug
 
       assert_raises(SystemExit) { @runner.run }
 
-      check_output_includes(/You must specify a program to debug.../)
+      check_error_includes(/You must specify a program to debug.../)
     end
 
-    def expect_it_debugs_script
+    def test_run_with_an_nonexistent_script
+      ARGV.replace(%w(non_existent_script.rb))
+
+      assert_raises(SystemExit) { @runner.run }
+
+      check_error_includes("The script doesn't exist")
+    end
+
+    def expect_it_debugs_script(rc = true)
       Byebug.expects(:start)
-      Byebug::Runner.any_instance.expects(:debug_program)
-      Byebug.expects(:run_init_script)
+      rc_expectation = Byebug.expects(:run_init_script)
+      rc_expectation.never unless rc
+      @runner.expects(:debug_program)
     end
 
     def test_run_with_a_script_to_debug
-      ARGV.replace(%w(my_script))
+      ARGV.replace(%w(lib/byebug.rb))
       expect_it_debugs_script
 
       @runner.run
     end
 
     def test_run_with_a_script_and_params_does_not_consume_script_params
-      ARGV.replace(%w(-- my_script -opt value))
+      ARGV.replace(%w(-- lib/byebug.rb -opt value))
       expect_it_debugs_script
 
       @runner.run
-      assert_equal %w(my_script -opt value), ARGV
+      assert_equal %w(lib/byebug.rb -opt value), ARGV
     end
 
     def test_run_with_ruby_script_ruby_is_ignored_and_script_passed_instead
-      ARGV.replace(%w(-- ruby ruby_script))
+      ARGV.replace(%w(-- ruby lib/byebug.rb))
       expect_it_debugs_script
 
       @runner.run
-      assert_equal %w(ruby_script), ARGV
+      assert_equal %w(lib/byebug.rb), ARGV
     end
 
     def test_run_with_no_rc_option
-      ARGV.replace(%w(--no-rc my_script))
-      Byebug.expects(:start)
-      Byebug::Runner.any_instance.expects(:debug_program)
-      Byebug.expects(:run_init_script).never
+      ARGV.replace(%w(--no-rc lib/byebug.rb))
+      expect_it_debugs_script(false)
 
       @runner.run
     end
 
     def test_run_with_post_mortem_mode_flag
-      ARGV.replace(%w(-m my_script))
+      ARGV.replace(%w(-m lib/byebug.rb))
       expect_it_debugs_script
       @runner.run
 
@@ -98,7 +105,7 @@ module Byebug
     end
 
     def test_run_with_linetracing_flag
-      ARGV.replace(%w(-t my_script))
+      ARGV.replace(%w(-t lib/byebug.rb))
       expect_it_debugs_script
       @runner.run
 
@@ -108,14 +115,14 @@ module Byebug
 
     def test_run_with_no_quit_flag
       skip 'for now'
-      ARGV.replace(%w(--no-quit my_script))
+      ARGV.replace(%w(--no-quit lib/byebug.rb))
       @runner.run
 
       check_output_includes('(byebug:ctrl)')
     end
 
     def test_run_with_require_flag
-      ARGV.replace(%w(-r abbrev my_script))
+      ARGV.replace(%w(-r abbrev lib/byebug.rb))
       expect_it_debugs_script
       @runner.run
 
@@ -124,7 +131,7 @@ module Byebug
     end
 
     def test_run_with_include_flag
-      ARGV.replace(%w(-I custom_dir my_script))
+      ARGV.replace(%w(-I custom_dir lib/byebug.rb))
       expect_it_debugs_script
       @runner.run
 
@@ -132,7 +139,7 @@ module Byebug
     end
 
     def test_run_with_debug_flag
-      ARGV.replace(%w(-d my_script))
+      ARGV.replace(%w(-d lib/byebug.rb))
       expect_it_debugs_script
       @runner.run
 

data/test/support/test_interface.rb

@@ -1,18 +1,16 @@
-require 'byebug/history'
-
 module Byebug
   #
   # Custom interface for easier assertions
   #
   class TestInterface < Interface
-    attr_reader :input_queue, :output_queue, :error_queue, :confirm_queue,
-                :history
+    attr_reader :input_queue, :output_queue, :error_queue, :confirm_queue
 
     attr_accessor :test_block
 
     def initialize
-      @input_queue, @output_queue, @error_queue = [], [], []
-      @confirm_queue, @command_queue, @history = [], [], History.new
+      super()
+      @input_queue, @output_queue = [], []
+      @error_queue, @confirm_queue = [], []
     end
 
     def errmsg(*args)
@@ -20,14 +18,11 @@ module Byebug
     end
 
     def read_command(*)
-      if @input_queue.empty?
-        if test_block
-          test_block.call
-          self.test_block = nil
-        end
-      else
-        result = @input_queue.shift
-        result.is_a?(Proc) ? result.call : result
+      return readline(true) unless @input_queue.empty?
+
+      if test_block
+        test_block.call
+        self.test_block = nil
       end
     end
 
@@ -37,7 +32,7 @@ module Byebug
 
     def confirm(message)
       @confirm_queue << message
-      read_command message
+      readline(false)
     end
 
     def close
@@ -51,5 +46,14 @@ module Byebug
         "confirm_queue: #{confirm_queue.inspect}"
       ].join("\n")
     end
+
+    private
+
+    def readline(hist)
+      cmd = @input_queue.shift
+      cmd = cmd.is_a?(Proc) ? cmd.call : cmd
+      save_history(cmd) unless !hist
+      cmd
+    end
   end
 end

data/test/test_helper.rb

@@ -28,14 +28,11 @@ module Byebug
 
       Byebug::Setting.load
       Byebug::Setting[:autolist] = false
+      Byebug::Setting[:autosave] = false
       Byebug::Setting[:testing] = true
       Byebug::Setting[:width] = 80
 
-      byebug_bin = File.expand_path('../../../bin/byebug', __FILE__)
-      force_set_const(Byebug, 'BYEBUG_SCRIPT', byebug_bin)
-      Byebug.debugged_program = $PROGRAM_NAME
-
-      # include test files as ignored files
+      # Include test files as ignored files
       glob_exp = File.expand_path('../../{lib,test/support}/**/*.rb', __FILE__)
       ignored_files = Dir.glob(glob_exp) + ['test/test_helper.rb']
       force_set_const(Byebug, 'IGNORED_FILES', ignored_files)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: byebug
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.5.0
 platform: ruby
 authors:
 - David Rodriguez
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2014-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: columnize