From c7fb0ff1c68134276b67ef21d701db83e26a02a9 Mon Sep 17 00:00:00 2001 From: BurdetteLamar Date: Fri, 28 Feb 2025 13:33:15 -0600 Subject: [PATCH 1/7] csv-filter: add --output_quote_char --- bin/csv-filter | 5 +++++ test/csv/test_csv_filter.rb | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/bin/csv-filter b/bin/csv-filter index 8eddc538..e3a8655b 100755 --- a/bin/csv-filter +++ b/bin/csv-filter @@ -32,6 +32,11 @@ parser.on('--output-col-sep=SEPARATOR', options[:output_col_sep] = value end +parser.on('--output-quote_char=SEPARATOR', + 'Output quote character.') do |value| + options[:output_quote_char] = value +end + parser.on('--output-row-sep=SEPARATOR', 'Output row separator string.') do |value| options[:output_row_sep] = value diff --git a/test/csv/test_csv_filter.rb b/test/csv/test_csv_filter.rb index dc9f432a..bc5df7a6 100644 --- a/test/csv/test_csv_filter.rb +++ b/test/csv/test_csv_filter.rb @@ -90,6 +90,17 @@ def test_option_output_col_sep run_csv_filter(csv, "--output-col-sep=:")) end + def test_option_output_quote_char + output_quote_char = "'" + str = CSV.generate do |csv| + csv << ['foo', 0] + csv << ["'bar'", 1] + csv << ['"baz"', 2] + end + assert_equal(["foo,0\n" + "'''bar''',1\n" + "\"baz\",2\n", ""], + run_csv_filter(str, "--output-quote_char=#{output_quote_char}")) + end + def test_option_output_row_sep csv = "aaa,bbb,ccc\nddd,eee,fff\n" assert_equal(["aaa,bbb,ccc:ddd,eee,fff:", ""], From e3ea57e08cb6b1ca4b92eb033b554bbc36f83547 Mon Sep 17 00:00:00 2001 From: BurdetteLamar Date: Sat, 1 Mar 2025 15:35:23 -0600 Subject: [PATCH 2/7] csv-filter: add --output-quote-char --- bin/csv-filter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/csv-filter b/bin/csv-filter index e3a8655b..4121ee68 100755 --- a/bin/csv-filter +++ b/bin/csv-filter @@ -32,7 +32,7 @@ parser.on('--output-col-sep=SEPARATOR', options[:output_col_sep] = value end -parser.on('--output-quote_char=SEPARATOR', +parser.on('--output-quote-char=SEPARATOR', 'Output quote character.') do |value| options[:output_quote_char] = value end From d3ed6f663e64d079963ffe36b5f9bccc032a8fab Mon Sep 17 00:00:00 2001 From: Burdette Lamar Date: Tue, 11 Mar 2025 08:57:33 -0500 Subject: [PATCH 3/7] Update test/csv/test_csv_filter.rb Co-authored-by: Sutou Kouhei --- test/csv/test_csv_filter.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/csv/test_csv_filter.rb b/test/csv/test_csv_filter.rb index bc5df7a6..ec5e7a87 100644 --- a/test/csv/test_csv_filter.rb +++ b/test/csv/test_csv_filter.rb @@ -97,7 +97,7 @@ def test_option_output_quote_char csv << ["'bar'", 1] csv << ['"baz"', 2] end - assert_equal(["foo,0\n" + "'''bar''',1\n" + "\"baz\",2\n", ""], + assert_equal(["foo,0\n'''bar''',1\n\"baz\",2\n", ""], run_csv_filter(str, "--output-quote_char=#{output_quote_char}")) end From be1018d256eebf228816cf8bc8c2e28856bf352a Mon Sep 17 00:00:00 2001 From: Burdette Lamar Date: Tue, 11 Mar 2025 16:21:53 -0500 Subject: [PATCH 4/7] Update test/csv/test_csv_filter.rb Co-authored-by: Sutou Kouhei --- test/csv/test_csv_filter.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/test/csv/test_csv_filter.rb b/test/csv/test_csv_filter.rb index ec5e7a87..04e67b1e 100644 --- a/test/csv/test_csv_filter.rb +++ b/test/csv/test_csv_filter.rb @@ -92,11 +92,7 @@ def test_option_output_col_sep def test_option_output_quote_char output_quote_char = "'" - str = CSV.generate do |csv| - csv << ['foo', 0] - csv << ["'bar'", 1] - csv << ['"baz"', 2] - end + csv = "foo,0\n'bar',1\n\"baz\",2\n" assert_equal(["foo,0\n'''bar''',1\n\"baz\",2\n", ""], run_csv_filter(str, "--output-quote_char=#{output_quote_char}")) end From fb746ddce21818a5a181beb63089de6a8ae4a3d5 Mon Sep 17 00:00:00 2001 From: Burdette Lamar Date: Fri, 21 Mar 2025 10:19:26 -0500 Subject: [PATCH 5/7] Update test_csv_filter.rb Fix variable name. --- test/csv/test_csv_filter.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/csv/test_csv_filter.rb b/test/csv/test_csv_filter.rb index 04e67b1e..9e7fab77 100644 --- a/test/csv/test_csv_filter.rb +++ b/test/csv/test_csv_filter.rb @@ -94,7 +94,7 @@ def test_option_output_quote_char output_quote_char = "'" csv = "foo,0\n'bar',1\n\"baz\",2\n" assert_equal(["foo,0\n'''bar''',1\n\"baz\",2\n", ""], - run_csv_filter(str, "--output-quote_char=#{output_quote_char}")) + run_csv_filter(csv, "--output-quote_char=#{output_quote_char}")) end def test_option_output_row_sep From 735c55a1edd6a17af5ebc4786ae8434f7d6a018f Mon Sep 17 00:00:00 2001 From: Burdette Lamar Date: Fri, 21 Mar 2025 10:30:29 -0500 Subject: [PATCH 6/7] Update test_csv_filter.rb --- test/csv/test_csv_filter.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/csv/test_csv_filter.rb b/test/csv/test_csv_filter.rb index 9e7fab77..41c772a0 100644 --- a/test/csv/test_csv_filter.rb +++ b/test/csv/test_csv_filter.rb @@ -93,7 +93,7 @@ def test_option_output_col_sep def test_option_output_quote_char output_quote_char = "'" csv = "foo,0\n'bar',1\n\"baz\",2\n" - assert_equal(["foo,0\n'''bar''',1\n\"baz\",2\n", ""], + assert_equal(["foo,0\n" + "'''bar''',1\n" + "baz,2\n", ""], run_csv_filter(csv, "--output-quote_char=#{output_quote_char}")) end From b69f0ff08bea4f79e87467866baa442be0d0a2cc Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Sat, 22 Mar 2025 16:08:02 +0900 Subject: [PATCH 7/7] Remove needless + --- test/csv/test_csv_filter.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/csv/test_csv_filter.rb b/test/csv/test_csv_filter.rb index 41c772a0..c806358f 100644 --- a/test/csv/test_csv_filter.rb +++ b/test/csv/test_csv_filter.rb @@ -93,7 +93,7 @@ def test_option_output_col_sep def test_option_output_quote_char output_quote_char = "'" csv = "foo,0\n'bar',1\n\"baz\",2\n" - assert_equal(["foo,0\n" + "'''bar''',1\n" + "baz,2\n", ""], + assert_equal(["foo,0\n'''bar''',1\nbaz,2\n", ""], run_csv_filter(csv, "--output-quote_char=#{output_quote_char}")) end