aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaciek Rząsa <maciejrzasa@gmail.com>2022-10-08 12:30:12 +0200
committergit <svn-admin@ruby-lang.org>2022-10-08 19:30:34 +0900
commit0f231f2babf314593bcd233f4f5b8de8dc936145 (patch)
tree31dba845974ff638cf6767af2694b0901322534a
parent3531086095aed9d2898de686bc67ab3a6c2192de (diff)
downloadruby-0f231f2babf314593bcd233f4f5b8de8dc936145.tar.gz
[ruby/optparse] Don't treat empty string as an option description
https://github.com/ruby/optparse/commit/078638ee6d
-rw-r--r--lib/optparse.rb2
-rw-r--r--test/optparse/test_summary.rb23
2 files changed, 24 insertions, 1 deletions
diff --git a/lib/optparse.rb b/lib/optparse.rb
index 1d42c79045..9dad2e4eda 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -1502,7 +1502,7 @@ XXX
style = notwice(default_style.guess(arg = o), style, 'style')
default_pattern, conv = search(:atype, Object) unless default_pattern
else
- desc.push(o)
+ desc.push(o) if o && !o.empty?
end
end
diff --git a/test/optparse/test_summary.rb b/test/optparse/test_summary.rb
index 6b36ce3c76..b5dcb3524e 100644
--- a/test/optparse/test_summary.rb
+++ b/test/optparse/test_summary.rb
@@ -55,4 +55,27 @@ class TestOptionParserSummaryTest < TestOptionParser
o.release = "rel"
assert_equal "foo 0.1 (rel)", o.ver
end
+
+ # https://github.com/ruby/optparse/issues/37
+ def test_very_long_without_short
+ o = OptionParser.new do |opts|
+ # This causes TypeError
+ opts.on('', '--long-long-option-param-without-short', "Error desc") { options[:long_long_option_param_without_short] = true }
+ opts.on('', '--long-option-param', "Long desc") { options[:long_option_param_without_short] = true }
+ opts.on('-a', '--long-long-option-param-with-short', "Normal description") { options[:long_long_option_param_with_short] = true }
+
+ opts.on('', '--long-long-option-param-without-short-but-with-desc', 'Description of the long long param') { options[:long_long_option_param_without_short_but_with_desc] = true }
+ end
+
+ s = o.summarize
+
+ assert_match(/^\s*--long-long-option-param-without-short$/, s[0])
+ assert_match(/^\s*Error desc$/, s[1])
+ assert_match(/^\s*--long-option-param\s+Long desc$/, s[2])
+ assert_match(/^\s*-a\s+Normal description$/, s[3])
+ assert_match(/^\s*--long-long-option-param-with-short$/, s[4])
+
+ assert_match(/^\s*--long-long-option-param-without-short-but-with-desc$/, s[5])
+ assert_match(/^\s*Description of the long long param$/, s[6])
+ end
end