feat: update

Signed-off-by: kjuulh <contact@kjuulh.io>

cuddle/Cargo.toml

@@ -39,7 +39,7 @@ tempfile = { version = "3.10.0" }
 serde_json = "1.0.113"
 rlua = "0.19.8"
 rlua-searcher = "0.1.0"
-dotenv = { version = "0.15.0", features = ["clap"] }
+dotenvy = { version = "0.15.7" }
 blake3 = "1.5.0"
 tokio = { version = "1.36.0", features = ["full"] }
 futures-util = "0.3.30"

cuddle/src/cli/subcommands/init.rs

@@ -129,7 +129,7 @@ pub fn execute_init(exe_submatch: &ArgMatches, _cli: CuddleCli) -> anyhow::Resul
     if dir.count() != 0 {
         for entry in read_dir(&path)? {
             let entry = entry?;
-            if entry.file_name() == ".git" {
+            if entry.file_name() == ".git" || entry.file_name() == ".jj" {
                 continue;
             } else {
                 anyhow::bail!("Directory {} is not empty", &path);

cuddle/src/main.rs

@@ -11,7 +11,7 @@ mod util;
 
 fn main() -> anyhow::Result<()> {
     init_logging()?;
-    let _ = dotenv::dotenv();
+    let _ = dotenvy::dotenv();
 
     let config = CuddleConfig::from_env()?;
 

cuddle/src/model.rs

@@ -98,6 +98,7 @@ impl From<CuddlePlanVariables> for Vec<CuddleVariable> {
 pub enum CuddlePlanVar {
     Str(String),
     Nested(HashMap<String, CuddlePlanVar>),
+    Array(Vec<CuddlePlanVar>),
 }
 
 #[derive(Clone, Debug, PartialEq)]
@@ -120,6 +121,7 @@ impl From<HashMap<String, CuddlePlanVar>> for CuddleVariables {
 
                     variables.append(&mut combined_variables);
                 }
+                CuddlePlanVar::Array(_) => {}
             }
         }
 

schemas/base.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "additionalProperties": false,
+  "additionalProperties": true,
   "properties": {
     "base": {
       "title": "Base url from which to base current cuddle plan on",
@@ -27,6 +27,9 @@
             },
             {
               "type": "object"
+            },
+            {
+              "type": "array"
             }
           ]
         }