Improved logging, new artifactory token handling, improved run argument handling

Author: jasal82

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "mb"
-version = "0.7.1"
+version = "0.8.0"
 description = "Build automation tool"
 authors = ["Johannes Asal"]
 license = "MIT"
@@ -36,8 +36,12 @@ koto_tempfile = { version = "0.14.1", default-features = false, features = ["rc"
 koto_toml = { version = "0.14.1", default-features = false, features = ["rc"] }
 koto_yaml = { version = "0.14.1", default-features = false, features = ["rc"] }
 lazy_static = "1"
+log = "0.4.21"
+metabuild-git = { path = "metabuild-git" }
+metabuild-resolver = { path = "metabuild-resolver" }
 once_cell = "1"
 path-absolutize = "3.0.14"
+pretty_env_logger = "0.5.0"
 regex = "1"
 resolvo = "0.2.0"
 rustls = "0.22.4" # keep fixed
@@ -57,8 +61,6 @@ ureq = { version = "2.9.7", features = ["gzip", "tls"] }
 url = "2.5.1"
 which = "4.4"
 zip = { version = "0.6", features = ["deflate"] }
-metabuild-git = { path = "metabuild-git" }
-metabuild-resolver = { path = "metabuild-resolver" }
 
 [dev-dependencies]
 futures-executor = "0.3"

Cargo.toml

@@ -6,21 +6,22 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+anyhow = "1.0.86"
 auth-git2 = "0.5.3"
-indexmap = { version = "2.2.6", features = ["serde"] }
+dirs = "5.0.1"
 git2 = "0.18.3"
+indexmap = { version = "2.2.6", features = ["serde"] }
+itertools = "0.13.0"
+log = "0.4.21"
 metabuild-git = { path = "../metabuild-git" }
+reqwest = "0.12.4"
 resolvo = "0.4.1"
-toml = "0.8.13"
+rustls-native-certs = "*"
 semver = "1.0.23"
 serde = { version = "1.0.203", features = ["derive"] }
 serde_json = "1.0.117"
-tracing = "0.1.40"
-itertools = "0.13.0"
-anyhow = "1.0.86"
-reqwest = "0.12.4"
-rustls-native-certs = "*"
-dirs = "5.0.1"
-yaml-rust = "0.4.5"
 tempfile = "3.10.1"
-ureq = { version = "2.9.7", features = ["native-certs", "gzip", "tls", "json"] }
+toml = "0.8.13"
+tracing = "0.1.40"
+ureq = { version = "2.9.7", features = ["native-certs", "gzip", "tls", "json"] }
+yaml-rust = "0.4.5"

metabuild-resolver/Cargo.toml

@@ -1,6 +1,7 @@
 use crate::repository::{BareRepository, RefType};
 use anyhow::Error;
 use indexmap::IndexMap;
+use log::debug;
 use std::path::Path;
 use yaml_rust::{YamlLoader, Yaml};
 
@@ -29,15 +30,22 @@ impl Index {
             .as_hash()
             .ok_or(anyhow::anyhow!("Failed to load module index"))?
         {
+            debug!("Processing index entry for {}", k.as_str().unwrap());
             let name = k.as_str().expect("Invalid key");
             let reference = if let Some(m) = v.as_hash() {
+                let server = m[&Yaml::from_str("server")].as_str().expect("Expected 'server' key").to_string();
+                let repo = m[&Yaml::from_str("repo")].as_str().expect("Expected 'repo' key").to_string();
+                let path = m[&Yaml::from_str("path")].as_str().expect("Expected 'path' key").to_string();
+                debug!("Artifactory source {},{},{}", server, repo, path);
                 LocationInfo::Artifactory {
-                    server: m[&Yaml::from_str("server")].as_str().expect("Expected 'server' key").to_string(),
-                    repo: m[&Yaml::from_str("repo")].as_str().expect("Expected 'repo' key").to_string(),
-                    path: m[&Yaml::from_str("path")].as_str().expect("Expected 'path' key").to_string()
+                    server,
+                    repo,
+                    path
                 }
             } else {
-                LocationInfo::Git(v.as_str().expect("Expected a string value").to_string())
+                let url = v.as_str().expect("Expected a string value").to_string();
+                debug!("Git source {}", url);
+                LocationInfo::Git(url)
             };
             data.insert(name.to_string(), reference);
         }