Ensure stable plugins get installed. (#1373)

crates/nu_plugin_tree/src/lib.rs

@@ -0,0 +1,4 @@
+mod nu;
+mod tree;
+
+pub use tree::TreeViewer;

crates/nu_plugin_tree/src/main.rs

@@ -1,100 +1,5 @@
-use derive_new::new;
-use nu_errors::ShellError;
-use nu_plugin::{serve_plugin, Plugin};
-use nu_protocol::{format_primitive, CallInfo, Signature, UntaggedValue, Value};
-use ptree::item::StringItem;
-use ptree::output::print_tree_with;
-use ptree::print_config::PrintConfig;
-use ptree::style::{Color, Style};
-use ptree::TreeBuilder;
-
-#[derive(new)]
-pub struct TreeView {
-    tree: StringItem,
-}
-
-impl TreeView {
-    fn from_value_helper(value: &UntaggedValue, mut builder: &mut TreeBuilder) {
-        match value {
-            UntaggedValue::Primitive(p) => {
-                let _ = builder.add_empty_child(format_primitive(p, None));
-            }
-            UntaggedValue::Row(o) => {
-                for (k, v) in o.entries.iter() {
-                    builder = builder.begin_child(k.clone());
-                    Self::from_value_helper(v, builder);
-                    builder = builder.end_child();
-                }
-            }
-            UntaggedValue::Table(l) => {
-                for elem in l.iter() {
-                    Self::from_value_helper(elem, builder);
-                }
-            }
-            _ => {}
-        }
-    }
-
-    fn from_value(value: &Value) -> TreeView {
-        let descs = value.data_descriptors();
-
-        let mut tree = TreeBuilder::new("".to_string());
-        let mut builder = &mut tree;
-
-        for desc in descs {
-            let value = match &value.value {
-                UntaggedValue::Row(d) => d.get_data(&desc).borrow().clone(),
-                _ => value.clone(),
-            };
-            builder = builder.begin_child(desc.clone());
-            Self::from_value_helper(&value, &mut builder);
-            builder = builder.end_child();
-            //entries.push((desc.name.clone(), value.borrow().copy()))
-        }
-
-        TreeView::new(builder.build())
-    }
-
-    fn render_view(&self) -> Result<(), ShellError> {
-        // Set up the print configuration
-        let config = {
-            let mut config = PrintConfig::from_env();
-            config.branch = Style {
-                foreground: Some(Color::Green),
-                dimmed: true,
-                ..Style::default()
-            };
-            config.leaf = Style {
-                bold: true,
-                ..Style::default()
-            };
-            config.indent = 4;
-            config
-        };
-
-        // Print out the tree using custom formatting
-        print_tree_with(&self.tree, &config)?;
-
-        Ok(())
-    }
-}
-
-struct TreeViewer;
-
-impl Plugin for TreeViewer {
-    fn config(&mut self) -> Result<Signature, ShellError> {
-        Ok(Signature::build("tree").desc("View the contents of the pipeline as a tree."))
-    }
-
-    fn sink(&mut self, _call_info: CallInfo, input: Vec<Value>) {
-        if !input.is_empty() {
-            for i in input.iter() {
-                let view = TreeView::from_value(&i);
-                let _ = view.render_view();
-            }
-        }
-    }
-}
+use nu_plugin::serve_plugin;
+use nu_plugin_tree::TreeViewer;
 
 fn main() {
     serve_plugin(&mut TreeViewer);

crates/nu_plugin_tree/src/nu/mod.rs

@@ -0,0 +1,21 @@
+use nu_errors::ShellError;
+use nu_plugin::Plugin;
+use nu_protocol::{CallInfo, Signature, Value};
+
+use crate::tree::TreeView;
+use crate::TreeViewer;
+
+impl Plugin for TreeViewer {
+    fn config(&mut self) -> Result<Signature, ShellError> {
+        Ok(Signature::build("tree").desc("View the contents of the pipeline as a tree."))
+    }
+
+    fn sink(&mut self, _call_info: CallInfo, input: Vec<Value>) {
+        if !input.is_empty() {
+            for i in input.iter() {
+                let view = TreeView::from_value(&i);
+                let _ = view.render_view();
+            }
+        }
+    }
+}

crates/nu_plugin_tree/src/tree.rs

@@ -0,0 +1,80 @@
+use derive_new::new;
+use nu_errors::ShellError;
+use nu_protocol::{format_primitive, UntaggedValue, Value};
+use ptree::item::StringItem;
+use ptree::output::print_tree_with;
+use ptree::print_config::PrintConfig;
+use ptree::style::{Color, Style};
+use ptree::TreeBuilder;
+
+pub struct TreeViewer;
+#[derive(new)]
+pub struct TreeView {
+    tree: StringItem,
+}
+
+impl TreeView {
+    fn from_value_helper(value: &UntaggedValue, mut builder: &mut TreeBuilder) {
+        match value {
+            UntaggedValue::Primitive(p) => {
+                let _ = builder.add_empty_child(format_primitive(p, None));
+            }
+            UntaggedValue::Row(o) => {
+                for (k, v) in o.entries.iter() {
+                    builder = builder.begin_child(k.clone());
+                    Self::from_value_helper(v, builder);
+                    builder = builder.end_child();
+                }
+            }
+            UntaggedValue::Table(l) => {
+                for elem in l.iter() {
+                    Self::from_value_helper(elem, builder);
+                }
+            }
+            _ => {}
+        }
+    }
+
+    pub fn from_value(value: &Value) -> TreeView {
+        let descs = value.data_descriptors();
+
+        let mut tree = TreeBuilder::new("".to_string());
+        let mut builder = &mut tree;
+
+        for desc in descs {
+            let value = match &value.value {
+                UntaggedValue::Row(d) => d.get_data(&desc).borrow().clone(),
+                _ => value.clone(),
+            };
+            builder = builder.begin_child(desc.clone());
+            Self::from_value_helper(&value, &mut builder);
+            builder = builder.end_child();
+            //entries.push((desc.name.clone(), value.borrow().copy()))
+        }
+
+        TreeView::new(builder.build())
+    }
+
+    pub fn render_view(&self) -> Result<(), ShellError> {
+        // Set up the print configuration
+        let config = {
+            let mut config = PrintConfig::from_env();
+            config.branch = Style {
+                foreground: Some(Color::Green),
+                dimmed: true,
+                ..Style::default()
+            };
+            config.leaf = Style {
+                bold: true,
+                ..Style::default()
+            };
+            config.indent = 4;
+            config
+        };
+
+        // Print out the tree using custom formatting
+        print_tree_with(&self.tree, &config)?;
+
+        Ok(())
+    }
+}