From 91072cc4e6b6654633c88d3a8bcaa7072658843f Mon Sep 17 00:00:00 2001
From: kjuulh <contact@kjuulh.io>
Date: Wed, 10 Aug 2022 23:31:07 +0200
Subject: [PATCH] update schema to include variables

---
 cuddle_cli/src/actions/shell.rs | 20 ++++++++++----------
 cuddle_cli/src/context.rs       |  8 +++++---
 schemas/base.json               | 21 ++++++++++++++++++++-
 3 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/cuddle_cli/src/actions/shell.rs b/cuddle_cli/src/actions/shell.rs
index 45c1df1..36ed98a 100644
--- a/cuddle_cli/src/actions/shell.rs
+++ b/cuddle_cli/src/actions/shell.rs
@@ -28,18 +28,18 @@ Starting running shell action: {}
 
         let mut process = Command::new(self.path)
             .current_dir(".")
-            .stdout(Stdio::piped())
-            .stderr(Stdio::piped())
+            //.stdout(Stdio::piped())
+            //.stderr(Stdio::piped())
             .spawn()?;
 
-        {
-            let stdout = process.stdout.as_mut().unwrap();
-            let stdout_reader = BufReader::new(stdout);
-            let mut stdout_lines = stdout_reader.lines();
-            while let Some(Ok(line)) = stdout_lines.next() {
-                log::info!(process=log::as_display!(self.name); "{}", line)
-            }
-        }
+        //{
+        //    let stdout = process.stdout.as_mut().unwrap();
+        //    let stdout_reader = BufReader::new(stdout);
+        //    let mut stdout_lines = stdout_reader.lines();
+        //    while let Some(Ok(line)) = stdout_lines.next() {
+        //        log::info!("{}", line);
+        //    }
+        //}
 
         process.wait()?;
 
diff --git a/cuddle_cli/src/context.rs b/cuddle_cli/src/context.rs
index bfa5518..27015eb 100644
--- a/cuddle_cli/src/context.rs
+++ b/cuddle_cli/src/context.rs
@@ -23,12 +23,14 @@ pub fn extract_cuddle(config: CuddleConfig) -> anyhow::Result<Arc<Mutex<Vec<Cudd
     curr_dir.push(".cuddle/");
     let fetch_policy = config.get_fetch_policy()?;
     if let CuddleFetchPolicy::Always = fetch_policy {
-        if let Err(res) = std::fs::remove_dir_all(curr_dir) {
-            panic!("{}", res)
+        if curr_dir.exists() {
+            if let Err(res) = std::fs::remove_dir_all(curr_dir) {
+                panic!("{}", res)
+            }
         }
     }
 
-    // Load main cuddle file
+    // Load main cuddle file.
     let cuddle_yaml = find_root_cuddle()?;
     log::trace!(cuddle_yaml=log::as_debug!(cuddle_yaml); "Find root cuddle");
 
diff --git a/schemas/base.json b/schemas/base.json
index 49690ad..4daa12c 100644
--- a/schemas/base.json
+++ b/schemas/base.json
@@ -16,10 +16,28 @@
         }
       ]
     },
+    "vars": {
+      "type": "object",
+      "title": "your collection of variables to be available to cuddle",
+      "patternProperties": {
+        "^.*$": {
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "object"
+            }
+          ]
+        }
+      },
+      "additionalProperties": false
+    },
     "scripts": {
       "type": "object",
       "title": "Scripts the cuddle cli can execute",
       "description": "Scripts the cuddle cli can execute 'cuddle x my-awesome-script'",
+      "additionalProperties": false,
       "patternProperties": {
         "^.*$": {
           "required": [
@@ -34,7 +52,8 @@
             },
             "description": {
               "type": "string"
-            }
+            },
+            "additionalProperties": false
           }
         }
       }