Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use OptionParser to parse options #858

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Use OptionParser to parse options #858

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
32d3195
parse_opts_with_option_parser, first working steps
tomash Feb 2, 2024
8cc39f0
all the options in parse_opts_with_option_parser actually parsed with…
tomash Feb 2, 2024
0824c34
parse_opts cleanup and corrections
tomash Feb 2, 2024
e9f8caa
savepoint: splitting argv on -- approach
tomash Feb 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
274 changes: 157 additions & 117 deletions lib/irb/init.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def IRB.initialized?
def IRB.setup(ap_path, argv: ::ARGV)
IRB.init_config(ap_path)
IRB.init_error
IRB.parse_opts(argv: argv)
IRB.parse_opts_with_option_parser(argv: argv)
IRB.run_config
IRB.load_modules

Expand Down Expand Up @@ -249,127 +249,166 @@ def IRB.init_error
@CONF[:LC_MESSAGES].load("irb/error.rb")
end

require 'optparse'
# option analyzing
def IRB.parse_opts(argv: ::ARGV)
def IRB.parse_opts_with_option_parser(argv: ::ARGV)
load_path = []
while opt = argv.shift
case opt
when "-f"
@CONF[:RC] = false
when "-d"
$DEBUG = true
$VERBOSE = true
when "-w"

parser = OptionParser.new(
"Usage: irb.rb [options] [programfile] [arguments]", # Banner
)

