Collect crates for manifest updates (#222)

Sebastian Thiel committed 5 years ago

Commit 56ccdd21 parent 07372dd2 files · +37 −10Browse files

Unified · Split

2 files

cargo-smart-release/src/command/release/mod.rs +11 −5
cargo-smart-release/src/traverse.rs +26 −5

cargo-smart-release/src/command/release/mod.rs+11−5

@@ -133,16 +133,16 @@ fn present_dependencies( · 132 unmodified lines
133	.count();	133	.count();
134	if num_skipped != 0 {	134	if num_skipped != 0 {
135	log::info!(	135	log::info!(
136	"Skipped {} dependent crates as they didn't change since their last release. Use --verbose/-v to see much more.",	136	"Skipped {} dependent crates as they didn't change since their last release.",
137	num_skipped	137	num_skipped
138	);	138	);
139	}	139	}
140		140
141	let mut error = false;	141	let mut error = false;
142	for dep in deps {	142	for dep in deps {
143	let (bump_spec, kind) = match dep.kind {	143	let (bump_spec, kind) = match dep.kind {
144	Kind::UserSelection => (ctx.base.bump, "provided"),	144	Kind::UserSelection => (ctx.base.bump, "provided"),
145	Kind::DependencyOfUserSelection => (ctx.base.bump_dependencies, "dependent"),	145	Kind::DependencyOrDependentOfUserSelection => (ctx.base.bump_dependencies, "dependent"),
146	};	146	};
147	match &dep.mode {	147	match &dep.mode {
148	dependency::Mode::ToBePublished { adjustment } => {	148	dependency::Mode::ToBePublished { adjustment } => {
@@ -223,7 +223,13 @@ fn present_dependencies( · 74 unmodified lines
223	direct_dependency.name	223	direct_dependency.name
224	);	224	);
225	}	225	}
226		226	dependency::Mode::ManifestNeedsUpdate => {
		227	log::info!(
		228	"Manifest of {} package '{}' will be adjusted as its dependencies see a version change",
		229	kind,
		230	dep.package.name
		231	);
		232	}
227	dependency::Mode::Skipped { .. } => {}	233	dependency::Mode::Skipped { .. } => {}
228	}	234	}
229	}	235	}

cargo-smart-release/src/traverse.rs+26−5

 use crate::{
     git,
     traverse::dependency::VersionAdjustment,
-    utils::{is_pre_release_version, package_by_name, workspace_package_by_name},
+    utils::{is_pre_release_version, package_by_id, package_by_name, workspace_package_by_name},
     version,
 };
         /// Initially selected by user
         UserSelection,
         /// A changed dependency of the user selected crate that thus needs publishing
-        DependencyOfUserSelection,
+        DependencyOrDependentOfUserSelection,
     }
     #[derive(Clone, Debug)]
             reason: SkippedReason,
             adjustment: Option<VersionAdjustment<'meta>>,
         },
+        /// One of our dependencies will see a version adjustment, which we must update in our manifest
+        ManifestNeedsUpdate,
     }
 }
             }
         }
     }
+    let crates_for_manifest_update = ctx
+        .meta
+        .workspace_members
+        .iter()
+        .map(|id| package_by_id(&ctx.meta, id))
+        .filter(|wsp| crates.iter().all(|c| c.package.id != wsp.id))
+        .filter(|wsp| {
+            wsp.dependencies
+                .iter()
+                .any(|d| crates.iter().any(|c| c.package.name == d.name))
+        })
+        .map(|wsp| Dependency {
+            kind: dependency::Kind::DependencyOrDependentOfUserSelection,
+            package: wsp,
+            mode: dependency::Mode::ManifestNeedsUpdate,
+        })
+        .collect::<Vec<_>>();
+    crates.extend(crates_for_manifest_update);
     Ok(crates)
 }
             if is_pre_release_version(&workspace_dependency.version) || add_production_crates {
                 crates.push(Dependency {
                     package: workspace_dependency,
-                    kind: dependency::Kind::DependencyOfUserSelection,
+                    kind: dependency::Kind::DependencyOrDependentOfUserSelection,
                     mode: dependency::Mode::ToBePublished {
                         adjustment: VersionAdjustment::Changed {
                             change,
             } else {
                 crates.push(Dependency {
                     package: workspace_dependency,
-                    kind: dependency::Kind::DependencyOfUserSelection,
+                    kind: dependency::Kind::DependencyOrDependentOfUserSelection,
                     mode: dependency::Mode::Skipped {
                         reason: dependency::SkippedReason::DeniedAutopublishOfProductionCrate,
                         adjustment: None,
         } else {
             skipped.push(Dependency {
                 package: workspace_dependency,
-                kind: dependency::Kind::DependencyOfUserSelection,
+                kind: dependency::Kind::DependencyOrDependentOfUserSelection,
                 mode: dependency::Mode::Skipped {
                     reason: dependency::SkippedReason::Unchanged,
                     adjustment: None,