ggwpez · ggwpez · Aug 13, 2025 · Aug 13, 2025 · Aug 13, 2025 · Aug 13, 2025
diff --git a/.github/workflows/downstream_nightly.yml b/.github/workflows/downstream_nightly.yml
@@ -24,7 +24,7 @@ jobs:
     strategy:
       matrix:
         repo: ["paritytech/polkadot-sdk", "open-web3-stack/open-runtime-module-library"]
-        version: [0.13.3, 1.4.0,  "*"]
+        version: [1.78.0, 1.82.0,  "*"]
 
     steps:
     - uses: actions/checkout@master

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,22 @@
+{
+	"workbench.colorCustomizations": {
+		"activityBar.activeBackground": "#ffeb33",
+		"activityBar.background": "#ffeb33",
+		"activityBar.foreground": "#15202b",
+		"activityBar.inactiveForeground": "#15202b99",
+		"activityBarBadge.background": "#009f90",
+		"activityBarBadge.foreground": "#e7e7e7",
+		"commandCenter.border": "#15202b99",
+		"sash.hoverBorder": "#ffeb33",
+		"statusBar.background": "#ffe600",
+		"statusBar.foreground": "#15202b",
+		"statusBarItem.hoverBackground": "#ccb800",
+		"statusBarItem.remoteBackground": "#ffe600",
+		"statusBarItem.remoteForeground": "#15202b",
+		"titleBar.activeBackground": "#ffe600",
+		"titleBar.activeForeground": "#15202b",
+		"titleBar.inactiveBackground": "#ffe60099",
+		"titleBar.inactiveForeground": "#15202b99"
+	},
+	"peacock.color": "#ffe600"
+}
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zepter"
-version = "1.82.0"
+version = "1.82.1"
 edition = "2021"
 authors = [ "Oliver Tale-Yazdi" ]
 description = "Analyze, Fix and Format features in your Rust workspace."

diff --git a/README.md b/README.md
@@ -237,7 +237,7 @@ When these two experiments proove the usefulness and reliability of Zepter for C
 ## Testing
 
 Unit tests: `cargo test`
-UI and downstream integration tests: `cargo test -- --ignored`
+UI and downstream integration tests: `cargo test -- --ignored --nocapture`
 
 Environment overwrites exist for the UI tests to:
 - `OVERWRITE`: Update the UI diff locks.

