Merge pull request #1563 from kate-goldenring/plugin-list-desired-spin

fix(plugins): Display required Spin version of incompatible plugins
fermyon · Jun 8, 2023 · 414a285 · 414a285
2 parents 9bbd2db + 4715094
commit 414a285
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/crates/plugins/src/manifest.rs b/crates/plugins/src/manifest.rs
@@ -40,6 +40,10 @@ impl PluginManifest {
         self.license.as_ref()
     }
 
+    pub fn spin_compatibility(&self) -> String {
+        self.spin_compatibility.clone()
+    }
+
     pub fn description(&self) -> Option<&str> {
         self.description.as_deref()
     }

diff --git a/src/commands/plugins.rs b/src/commands/plugins.rs
@@ -353,10 +353,10 @@ impl List {
         } else {
             for p in plugins {
                 let installed = if p.installed { " [installed]" } else { "" };
-                let compat = match p.compatibility {
-                    PluginCompatibility::Compatible => "",
-                    PluginCompatibility::IncompatibleSpin => " [requires other Spin version]",
-                    PluginCompatibility::Incompatible => " [incompatible]",
+                let compat = match &p.compatibility {
+                    PluginCompatibility::Compatible => String::new(),
+                    PluginCompatibility::IncompatibleSpin(v) => format!(" [requires Spin {v}]"),
+                    PluginCompatibility::Incompatible => String::from(" [incompatible]"),
                 };
                 println!("{} {}{}{}", p.name, p.version, installed, compat);
             }
@@ -367,7 +367,7 @@ impl List {
 #[derive(Debug)]
 pub(crate) enum PluginCompatibility {
     Compatible,
-    IncompatibleSpin,
+    IncompatibleSpin(String),
     Incompatible,
 }
 
@@ -378,7 +378,7 @@ impl PluginCompatibility {
             if manifest.is_compatible_spin_version(spin_version) {
                 Self::Compatible
             } else {
-                Self::IncompatibleSpin
+                Self::IncompatibleSpin(manifest.spin_compatibility())
             }
         } else {
             Self::Incompatible