summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/irb.rb15
-rw-r--r--lib/irb/cmd/force_exit.rb (renamed from lib/irb/cmd/exit_forced_action.rb)4
-rw-r--r--lib/irb/extend-command.rb2
-rw-r--r--test/irb/cmd/test_force_exit.rb51
-rw-r--r--test/irb/test_cmd.rb24
-rw-r--r--test/irb/test_debug_cmd.rb41
-rw-r--r--test/irb/test_history.rb44
7 files changed, 111 insertions, 70 deletions
diff --git a/lib/irb.rb b/lib/irb.rb
index ad6ec78aa4..3830867e6a 100644
--- a/lib/irb.rb
+++ b/lib/irb.rb
@@ -889,10 +889,6 @@ module IRB
throw :IRB_EXIT, false
end
- def IRB.irb_exit!(*)
- throw :IRB_EXIT, true
- end
-
# Aborts then interrupts irb.
#
# Will raise an Abort exception, or the given +exception+.
@@ -972,8 +968,7 @@ module IRB
conf[:IRB_RC].call(context) if conf[:IRB_RC]
conf[:MAIN_CONTEXT] = context
- supports_history_saving = conf[:SAVE_HISTORY] && context.io.support_history_saving?
- save_history = !in_nested_session && supports_history_saving
+ save_history = !in_nested_session && conf[:SAVE_HISTORY] && context.io.support_history_saving?
if save_history
context.io.load_history
@@ -993,12 +988,8 @@ module IRB
trap("SIGINT", prev_trap)
conf[:AT_EXIT].each{|hook| hook.call}
- if forced_exit
- context.io.save_history if supports_history_saving
- Kernel.exit(0)
- else
- context.io.save_history if save_history
- end
+ context.io.save_history if save_history
+ Kernel.exit(0) if forced_exit
end
end
diff --git a/lib/irb/cmd/exit_forced_action.rb b/lib/irb/cmd/force_exit.rb
index e5df75b682..2b9f296865 100644
--- a/lib/irb/cmd/exit_forced_action.rb
+++ b/lib/irb/cmd/force_exit.rb
@@ -6,12 +6,12 @@ module IRB
# :stopdoc:
module ExtendCommand
- class ExitForcedAction < Nop
+ class ForceExit < Nop
category "IRB"
description "Exit the current process."
def execute(*)
- IRB.irb_exit!
+ throw :IRB_EXIT, true
rescue UncaughtThrowError
Kernel.exit(0)
end
diff --git a/lib/irb/extend-command.rb b/lib/irb/extend-command.rb
index 2db2b80578..d303bf76da 100644
--- a/lib/irb/extend-command.rb
+++ b/lib/irb/extend-command.rb
@@ -37,7 +37,7 @@ module IRB # :nodoc:
[:irb_quit, OVERRIDE_PRIVATE_ONLY],
],
[
- :irb_exit!, :ExitForcedAction, "cmd/exit_forced_action",
+ :irb_exit!, :ForceExit, "cmd/force_exit",
[:exit!, OVERRIDE_PRIVATE_ONLY],
],
diff --git a/test/irb/cmd/test_force_exit.rb b/test/irb/cmd/test_force_exit.rb
new file mode 100644
index 0000000000..191a786872
--- /dev/null
+++ b/test/irb/cmd/test_force_exit.rb
@@ -0,0 +1,51 @@
+# frozen_string_literal: false
+require 'irb'
+
+require_relative "../helper"
+
+module TestIRB
+ class ForceExitTest < IntegrationTestCase
+ def test_forced_exit_finishes_process_immediately
+ write_ruby <<~'ruby'
+ puts "First line"
+ puts "Second line"
+ binding.irb
+ puts "Third line"
+ binding.irb
+ puts "Fourth line"
+ ruby
+
+ output = run_ruby_file do
+ type "123"
+ type "456"
+ type "exit!"
+ end
+
+ assert_match(/First line\r\n/, output)
+ assert_match(/Second line\r\n/, output)
+ assert_match(/irb\(main\):001> 123/, output)
+ assert_match(/irb\(main\):002> 456/, output)
+ refute_match(/Third line\r\n/, output)
+ refute_match(/Fourth line\r\n/, output)
+ end
+
+ def test_forced_exit_in_nested_sessions
+ write_ruby <<~'ruby'
+ def foo
+ binding.irb
+ end
+
+ binding.irb
+ binding.irb
+ ruby
+
+ output = run_ruby_file do
+ type "123"
+ type "foo"
+ type "exit!"
+ end
+
+ assert_match(/irb\(main\):001> 123/, output)
+ end
+ end
+end
diff --git a/test/irb/test_cmd.rb b/test/irb/test_cmd.rb
index d99ac05c5d..7d7353281e 100644
--- a/test/irb/test_cmd.rb
+++ b/test/irb/test_cmd.rb
@@ -34,17 +34,17 @@ module TestIRB
end
def execute_lines(*lines, conf: {}, main: self, irb_path: nil)
- IRB.init_config(nil)
- IRB.conf[:VERBOSE] = false
- IRB.conf[:PROMPT_MODE] = :SIMPLE
- IRB.conf[:USE_PAGER] = false
- IRB.conf.merge!(conf)
- input = TestInputMethod.new(lines)
- irb = IRB::Irb.new(IRB::WorkSpace.new(main), input)
- irb.context.return_format = "=> %s\n"
- irb.context.irb_path = irb_path if irb_path
- IRB.conf[:MAIN_CONTEXT] = irb.context
capture_output do
+ IRB.init_config(nil)
+ IRB.conf[:VERBOSE] = false
+ IRB.conf[:PROMPT_MODE] = :SIMPLE
+ IRB.conf[:USE_PAGER] = false
+ IRB.conf.merge!(conf)
+ input = TestInputMethod.new(lines)
+ irb = IRB::Irb.new(IRB::WorkSpace.new(main), input)
+ irb.context.return_format = "=> %s\n"
+ irb.context.irb_path = irb_path if irb_path
+ IRB.conf[:MAIN_CONTEXT] = irb.context
irb.eval_input
end
end
@@ -58,7 +58,9 @@ module TestIRB
"irb_info",
main: main
)
- assert_empty err
+ # Because the main object is frozen, IRB would wrap a delegator around it
+ # Which's exit! method can't be overridden and would raise a warning
+ assert_match(/delegator does not forward private method #exit\!/, err)
assert_match(/RUBY_PLATFORM/, out)
end
end
diff --git a/test/irb/test_debug_cmd.rb b/test/irb/test_debug_cmd.rb
index cbd0120093..0fb45af478 100644
--- a/test/irb/test_debug_cmd.rb
+++ b/test/irb/test_debug_cmd.rb
@@ -255,47 +255,6 @@ module TestIRB
assert_match(/irb\(main\):001> next/, output)
end
- def test_forced_exit_finishes_process_when_nested_sessions
- write_ruby <<~'ruby'
- puts "First line"
- puts "Second line"
- binding.irb
- puts "Third line"
- binding.irb
- puts "Fourth line"
- ruby
-
- output = run_ruby_file do
- type "123"
- type "456"
- type "exit!"
- end
-
- assert_match(/First line\r\n/, output)
- assert_match(/Second line\r\n/, output)
- assert_match(/irb\(main\):001> 123/, output)
- assert_match(/irb\(main\):002> 456/, output)
- refute_match(/Third line\r\n/, output)
- refute_match(/Fourth line\r\n/, output)
- end
-
- def test_forced_exit
- write_ruby <<~'ruby'
- puts "Hello"
- binding.irb
- ruby
-
- output = run_ruby_file do
- type "123"
- type "456"
- type "exit!"
- end
-
- assert_match(/Hello\r\n/, output)
- assert_match(/irb\(main\):001> 123/, output)
- assert_match(/irb\(main\):002> 456/, output)
- end
-
def test_quit
write_ruby <<~'RUBY'
binding.irb
diff --git a/test/irb/test_history.rb b/test/irb/test_history.rb
index 49f3698f92..2601bcad84 100644
--- a/test/irb/test_history.rb
+++ b/test/irb/test_history.rb
@@ -379,20 +379,58 @@ module TestIRB
HISTORY
end
- def test_history_saving_with_exit!
+ def test_nested_history_saving_from_inner_session_with_exit!
write_history ""
write_ruby <<~'RUBY'
+ def foo
+ binding.irb
+ end
+
binding.irb
RUBY
run_ruby_file do
- type "'starting session'"
+ type "'outer session'"
+ type "foo"
+ type "'inner session'"
type "exit!"
end
assert_equal <<~HISTORY, @history_file.open.read
- 'starting session'
+ 'outer session'
+ foo
+ 'inner session'
+ exit!
+ HISTORY
+ end
+
+ def test_nested_history_saving_from_outer_session_with_exit!
+ write_history ""
+
+ write_ruby <<~'RUBY'
+ def foo
+ binding.irb
+ end
+
+ binding.irb
+ RUBY
+
+ run_ruby_file do
+ type "'outer session'"
+ type "foo"
+ type "'inner session'"
+ type "exit"
+ type "'outer session again'"
+ type "exit!"
+ end
+
+ assert_equal <<~HISTORY, @history_file.open.read
+ 'outer session'
+ foo
+ 'inner session'
+ exit
+ 'outer session again'
exit!
HISTORY
end
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-17 04:32:09 +0000