Skip to content

Commit

Permalink
Revert "Do not use HEAD request if 1 port"
Browse files Browse the repository at this point in the history
This reverts commit 6571e2a.

It contains #1024 accidentally.
  • Loading branch information
ko1 committed Nov 14, 2023
1 parent c3d5e8c commit 5b47f6a
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/protocol.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby-version: ["2.7", "3.0", "3.1", "head", "debug"]
ruby-version: ['2.6', '2.7', '3.0', '3.1', 'head', 'debug']

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby-version: ["2.7", "3.0", "3.1", "3.2", "head", "debug"]
ruby-version: ['2.6', '2.7', '3.0', '3.1', '3.2', 'head', 'debug']

steps:
- uses: actions/checkout@v4
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,6 @@ config set no_color true
* `RUBY_DEBUG_NO_RELINE` (`no_reline`): Do not use Reline library (default: false)
* `RUBY_DEBUG_NO_HINT` (`no_hint`): Do not show the hint on the REPL (default: false)
* `RUBY_DEBUG_NO_LINENO` (`no_lineno`): Do not show line numbers (default: false)
* `RUBY_DEBUG_IRB_CONSOLE` (`irb_console`): Use IRB as the console (default: false)

* CONTROL
* `RUBY_DEBUG_SKIP_PATH` (`skip_path`): Skip showing/entering frames for given paths
Expand Down
4 changes: 2 additions & 2 deletions debug.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
spec.description = %q{Debugging functionality for Ruby. This is completely rewritten debug.rb which was contained by the ancient Ruby versions.}
spec.homepage = "https://github.com/ruby/debug"
spec.licenses = ["Ruby", "BSD-2-Clause"]
spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0")

spec.metadata["homepage_uri"] = spec.homepage
spec.metadata["source_code_uri"] = spec.homepage
Expand All @@ -27,6 +27,6 @@ Gem::Specification.new do |spec|
spec.require_paths = ["lib"]
spec.extensions = ['ext/debug/extconf.rb']

spec.add_dependency "irb", ">= 1.8.3" # for irb:debug integration
spec.add_dependency "irb", ">= 1.5.0" # for binding.irb(show_code: false)
spec.add_dependency "reline", ">= 0.3.8"
end
5 changes: 2 additions & 3 deletions lib/debug/client.rb
Original file line number Diff line number Diff line change
Expand Up @@ -165,16 +165,15 @@ def connect_unix name = nil
end
else
Client.cleanup_unix_domain_sockets
files = Client.list_connections
files = Client.list_connections verbose: true

case files.size
when 0
$stderr.puts "No debug session is available."
exit
when 1
@s = Socket.unix(files.first)
@s = Socket.unix(files.first.first)
else
files = Client.list_connections verbose: true
$stderr.puts "Please select a debug session:"
files.each{|(f, desc)|
$stderr.puts " #{File.basename(f)} (#{desc})"
Expand Down
1 change: 0 additions & 1 deletion lib/debug/config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ module DEBUGGER__
no_reline: ['RUBY_DEBUG_NO_RELINE', "UI: Do not use Reline library", :bool, "false"],
no_hint: ['RUBY_DEBUG_NO_HINT', "UI: Do not show the hint on the REPL", :bool, "false"],
no_lineno: ['RUBY_DEBUG_NO_LINENO', "UI: Do not show line numbers", :bool, "false"],
irb_console: ["RUBY_DEBUG_IRB_CONSOLE", "UI: Use IRB as the console", :bool, "false"],

# control setting
skip_path: ['RUBY_DEBUG_SKIP_PATH', "CONTROL: Skip showing/entering frames for given paths", :path],
Expand Down
5 changes: 0 additions & 5 deletions lib/debug/session.rb
Original file line number Diff line number Diff line change
Expand Up @@ -202,11 +202,6 @@ def activate ui = nil, on_fork: false
end
@tp_thread_end.enable

if CONFIG[:irb_console]
require_relative "irb_integration"
thc.activate_irb_integration
end

# session start
q << true
session_server_main
Expand Down
9 changes: 7 additions & 2 deletions lib/debug/thread_client.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1048,8 +1048,13 @@ def wait_next_action_
when :call
result = frame_eval(eval_src)
when :irb
require_relative "irb_integration"
activate_irb_integration
require 'irb' # prelude's binding.irb doesn't have show_code option
begin
result = frame_eval('binding.irb(show_code: false)', binding_location: true)
ensure
# workaround: https://github.com/ruby/debug/issues/308
Reline.prompt_proc = nil if defined? Reline
end
when :display, :try_display
failed_results = []
eval_src.each_with_index{|src, i|
Expand Down
1 change: 0 additions & 1 deletion test/support/console_test_case.rb
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,6 @@ def prepare_test_environment(program, test_steps, &block)
ENV['RUBY_DEBUG_TEST_UI'] = 'terminal'
ENV['RUBY_DEBUG_NO_RELINE'] = 'true'
ENV['RUBY_DEBUG_HISTORY_FILE'] = ''
ENV['TERM'] = 'dumb'

write_temp_file(strip_line_num(program))
@scenario = []
Expand Down

0 comments on commit 5b47f6a

Please sign in to comment.