parser.on("-f", "Don't initialize from configuration file.") do
@CONF[:RC] = false
end
parser.on("-d", "Set $DEBUG and $VERBOSE to true (same as `ruby -d`).") do
$DEBUG = true
$VERBOSE = true
end
parser.on("-w", "Suppress warnings (same as `ruby -w`).") do
Warning[:deprecated] = $VERBOSE = true
end
parser.on("-W[level=2]", "Set warning level; 0=silence, 1=normal, 2=verbose", "(same as 'ruby -W').") do |value|
case value
when "0"
$VERBOSE = nil
when "1"
$VERBOSE = false
else
Warning[:deprecated] = $VERBOSE = true
when /^-W(.+)?/
opt = $1 || argv.shift
case opt
when "0"
$VERBOSE = nil
when "1"
$VERBOSE = false
else
Warning[:deprecated] = $VERBOSE = true
end
when /^-r(.+)?/
opt = $1 || argv.shift
@CONF[:LOAD_MODULES].push opt if opt
when /^-I(.+)?/
opt = $1 || argv.shift
load_path.concat(opt.split(File::PATH_SEPARATOR)) if opt
when '-U'
set_encoding("UTF-8", "UTF-8")
when /^-E(.+)?/, /^--encoding(?:=(.+))?/
opt = $1 || argv.shift
set_encoding(*opt.split(':', 2))
when "--inspect"
if /^-/ !~ argv.first
@CONF[:INSPECT_MODE] = argv.shift
else
@CONF[:INSPECT_MODE] = true
end
when "--noinspect"
@CONF[:INSPECT_MODE] = false
when "--no-pager"
@CONF[:USE_PAGER] = false
when "--singleline", "--readline", "--legacy"
@CONF[:USE_SINGLELINE] = true
when "--nosingleline", "--noreadline"
@CONF[:USE_SINGLELINE] = false
when "--multiline", "--reidline"
if opt == "--reidline"
warn <<~MSG.strip
--reidline is deprecated, please use --multiline instead.
MSG
end
end
end
parser.on("-r load-module", "Require load-module (same as 'ruby -r').") do |value|
@CONF[:LOAD_MODULES].push value
end
parser.on("-I path", "Specify $LOAD_PATH directory (same as 'ruby -I').") do |value|
load_path.concat(value.split(File::PATH_SEPARATOR))
end
parser.on("-U", "Set external and internal encoding to UTF-8.") do
set_encoding("UTF-8", "UTF-8")
end
parser.on("-E ex[:in]", "--encoding=ex[:in]", "Specify the default external (ex) and internal (in) encodings", "(same as 'ruby -E').") do |value|
set_encoding(*value.split(':', 2))
end
parser.on("--inspect", "Use 'inspect' for output.") do
@CONF[:INSPECT_MODE] = true
end
parser.on("--noinspect", "Don't use 'inspect' for output.") do
@CONF[:INSPECT_MODE] = false
end
parser.on("--no-pager", "Don't use pager.") do
@CONF[:USE_PAGER] = false
end
parser.on("--singleline', '--readline', '--legacy", "Use single line editor module.") do
@CONF[:USE_SINGLELINE] = true
end
parser.on("--nosingleline', '--noreadline", "Don't use single line editor module (default).") do
@CONF[:USE_SINGLELINE] = false
end
parser.on("--multiline", "Use multiline editor module (default).") do
@CONF[:USE_MULTILINE] = true
end
parser.on("--reidline", "Use multiline editor module (default).") do
warn <<~MSG.strip
--reidline is deprecated, please use --multiline instead.
MSG
@CONF[:USE_MULTILINE] = true
end
parser.on("--extra-doc-dir[=DIR]", "Add an extra doc dir for the doc dialog.") do |value|
@CONF[:EXTRA_DOC_DIRS] << value
end
parser.on("--echo", "Show result (default).") do
@CONF[:ECHO] = true
end
parser.on("--noecho", "Don't show result.") do
@CONF[:ECHO] = false
end
parser.on("--echo-on-assignment", "Show result on assignment.") do
@CONF[:ECHO_ON_ASSIGNMENT] = true
end
parser.on("--noecho-on-assignment", "Don't show result on assignment.") do
@CONF[:ECHO_ON_ASSIGNMENT] = false
end
parser.on("--truncate-echo-on-assignment", "Show truncated result on assignment (default).") do
@CONF[:ECHO_ON_ASSIGNMENT] = :truncate
end
parser.on("--verbose", "Show details.") do
@CONF[:VERBOSE] = true
end
parser.on("--noverbose", "Don't show details.") do
@CONF[:VERBOSE] = false
end
parser.on("--colorize", "Use color-highlighting (default).") do
@CONF[:USE_COLORIZE] = true
end
parser.on("--nocolorize", "Don't use color-highlighting.") do
@CONF[:USE_COLORIZE] = false
end
parser.on("--autocomplete", "Use auto-completion (default).") do
@CONF[:USE_AUTOCOMPLETE] = true
end
parser.on("--noautocomplete", "Don't use auto-completion.") do
@CONF[:USE_AUTOCOMPLETE] = false
end
parser.on("--regexp-completor", "Use Regexp based completion (default).") do
@CONF[:COMPLETOR] = :regexp
end
parser.on("--type-completor", "Use type based completion.") do
@CONF[:COMPLETOR] = :type
end
parser.on("--prompt-mode MODE', '--prompt MODE", "Set prompt mode. Pre-defined prompt modes are:", "'default', 'classic', 'simple', 'inf-ruby', 'xmp', 'null'.") do |value|
prompt_mode = value.upcase.tr("-", "_").intern
@CONF[:PROMPT_MODE] = prompt_mode
end
parser.on("--noprompt", "Don't output prompt.") do
@CONF[:PROMPT_MODE] = :NULL
end
parser.on("--script", "Script mode (default, treat first argument as script).") do
noscript = false
end
parser.on("--noscript", "No script mode (leave arguments in argv).") do
noscript = true
end
parser.on("--inf-ruby-mode", "Use prompt appropriate for inf-ruby-mode on emacs.", "Suppresses --multiline and --singleline.") do
@CONF[:PROMPT_MODE] = :INF_RUBY
end
parser.on("--sample-book-mode', '--simple-prompt", "Set prompt mode to 'simple'.") do
@CONF[:PROMPT_MODE] = :SIMPLE
end
parser.on("--tracer", "Show stack trace for each command.") do
@CONF[:USE_TRACER] = true
end
parser.on("--back-trace-limit[=N]", "Display backtrace top n and bottom n.") do |value|
@CONF[:BACK_TRACE_LIMIT] = value.to_i
end
parser.on("--context-mode[=N]", "Set n[0-4] to method to create Binding Object,", "when new workspace was created.") do |value|
@CONF[:CONTEXT_MODE] = value.to_i
end
parser.on("--single-irb", "Share self with sub-irb.") do
@CONF[:SINGLE_IRB] = true
end
parser.on("-v', '--version", "Print the version of irb.") do
print IRB.version, "\n"
exit 0
end

