Merge master

README.md

@@ -25,7 +25,8 @@ Nu currently has the following built-in commands:
 -   to-json
 -   from-json
 -   open filename
--   split sep ...fields
+-   split-column sep ...fields
+-   split-row sep ...fields
 -   select field 
 
 # Goals

src/cli.rs

@@ -52,8 +52,8 @@ pub async fn cli() -> Result<(), Box<Error>> {
             command("from-json", from_json::from_json),
             command("open", open::open),
             command("column", column::column),
-            command("column-split", col_split::col_split),
+            command("split-column", split_column::split_column),
-            command("row-split", row_split::row_split),
+            command("split-row", split_row::split_row),
             command("reject", reject::reject),
             command("select", select::select),
             command("to-array", to_array::to_array),
@@ -212,14 +212,11 @@ async fn process_line(readline: Result<String, ReadlineError>, ctx: &mut Context
                     },
 
                     (
-                        Some(ClassifiedCommand::Internal(ref i)),
+                        Some(ClassifiedCommand::Internal(left)),
-                        Some(ClassifiedCommand::External(ref e)),
+                        Some(ClassifiedCommand::External(_)),
-                    ) => {
+                    ) => match left.run(ctx, input).await {
-                        return LineResult::Error(ShellError::string(&format!(
+                        Ok(val) => ClassifiedInputStream::from_input_stream(val),
-                            "Unimplemented Internal({}) -> External({})",
+                        Err(err) => return LineResult::Error(err),
-                            i.name(),
-                            e.name()
-                        )))
                     }
 
                     (

src/commands.rs

@@ -12,8 +12,8 @@ crate mod select;
 crate mod size;
 crate mod skip;
 crate mod sort_by;
-crate mod col_split;
+crate mod split_column;
-crate mod row_split;
+crate mod split_row;
 crate mod take;
 crate mod to_array;
 crate mod to_json;

src/commands/select.rs

@@ -1,6 +1,5 @@
 use crate::errors::ShellError;
 use crate::object::Value;
-use crate::object::base::select_fields;
 use crate::prelude::*;
 
 fn get_member(path: &str, obj: &Value) -> Option<Value> {

src/commands/split_column.rs

@@ -5,8 +5,7 @@ use log::debug;
 
 // TODO: "Amount remaining" wrapper
 
-pub fn col_split(args: CommandArgs) -> Result<OutputStream, ShellError> {
+pub fn split_column(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    //let splitter = args.args[0].as_string()?;
     let input = args.input;
     let args = args.args;
 

src/commands/split_row.rs

@@ -5,8 +5,7 @@ use log::debug;
 
 // TODO: "Amount remaining" wrapper
 
-pub fn row_split(args: CommandArgs) -> Result<OutputStream, ShellError> {
+pub fn split_row(args: CommandArgs) -> Result<OutputStream, ShellError> {
-    //let splitter = args.args[0].as_string()?;
     let input = args.input;
     let args = args.args;
 
@@ -26,8 +25,7 @@ pub fn row_split(args: CommandArgs) -> Result<OutputStream, ShellError> {
                 result
             }
             _ => {
-                let mut result = VecDeque::new();
+                let result = VecDeque::new();
-                //result.push_back(ReturnValue::Value(Value::Object(crate::object::Dictionary::default())));
                 result
             }
         })