Merge pull request #5 from developmentseed/cql2textout

Add round trip back to CQL2 Text, Start output work for SQL, Add Commands

Cargo.toml

@@ -13,4 +13,6 @@ pest_derive = "2.7.11"
 rstest = "0.21.0"
 serde = "1.0.204"
 serde_derive = "1.0.204"
-serde_json = "1.0.120"
+serde_json = { version = "1.0.120", features = ["preserve_order"] }
+assert-json-diff = "2.0.2"
+atty = "0.2.14"

src/bin/cql2json.rs

@@ -0,0 +1,29 @@
+use atty::Stream;
+use cql2::parse;
+use std::env;
+use std::io;
+use std::process::ExitCode;
+
+fn main() -> ExitCode {
+    let args: Vec<String> = env::args().collect();
+    let mut buffer = String::new();
+    if args.len() >= 2 {
+        buffer = args[1].to_string();
+    } else if atty::isnt(Stream::Stdin) {
+        io::stdin().read_line(&mut buffer).unwrap();
+    } else {
+        println!("Enter CQL2 as Text or JSON, then hit return");
+        io::stdin().read_line(&mut buffer).unwrap();
+    }
+    let parsed = parse(&buffer);
+    if args.len() == 3 && args[2] == "pretty" {
+        println!("{}", parsed.as_json_pretty());
+    } else {
+        println!("{}", parsed.as_json());
+    }
+
+    if parsed.validate() {
+        return 0.into();
+    }
+    1.into()
+}

src/bin/cql2text.rs

@@ -0,0 +1,24 @@
+use atty::Stream;
+use cql2::parse;
+use std::env;
+use std::io;
+use std::process::ExitCode;
+
+fn main() -> ExitCode {
+    let args: Vec<String> = env::args().collect();
+    let mut buffer = String::new();
+    if args.len() == 2 {
+        buffer = args[1].to_string();
+    } else if atty::isnt(Stream::Stdin) {
+        io::stdin().read_line(&mut buffer).unwrap();
+    } else {
+        println!("Enter CQL2 as Text or JSON, then hit return");
+        io::stdin().read_line(&mut buffer).unwrap();
+    }
+    let parsed = parse(&buffer);
+    println!("{}", parsed.as_cql2_text());
+    if parsed.validate() {
+        return 0.into();
+    }
+    1.into()
+}