@CONF[:USE_MULTILINE] = true
when "--nomultiline", "--noreidline"
if opt == "--noreidline"
warn <<~MSG.strip
--noreidline is deprecated, please use --nomultiline instead.
MSG
end
noscript = false
options = { "back-trace-limit": 16, "regexp-completor": true, "script": true }

# so that OptionParser does not try to parse arguments after --
# ownargv, passdown = argv.split("--")
ownargv = argv
passdown = []
if(index_of_double_dash = argv.index("--"))
# if index_of_dd == 0
ownargv = argv[0..(index_of_double_dash-1)]
passdown = argv[index_of_double_dash..-1]
end

parser.parse!(ownargv, into: options)

@CONF[:USE_MULTILINE] = false
when /^--extra-doc-dir(?:=(.+))?/
opt = $1 || argv.shift
@CONF[:EXTRA_DOC_DIRS] << opt
when "--echo"
@CONF[:ECHO] = true
when "--noecho"
@CONF[:ECHO] = false
when "--echo-on-assignment"
@CONF[:ECHO_ON_ASSIGNMENT] = true
when "--noecho-on-assignment"
@CONF[:ECHO_ON_ASSIGNMENT] = false
when "--truncate-echo-on-assignment"
@CONF[:ECHO_ON_ASSIGNMENT] = :truncate
when "--verbose"
@CONF[:VERBOSE] = true
when "--noverbose"
@CONF[:VERBOSE] = false
when "--colorize"
@CONF[:USE_COLORIZE] = true
when "--nocolorize"
@CONF[:USE_COLORIZE] = false
when "--autocomplete"
@CONF[:USE_AUTOCOMPLETE] = true
when "--noautocomplete"
@CONF[:USE_AUTOCOMPLETE] = false
when "--regexp-completor"
@CONF[:COMPLETOR] = :regexp
when "--type-completor"
@CONF[:COMPLETOR] = :type
when /^--prompt-mode(?:=(.+))?/, /^--prompt(?:=(.+))?/
opt = $1 || argv.shift
prompt_mode = opt.upcase.tr("-", "_").intern
@CONF[:PROMPT_MODE] = prompt_mode
when "--noprompt"
@CONF[:PROMPT_MODE] = :NULL
when "--script"
noscript = false
when "--noscript"
noscript = true
when "--inf-ruby-mode"
@CONF[:PROMPT_MODE] = :INF_RUBY
when "--sample-book-mode", "--simple-prompt"
@CONF[:PROMPT_MODE] = :SIMPLE
when "--tracer"
@CONF[:USE_TRACER] = true
when /^--back-trace-limit(?:=(.+))?/
@CONF[:BACK_TRACE_LIMIT] = ($1 || argv.shift).to_i
when /^--context-mode(?:=(.+))?/
@CONF[:CONTEXT_MODE] = ($1 || argv.shift).to_i
when "--single-irb"
@CONF[:SINGLE_IRB] = true
when "-v", "--version"
print IRB.version, "\n"
exit 0
when "-h", "--help"
require_relative "help"
IRB.print_usage
exit 0
while opt = argv.shift
case opt
when "--"
if !noscript && (opt = argv.shift)
@CONF[:SCRIPT] = opt
Expand All @@ -395,6 +434,7 @@ def IRB.parse_opts(argv: ::ARGV)
$LOAD_PATH.unshift(*load_path)
end


# Run the config file
def IRB.run_config
if @CONF[:RC]
Expand Down
Loading