diff --git a/src/cmd/lint.rs b/src/cmd/lint.rs
@@ -147,7 +147,7 @@ pub struct PropagateFeatureCmd {
 	#[clap(long, short, num_args(0..))]
 	packages: Vec<String>,
 
-	/// The auto-fixer will enables the feature of the dependencies as non-optional.
+	/// Enables the feature of the dependencies as non-optional.
 	///
 	/// This can be used in case that a dependency should not be enabled like `dep?/feature` but
 	/// like `dep/feature` instead. In this case you would pass `--feature-enables-dep
@@ -471,6 +471,8 @@ impl PropagateFeatureCmd {
 		let dep_kinds = self.parse_dep_kinds().expect("Parse dependency kinds");
 		// (Crate that missing the feature) -> (Dependency that has it)
 		let mut feature_missing = BTreeMap::<CrateId, BTreeSet<RenamedPackage>>::new();
+		// (Crate that is not enabling a optional dependency) -> (Dependency that it is not enabled)
+		let mut non_optional_missing = BTreeMap::<CrateId, BTreeSet<RenamedPackage>>::new();
 
 		for pkg in to_check.iter() {
 			// TODO that it does not enable other features.
@@ -492,9 +494,31 @@ impl PropagateFeatureCmd {
 					continue
 				};
 
+				// If optional and require by `feature-enables-dep` but does not have the feature,
+				// then we need to enable it as non-optional.
+				if dep.optional {
+					if let Some((feature, _)) = self
+						.feature_enables_dep
+						.iter()
+						.flatten()
+						.find(|(f, name)| *f == feature && *name == dep.name())
+					{
+						if !dep.pkg.features.contains_key(feature) &&
+							!pkg.features.get(feature).is_some_and(|f| f.contains(&dep.name()))
+						{
+							non_optional_missing
+								.entry(pkg.id.to_string())
+								.or_default()
+								.insert(dep.clone());
+						}
+					}
+					// Continue here should not make a difference. TODO check.
+				}
+
 				if !dep.pkg.features.contains_key(&feature) {
 					continue
 				}
+
 				if !pkg.features.contains_key(&feature) {
 					if self.left_side_feature_missing != MuteSetting::Ignore {
 						feature_missing.entry(pkg.id.to_string()).or_default().insert(dep);
@@ -542,8 +566,12 @@ impl PropagateFeatureCmd {
 				propagate_missing.entry(pkg.id.to_string()).or_default().insert(dep);
 			}
 		}
-		let faulty_crates: BTreeSet<CrateId> =
-			propagate_missing.keys().chain(feature_missing.keys()).cloned().collect();
+		let faulty_crates: BTreeSet<CrateId> = propagate_missing
+			.keys()
+			.chain(feature_missing.keys())
+			.chain(non_optional_missing.keys())
+			.cloned()
+			.collect();
 		let mut faulty_crates =
 			faulty_crates.into_iter().map(|id| (lookup(&id), id)).collect::<Vec<_>>();
 		faulty_crates.sort_by(|(a, _), (b, _)| a.name.cmp(&b.name));
@@ -632,6 +660,32 @@ impl PropagateFeatureCmd {
 				}
 				errors += deps.len();
 			}
+
+			if let Some(deps) = non_optional_missing.get(&krate.id.to_string()) {
+				let mut named = deps.iter().map(RenamedPackage::display_name).collect::<Vec<_>>();
+				named.sort();
+				println!(
+					"    must enable dependency as non-optional:\n      {}",
+					named.join("\n      ")
+				);
+
+				if self.fixer_args.enable &&
+					self.fix_package.as_ref().is_none_or(|p| p == &krate.name.to_string())
+				{
+					for dep in deps.iter() {
+						let dep_name = dep.name();
+						let Some(fixer) = fixer.as_mut() else { continue };
+
+						fixer.add_to_feature(&feature, &dep_name).unwrap();
+
+						log::info!("Inserted '{dep_name}' into '{}'", krate.name);
+						fixes += 1;
+					}
+				}
+
+				errors += deps.len();
+			}
+
 			if let Some(fixer) = fixer.as_mut() {
 				if fixes > 0 {
 					fixer.save().unwrap();

diff --git a/src/cmd/mod.rs b/src/cmd/mod.rs
@@ -48,7 +48,7 @@ pub struct GlobalArgs {
 
 	/// Try to exit with code zero if the intended check failed.
 	///
-	/// Will still return 1 in case of an actual error (eg. failed to find some file) or a panic
+	/// Will still return != 0 in case of an actual error (eg. failed to find some file) or a panic
 	/// (aka software bug).
 	#[clap(long, global = true, verbatim_doc_comment)]
 	exit_code_zero: bool,
@@ -145,6 +145,11 @@ impl GlobalArgs {
 		}
 	}
 
+	/// Error code when the config file is invalid or incompatible.
+	pub fn error_code_cfg_parsing() -> i32 {
+		101
+	}
+
 	pub fn red(&self, s: &str) -> String {
 		if !self.color {
 			s.to_string()

diff --git a/src/cmd/run.rs b/src/cmd/run.rs
@@ -24,7 +24,7 @@ pub struct RunArgs {
 
 impl RunCmd {
 	pub fn run(&self, g: &GlobalArgs) {
-		let config = self.args.config.load().expect("Invalid config file");
+		let config = self.args.config.load_or_panic();
 
 		let name = self.args.workflow.as_deref().unwrap_or(WORKFLOW_DEFAULT_NAME);
 		let Some(workflow) = config.workflow(name) else {

diff --git a/src/config/mod.rs b/src/config/mod.rs
@@ -4,7 +4,7 @@
 pub mod semver;
 pub mod workflow;
 
-use crate::{config::workflow::WorkflowFile, log, ErrToStr};
+use crate::{cmd::GlobalArgs, config::workflow::WorkflowFile, log, ErrToStr};
 
 use std::{
 	fs::canonicalize,
@@ -72,6 +72,13 @@ pub fn search_config<P: AsRef<Path>>(workspace: P) -> Result<PathBuf, Vec<PathBu
 }
 
 impl ConfigArgs {
+	pub fn load_or_panic(&self) -> WorkflowFile {
+		self.load().unwrap_or_else(|e| {
+			eprintln!("{e}");
+			std::process::exit(GlobalArgs::error_code_cfg_parsing());
+		})
+	}
+
 	pub fn load(&self) -> Result<WorkflowFile, String> {
 		let path = self.locate_config()?;
 		log::debug!("Using config file: {path:?}");

diff --git a/src/config/workflow.rs b/src/config/workflow.rs
@@ -166,13 +166,13 @@ impl WorkflowFile {
 	pub fn check_cfg_compatibility(&self) -> Result<(), String> {
 		let current_version =
 			Semver::try_from(clap::crate_version!()).expect("Crate version is valid semver");
-		let file_version = self.version.binary;
+		let required_version = self.version.binary;
 
-		if current_version.is_newer_or_equal(&file_version) {
+		if current_version.is_newer_or_equal(&required_version) {
 			Ok(())
 		} else {
 			Err(format!(
-				"Config file version is too new. The file requires at least version {file_version}, but the current version is {current_version}. Please update Zepter or ignore this check with `--check-cfg-compatibility=off`."
+				"Your version of Zepter is too old for this project.\n\n Required:  {required_version}\n Installed: {current_version}\n\nPlease update Zepter with:\n\n  cargo install zepter --locked\n\nOr add `--check-cfg-compatibility=off` to the config file."
 			))
 		}
 	}

diff --git a/tests/ui/config/v1/basic.yaml b/tests/ui/config/v1/basic.yaml
@@ -3,25 +3,25 @@ crates:
 cases:
 - cmd: run default
   stdout: |
-    zepter 1.82.0
+    zepter 1.82.1
   stderr: |
     [INFO] Running workflow 'default'
     [INFO] 1/1 --version
 - cmd: run
   stdout: |
-    zepter 1.82.0
+    zepter 1.82.1
   stderr: |
     [INFO] Running workflow 'default'
     [INFO] 1/1 --version
 - cmd: ''
   stdout: |
-    zepter 1.82.0
+    zepter 1.82.1
   stderr: |
     [INFO] Running workflow 'default'
     [INFO] 1/1 --version
 - cmd: run my_version
   stdout: |
-    zepter 1.82.0
+    zepter 1.82.1
   stderr: |
     [INFO] Running workflow 'my_version'
     [INFO] 1/1 --version
@@ -36,7 +36,7 @@ cases:
     [INFO] 1/1 debug --no-benchmark
 - cmd: run both
   stdout: |
-    zepter 1.82.0
+    zepter 1.82.1
     Num workspace members: 1
     Num dependencies: 1
     DAG nodes: 0, links: 0

diff --git a/tests/ui/config/v1/finds_all.yaml b/tests/ui/config/v1/finds_all.yaml
@@ -3,7 +3,7 @@ crates:
 cases:
 - cmd: ''
   stdout: |
-    zepter 1.82.0
+    zepter 1.82.1
   stderr: |
     [INFO] Running workflow 'default'
     [INFO] 1/1 --version
@@ -19,7 +19,7 @@ cases:
           - [ '--version' ]
 - cmd: ''
   stdout: |
-    zepter 1.82.0
+    zepter 1.82.1
   stderr: |
     [INFO] Running workflow 'default'
     [INFO] 1/1 --version
@@ -35,7 +35,7 @@ cases:
           - [ '--version' ]
 - cmd: ''
   stdout: |
-    zepter 1.82.0
+    zepter 1.82.1
   stderr: |
     [INFO] Running workflow 'default'
     [INFO] 1/1 --version
@@ -51,7 +51,7 @@ cases:
           - [ '--version' ]
 - cmd: run default
   stdout: |
-    zepter 1.82.0
+    zepter 1.82.1
   stderr: |
     [INFO] Running workflow 'default'
     [INFO] 1/1 --version
@@ -67,7 +67,7 @@ cases:
           - [ '--version' ]
 - cmd: run default
   stdout: |
-    zepter 1.82.0
+    zepter 1.82.1
   stderr: |
     [INFO] Running workflow 'default'
     [INFO] 1/1 --version
@@ -83,7 +83,7 @@ cases:
           - [ '--version' ]
 - cmd: run default
   stdout: |
-    zepter 1.82.0
+    zepter 1.82.1
   stderr: |
     [INFO] Running workflow 'default'
     [INFO] 1/1 --version
@@ -99,7 +99,7 @@ cases:
           - [ '--version' ]
 - cmd: run default --config .cargo/polkadot.yaml
   stdout: |
-    zepter 1.82.0
+    zepter 1.82.1
   stderr: |
     [INFO] Running workflow 'default'
     [INFO] 1/1 --version
@@ -115,7 +115,7 @@ cases:
           - [ '--version' ]
 - cmd: run default -c .cargo/polkadot.yaml
   stdout: |
-    zepter 1.82.0
+    zepter 1.82.1
   stderr: |
     [INFO] Running workflow 'default'
     [INFO] 1/1 --version

diff --git a/tests/ui/config/v1/version_bin.yaml b/tests/ui/config/v1/version_bin.yaml
@@ -2,21 +2,33 @@ crates:
 - name: A
 cases:
 - cmd: run default
-  stderr: |2
+  stderr: |
+    Your version of Zepter is too old for this project.
+
+     Required:  2.0.0
+     Installed: 1.82.1
+
+    Please update Zepter with:
+
+      cargo install zepter --locked
 
-    thread 'main' panicked at src/cmd/run.rs:27:46:
-    Invalid config file: "Config file version is too new. The file requires at least version 2.0.0, but the current version is 1.82.0. Please update Zepter or ignore this check with `--check-cfg-compatibility=off`."
-    note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
+    Or add `--check-cfg-compatibility=off` to the config file.
   code: 101
 - cmd: run default --check-cfg-compatibility=off
   stdout: |
     Error: Command '' failed with exit code 101
   stderr: |
     [INFO] Running workflow 'default'
+    Your version of Zepter is too old for this project.
+
+     Required:  2.0.0
+     Installed: 1.82.1
+
+    Please update Zepter with:
+
+      cargo install zepter --locked
 
-    thread 'main' panicked at src/cmd/run.rs:27:46:
-    Invalid config file: "Config file version is too new. The file requires at least version 2.0.0, but the current version is 1.82.0. Please update Zepter or ignore this check with `--check-cfg-compatibility=off`."
-    note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
+    Or add `--check-cfg-compatibility=off` to the config file.
   code: 1
 configs:
 - to_path: .zepter.yaml

diff --git a/tests/ui/config/v1/version_file.yaml b/tests/ui/config/v1/version_file.yaml
@@ -2,11 +2,8 @@ crates:
 - name: A
 cases:
 - cmd: run default
-  stderr: |2
-
-    thread 'main' panicked at src/cmd/run.rs:27:46:
-    Invalid config file: "Can only parse workflow files with version '1'"
-    note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
+  stderr: |
+    Can only parse workflow files with version '1'
   code: 101
 configs:
 - to_path: .zepter.yaml