up: Move AppSource into its own module

Signed-off-by: Lann Martin <[email protected]>

Author: lann

src/commands/up.rs

@@ -1,7 +1,9 @@
+mod app_source;
+
 use std::{
     collections::HashSet,
     ffi::OsString,
-    fmt::{Debug, Display},
+    fmt::Debug,
     path::{Path, PathBuf},
 };
 
@@ -16,6 +18,8 @@ use tempfile::TempDir;
 
 use crate::opts::*;
 
+use self::app_source::AppSource;
+
 const APPLICATION_OPT: &str = "APPLICATION";
 
 /// Start the Fermyon runtime.
@@ -243,8 +247,8 @@ impl UpCommand {
     fn resolve_app_source(&self) -> AppSource {
         match (&self.app_source, &self.file_source, &self.registry_source) {
             (None, None, None) => self.default_manifest_or_none(),
-            (Some(source), None, None) => Self::infer_source(source),
-            (None, Some(file), None) => Self::infer_file_source(file.to_owned()),
+            (Some(source), None, None) => AppSource::infer_source(source),
+            (None, Some(file), None) => AppSource::infer_file_source(file.to_owned()),
             (None, None, Some(reference)) => AppSource::OciRegistry(reference.to_owned()),
             _ => AppSource::unresolvable("More than one application source was specified"),
         }
@@ -265,24 +269,6 @@ impl UpCommand {
         }
     }
 
-    fn infer_source(source: &str) -> AppSource {
-        let path = PathBuf::from(source);
-        if path.exists() {
-            Self::infer_file_source(path)
-        } else if spin_oci::is_probably_oci_reference(source) {
-            AppSource::OciRegistry(source.to_owned())
-        } else {
-            AppSource::Unresolvable(format!("File or directory '{source}' not found. If you meant to load from a registry, use the `--from-registry` option."))
-        }
-    }
-
-    fn infer_file_source(path: impl Into<PathBuf>) -> AppSource {
-        match spin_common::paths::resolve_manifest_file_path(path.into()) {
-            Ok(file) => AppSource::File(file),
-            Err(e) => AppSource::Unresolvable(e.to_string()),
-        }
-    }
-
     fn trigger_args_look_file_like(&self) -> bool {
         // Heuristic for the user typing `spin up foo` instead of `spin up -f foo` - in the
         // first case `foo` gets interpreted as a trigger arg which is probably not what the
@@ -430,50 +416,10 @@ fn trigger_command_from_locked_app(locked_app: &LockedApp) -> Result<Vec<String>
     }
 }
 
-#[derive(Debug, PartialEq, Eq)]
-enum AppSource {
-    None,
-    File(PathBuf),
-    OciRegistry(String),
-    Unresolvable(String),
-}
-
-impl AppSource {
-    fn unresolvable(message: impl Into<String>) -> Self {
-        Self::Unresolvable(message.into())
-    }
-
-    fn local_app_dir(&self) -> Option<&Path> {
-        match self {
-            Self::File(path) => path.parent().or_else(|| {
-                tracing::warn!("Error finding local app dir from source {path:?}");
-                None
-            }),
-            _ => None,
-        }
-    }
-
-    async fn build(&self) -> anyhow::Result<()> {
-        match self {
-            Self::File(path) => spin_build::build(path, &[]).await,
-            _ => Ok(()),
-        }
-    }
-}
-
-impl Display for AppSource {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            AppSource::None => write!(f, "<no source>"),
-            AppSource::File(path) => write!(f, "local app {path:?}"),
-            AppSource::OciRegistry(reference) => write!(f, "remote app {reference:?}"),
-            AppSource::Unresolvable(s) => write!(f, "unknown app source: {s:?}"),
-        }
-    }
-}
-
 #[cfg(test)]
 mod test {
+    use crate::commands::up::app_source::AppSource;
+
     use super::*;
 
     fn repo_path(path: &str) -> String {

src/commands/up/app_source.rs

@@ -0,0 +1,61 @@
+use std::path::{Path, PathBuf};
+
+#[derive(Debug, PartialEq, Eq)]
+pub enum AppSource {
+    None,
+    File(PathBuf),
+    OciRegistry(String),
+    Unresolvable(String),
+}
+
+impl AppSource {
+    pub fn infer_source(source: &str) -> Self {
+        let path = PathBuf::from(source);
+        if path.exists() {
+            Self::infer_file_source(path)
+        } else if spin_oci::is_probably_oci_reference(source) {
+            Self::OciRegistry(source.to_owned())
+        } else {
+            Self::Unresolvable(format!("File or directory '{source}' not found. If you meant to load from a registry, use the `--from-registry` option."))
+        }
+    }
+
+    pub fn infer_file_source(path: impl Into<PathBuf>) -> Self {
+        match spin_common::paths::resolve_manifest_file_path(path.into()) {
+            Ok(file) => Self::File(file),
+            Err(e) => Self::Unresolvable(e.to_string()),
+        }
+    }
+
+    pub fn unresolvable(message: impl Into<String>) -> Self {
+        Self::Unresolvable(message.into())
+    }
+
+    pub fn local_app_dir(&self) -> Option<&Path> {
+        match self {
+            Self::File(path) => path.parent().or_else(|| {
+                tracing::warn!("Error finding local app dir from source {path:?}");
+                None
+            }),
+            _ => None,
+        }
+    }
+
+    pub async fn build(&self) -> anyhow::Result<()> {
+        match self {
+            Self::File(path) => spin_build::build(path, &[]).await,
+            _ => Ok(()),
+        }
+    }
+}
+
+impl std::fmt::Display for AppSource {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::None => write!(f, "<no source>"),
+            Self::File(path) => write!(f, "local app {path:?}"),
+            Self::OciRegistry(reference) => write!(f, "remote app {reference:?}"),
+            Self::Unresolvable(s) => write!(f, "unknown app source: {s:?}"),
+        }
+    }
+}