From 50e8f33d1ea925d1bc3d8710879f700293ff2bfa Mon Sep 17 00:00:00 2001 From: Maciej Rzasa Date: Mon, 8 Aug 2022 16:55:58 +0200 Subject: [PATCH 1/2] Don't treat empty string as an option description --- lib/optparse.rb | 2 +- test/optparse/test_summary.rb | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/lib/optparse.rb b/lib/optparse.rb index 1d42c79..9dad2e4 100644 --- a/lib/optparse.rb +++ b/lib/optparse.rb @@ -1502,7 +1502,7 @@ def make_switch(opts, block = nil) 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 6b36ce3..10c9b2e 100644 --- a/test/optparse/test_summary.rb +++ b/test/optparse/test_summary.rb @@ -55,4 +55,28 @@ def test_ver 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 + puts s + + 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 From 59cc6307001aae9bb5fdd551cb464393d408e5c4 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 8 Oct 2022 19:28:30 +0900 Subject: [PATCH 2/2] Remove debug print --- test/optparse/test_summary.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/test/optparse/test_summary.rb b/test/optparse/test_summary.rb index 10c9b2e..b5dcb35 100644 --- a/test/optparse/test_summary.rb +++ b/test/optparse/test_summary.rb @@ -68,7 +68,6 @@ def test_very_long_without_short end s = o.summarize - puts s assert_match(/^\s*--long-long-option-param-without-short$/, s[0]) assert_match(/^\s*Error desc$/, s[1])