Touchups to external values

src/commands/classified.rs

@@ -240,15 +240,11 @@ impl ExternalCommand {
                                 span = Some(arg.span);
                             }
                         }
-                        if let Some(span) = span {
+                        return Err(ShellError::maybe_labeled_error(
-                            return Err(ShellError::labeled_error(
                             "External $it needs string data",
                             "given object instead of string data",
                             span,
                         ));
-                        } else {
-                            return Err(ShellError::string("Error: $it needs string data"));
-                        }
                     }
                     if !first {
                         new_arg_string.push_str("&&");

src/object/base.rs

@@ -291,7 +291,12 @@ impl Value {
 
     crate fn as_string(&self) -> Result<String, ShellError> {
         match self {
-            Value::Primitive(Primitive::String(s)) => Ok(s.clone()),
+            Value::Primitive(Primitive::String(x)) => Ok(format!("{}", x)),
+            Value::Primitive(Primitive::Boolean(x)) => Ok(format!("{}", x)),
+            Value::Primitive(Primitive::Float(x)) => Ok(format!("{}", x.into_inner())),
+            Value::Primitive(Primitive::Int(x)) => Ok(format!("{}", x)),
+            Value::Primitive(Primitive::Bytes(x)) => Ok(format!("{}", x)),
+            //Value::Primitive(Primitive::String(s)) => Ok(s.clone()),
             // TODO: this should definitely be more general with better errors
             other => Err(ShellError::string(format!(
                 "Expected string, got {:?}",

tests/external_num.out

@@ -0,0 +1 @@
+10

tests/external_num.txt

@@ -0,0 +1,3 @@
+cd tests
+open test.json | get glossary.GlossDiv.GlossList.GlossEntry.Height | echo $it
+exit

tests/test.json

@@ -10,9 +10,13 @@
                     "GlossTerm": "Standard Generalized Markup Language",
                     "Acronym": "SGML",
                     "Abbrev": "ISO 8879:1986",
+                    "Height": 10,
                     "GlossDef": {
                         "para": "A meta-markup language, used to create markup languages such as DocBook.",
-						"GlossSeeAlso": ["GML", "XML"]
+                        "GlossSeeAlso": [
+                            "GML",
+                            "XML"
+                        ]
                     },
                     "GlossSee": "markup"
                 }

tests/tests.rs

@@ -101,4 +101,10 @@ mod tests {
     fn lines() {
         test_helper("lines");
     }
+
+
+    #[test]
+    fn external_num() {
+        test_helper("external_num");
+    }
 }