Merge pull request #1298 from spkenv/recipe-build-spec

Split BuildSpec into BuildSpec and RecipeBuildSpec

Author: jrray

crates/spk-build/src/build/binary.rs

@@ -499,10 +499,10 @@ where
         // these must remain ordered so that the overriding of
         // rules is applied correctly later when we merge the results
         let mut validations = futures::stream::FuturesOrdered::new();
-        if !report.setup.package.validation().disabled.is_empty() {
+        if !self.recipe.validation().disabled.is_empty() {
             return Err(Error::UseOfObsoleteValidators);
         }
-        let validators = report.setup.package.validation().to_expanded_rules();
+        let validators = self.recipe.validation().to_expanded_rules();
         tracing::trace!("running validation");
         for validator in validators {
             tracing::trace!(" > {validator:?}");
@@ -518,7 +518,7 @@ where
         // these must remain ordered so that the overriding of
         // rules is applied correctly later when we merge the results
         let mut validations = futures::stream::FuturesOrdered::new();
-        let validators = report.setup.package.validation().to_expanded_rules();
+        let validators = self.recipe.validation().to_expanded_rules();
         for validator in validators {
             validations.push_back(async move { validator.validate_build(report).await });
         }
@@ -606,7 +606,7 @@ where
             let mut writer = std::fs::File::create(&build_script)
                 .map_err(|err| Error::FileOpenError(build_script.to_owned(), err))?;
             writer
-                .write_all(package.build_script().as_bytes())
+                .write_all(self.recipe.build_script().as_bytes())
                 .map_err(|err| Error::String(format!("Failed to save build script: {err}")))?;
             writer
                 .sync_data()

crates/spk-build/src/validation/alter_existing_files_test.rs

@@ -4,7 +4,7 @@
 
 use spfs::tracking::Manifest;
 use spk_schema::validation::{FileAlteration, ValidationMatcher};
-use spk_schema::{Package, ValidationRule, v0};
+use spk_schema::{OptionValues, Package, ValidationRule, v0};
 use spk_solve::Solution;
 
 use crate::report::{BuildOutputReport, BuildReport, BuildSetupReport};
@@ -30,12 +30,7 @@ async fn test_validate_build_changeset_modified() {
         },
         setup: BuildSetupReport {
             environment: Solution::default(),
-            variant: package
-                .build()
-                .variants
-                .first()
-                .cloned()
-                .unwrap_or_default(),
+            variant: package.option_values(),
             environment_filesystem: Manifest::new(
                 spfs::tracking::Entry::empty_dir_with_open_perms_with_data(package.ident().clone()),
             ),

crates/spk-build/src/validation/collect_all_files_test.rs

@@ -4,7 +4,7 @@
 
 use spfs::tracking::Manifest;
 use spk_schema::validation::ValidationMatcher;
-use spk_schema::{Package, ValidationRule, v0};
+use spk_schema::{OptionValues, Package, ValidationRule, v0};
 use spk_solve::Solution;
 
 use crate::report::{BuildOutputReport, BuildReport, BuildSetupReport, BuiltComponentReport};
@@ -48,12 +48,7 @@ async fn test_validate_build_changeset_collected() {
         },
         setup: BuildSetupReport {
             environment: Solution::default(),
-            variant: package
-                .build()
-                .variants
-                .first()
-                .cloned()
-                .unwrap_or_default(),
+            variant: package.option_values(),
             environment_filesystem: Manifest::new(
                 spfs::tracking::Entry::empty_dir_with_open_perms_with_data(package.ident().clone()),
             ),

crates/spk-build/src/validation/collect_existing_files_test.rs

@@ -4,7 +4,7 @@
 
 use spfs::tracking::Manifest;
 use spk_schema::validation::ValidationMatcher;
-use spk_schema::{Package, ValidationRule, v0};
+use spk_schema::{OptionValues, Package, ValidationRule, v0};
 use spk_solve::{Named, Solution};
 
 use crate::report::{BuildOutputReport, BuildReport, BuildSetupReport};
@@ -41,12 +41,7 @@ async fn test_validate_build_changeset_collect_existing() {
         },
         setup: BuildSetupReport {
             environment: Solution::default(),
-            variant: package
-                .build()
-                .variants
-                .first()
-                .cloned()
-                .unwrap_or_default(),
+            variant: package.option_values(),
             environment_filesystem,
             package,
         },

crates/spk-build/src/validation/empty_package_test.rs

@@ -4,7 +4,7 @@
 
 use spfs::tracking::Manifest;
 use spk_schema::validation::ValidationMatcher;
-use spk_schema::{Package, ValidationRule, v0};
+use spk_schema::{OptionValues, Package, ValidationRule, v0};
 use spk_solve::Solution;
 
 use crate::report::{BuildReport, BuildSetupReport};
@@ -16,12 +16,7 @@ async fn test_validate_build_changeset_nothing() {
     let report = BuildReport {
         setup: BuildSetupReport {
             environment: Solution::default(),
-            variant: package
-                .build()
-                .variants
-                .first()
-                .cloned()
-                .unwrap_or_default(),
+            variant: package.option_values(),
             environment_filesystem: Manifest::new(
                 spfs::tracking::Entry::empty_dir_with_open_perms_with_data(package.ident().clone()),
             ),

crates/spk-cli/cmd-du/src/cmd_du_test.rs

@@ -100,7 +100,7 @@ async fn test_du_works_on_whole_repo(#[case] solver: SolverImpl) {
 
     let mut expected_output = vec![
         "2local/my-pkg/1.0.0/3I42H3S6/:build/spk/pkg/my-pkg/1.0.0/3I42H3S6/options.json",
-        "183local/my-pkg/1.0.0/3I42H3S6/:build/spk/pkg/my-pkg/1.0.0/3I42H3S6/spec.yaml",
+        "121local/my-pkg/1.0.0/3I42H3S6/:build/spk/pkg/my-pkg/1.0.0/3I42H3S6/spec.yaml",
         "0local/my-pkg/1.0.0/3I42H3S6/:build/spk/pkg/my-pkg/1.0.0/3I42H3S6/build.cmpt",
         "17local/my-pkg/1.0.0/3I42H3S6/:build/spk/pkg/my-pkg/1.0.0/3I42H3S6/build.sh",
         "0local/my-pkg/1.0.0/3I42H3S6/:run/spk/pkg/my-pkg/1.0.0/3I42H3S6/options.json",
@@ -374,7 +374,7 @@ async fn test_du_summarize_output_enabled(#[case] solver: SolverImpl) {
     let mut opt = Opt::try_parse_from(["du", "local/my-pkg", "-s"]).unwrap();
     opt.du.run().await.unwrap();
 
-    let expected_output = format!("202local/my-pkg/{}", "".red());
+    let expected_output = format!("140local/my-pkg/{}", "".red());
     let mut generated_output = opt.du.output.vec.lock().unwrap()[0].clone();
     generated_output.retain(|c| !c.is_whitespace());
 
@@ -424,7 +424,7 @@ async fn test_du_summarize_output_is_not_enabled(#[case] solver: SolverImpl) {
         "2local/my-pkg/1.0.0/3I42H3S6/:build/spk/pkg/my-pkg/1.0.0/3I42H3S6/options.json",
         "0local/my-pkg/1.0.0/3I42H3S6/:build/spk/pkg/my-pkg/1.0.0/3I42H3S6/build.cmpt",
         "17local/my-pkg/1.0.0/3I42H3S6/:build/spk/pkg/my-pkg/1.0.0/3I42H3S6/build.sh",
-        "183local/my-pkg/1.0.0/3I42H3S6/:build/spk/pkg/my-pkg/1.0.0/3I42H3S6/spec.yaml",
+        "121local/my-pkg/1.0.0/3I42H3S6/:build/spk/pkg/my-pkg/1.0.0/3I42H3S6/spec.yaml",
         "0local/my-pkg/1.0.0/3I42H3S6/:run/spk/pkg/my-pkg/1.0.0/3I42H3S6/spec.yaml",
         "0local/my-pkg/1.0.0/3I42H3S6/:run/spk/pkg/my-pkg/1.0.0/3I42H3S6/options.json",
         "0local/my-pkg/1.0.0/3I42H3S6/:run/spk/pkg/my-pkg/1.0.0/3I42H3S6/run.cmpt",
@@ -493,7 +493,7 @@ async fn test_deprecate_flag(#[case] solver: SolverImpl) {
 
     let mut opt_with_deprecate_flag = Opt::try_parse_from(["du", "local/my-pkg", "-ds"]).unwrap();
     opt_with_deprecate_flag.du.run().await.unwrap();
-    let expected_output = format!("219local/my-pkg/{}", "DEPRECATED".red());
+    let expected_output = format!("157local/my-pkg/{}", "DEPRECATED".red());
     let mut generated_output = opt_with_deprecate_flag.du.output.vec.lock().unwrap()[0].clone();
     generated_output.retain(|c| !c.is_whitespace());
     assert_eq!(expected_output, generated_output);