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.

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

Add --quote-never flag to fmt subcommand. #217

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions src/cmd/fmt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ fmt options:
--ascii Use ASCII field and record separators.
--quote <arg> The quote character to use. [default: \"]
--quote-always Put quotes around every value.
--quote-never Never put quotes around any value.
--escape <arg> The escape character to use. When not specified,
quotes are escaped by doubling them.

Expand All @@ -43,6 +44,7 @@ struct Args {
flag_delimiter: Option<Delimiter>,
flag_quote: Delimiter,
flag_quote_always: bool,
flag_quote_never: bool,
flag_escape: Option<Delimiter>,
}

Expand All @@ -63,6 +65,8 @@ pub fn run(argv: &[&str]) -> CliResult<()> {
}
if args.flag_quote_always {
wconfig = wconfig.quote_style(csv::QuoteStyle::Always);
} else if args.flag_quote_never {
wconfig = wconfig.quote_style(csv::QuoteStyle::Never);
}
if let Some(escape) = args.flag_escape {
wconfig = wconfig.escape(Some(escape.as_byte())).double_quote(false);
Expand Down
27 changes: 23 additions & 4 deletions tests/test_fmt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ fn setup(name: &str) -> (Workdir, process::Command) {
svec!["h1", "h2"],
svec!["abcdef", "ghijkl"],
svec!["mnopqr", "stuvwx"],
svec!["ab\"cd\"ef", "gh,ij,kl"],
];

let wrk = Workdir::new(name);
Expand All @@ -27,7 +28,8 @@ fn fmt_delimiter() {
let expected = "\
h1\th2
abcdef\tghijkl
mnopqr\tstuvwx";
mnopqr\tstuvwx
\"ab\"\"cd\"\"ef\"\tgh,ij,kl";
assert_eq!(got, expected.to_string());
}

Expand All @@ -40,7 +42,8 @@ fn fmt_weird_delimiter() {
let expected = "\
\"h1\"h\"h2\"
abcdefh\"ghijkl\"
mnopqrhstuvwx";
mnopqrhstuvwx
\"ab\"\"cd\"\"ef\"h\"gh,ij,kl\"";
assert_eq!(got, expected.to_string());
}

Expand All @@ -53,7 +56,8 @@ fn fmt_crlf() {
let expected = "\
h1,h2\r
abcdef,ghijkl\r
mnopqr,stuvwx";
mnopqr,stuvwx\r
\"ab\"\"cd\"\"ef\",\"gh,ij,kl\"";
assert_eq!(got, expected.to_string());
}

Expand All @@ -66,6 +70,21 @@ fn fmt_quote_always() {
let expected = "\
\"h1\",\"h2\"
\"abcdef\",\"ghijkl\"
\"mnopqr\",\"stuvwx\"";
\"mnopqr\",\"stuvwx\"
\"ab\"\"cd\"\"ef\",\"gh,ij,kl\"";
assert_eq!(got, expected.to_string());
}

#[test]
fn fmt_quote_never() {
let (wrk, mut cmd) = setup("fmt_quote_never");
cmd.arg("--quote-never");

let got: String = wrk.stdout(&mut cmd);
let expected = "\
h1,h2
abcdef,ghijkl
mnopqr,stuvwx
ab\"cd\"ef,gh,ij,kl";
assert_eq!(got, expected.to_string());
}