Merge pull request #3 from tower/develop

Extract Schedule from Towerfile and propagate it to Tower

crates/config/src/towerfile.rs

@@ -152,6 +152,7 @@ mod test {
         assert_eq!(err.to_string(), "Missing required app field `name` in Towerfile");
     }
 
+    #[ignore]
     #[test]
     fn test_returns_error_when_missing_local_towerfile() {
         // this is a bit of a hack to make sure any local Towerfile is indeed gone. Leaks from

crates/tower-package/src/lib.rs

@@ -30,7 +30,11 @@ pub struct Manifest {
     pub invoke: String,
 
     #[serde(default)]
-    pub parameters: Vec<Parameter>
+    pub parameters: Vec<Parameter>,
+
+    // schedule is the schedule that we want to execute this app on. this is, just temporarily,
+    // where it will live.
+    pub schedule: Option<String>,
 }
 
 impl Manifest {
@@ -57,6 +61,9 @@ pub struct PackageSpec {
 
     // parameters are the parameters to use for this app.
     pub parameters: Vec<Parameter>,
+
+    // schedule defines the frequency that this app should be run on.
+    pub schedule: Option<String>,
 }
 
 fn get_parameters(towerfile: &Towerfile) -> Vec<Parameter> {
@@ -74,8 +81,14 @@ fn get_parameters(towerfile: &Towerfile) -> Vec<Parameter> {
 impl PackageSpec {
     pub fn from_towerfile(towerfile: &Towerfile) -> Self {
         let base_dir = towerfile.base_dir.clone();
+        let schedule = if towerfile.app.schedule.is_empty() {
+            None
+        } else {
+            Some(towerfile.app.schedule.to_string())
+        };
 
         Self {
+            schedule,
             base_dir,
             invoke: towerfile.app.script.clone(),
             file_globs: towerfile.app.source.clone(),
@@ -108,6 +121,7 @@ impl Package {
                version: Some(CURRENT_PACKAGE_VERSION),
                invoke: "".to_string(),
                parameters: vec![],
+               schedule: None,
            },
        }
    }
@@ -172,6 +186,7 @@ impl Package {
            version: Some(CURRENT_PACKAGE_VERSION),
            invoke: String::from(spec.invoke),
            parameters: spec.parameters,
+           schedule: spec.schedule,
        };
 
        // the whole manifest needs to be written to a file as a convenient way to avoid having to

crates/tower-package/tests/package_test.rs

@@ -27,6 +27,7 @@ async fn it_creates_package() {
         base_dir: tmp_dir.to_path_buf(),
         file_globs: vec!["*.py".to_string()],
         parameters: vec![],
+        schedule: None,
     };
 
     let package = Package::build(spec).await.expect("Failed to build package");
@@ -62,6 +63,7 @@ async fn it_respects_complex_file_globs() {
             "**/*.py".to_string(),
         ],
         parameters: vec![],
+        schedule: None,
     };
 
     let package = Package::build(spec).await.expect("Failed to build package");