Logical package yml serialization

src/packs/pack.rs

@@ -17,6 +17,9 @@ use super::{
 
 #[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Clone)]
 pub struct Pack {
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub owner: Option<String>,
+
     #[serde(skip)]
     pub yml: PathBuf,
 
@@ -32,7 +35,7 @@ pub struct Pack {
         serialize_with = "serialize_checker_setting",
         deserialize_with = "deserialize_checker_setting"
     )]
-    pub enforce_dependencies: Option<CheckerSetting>,
+    pub enforce_folder_privacy: Option<CheckerSetting>,
 
     #[serde(
         default,
@@ -58,12 +61,17 @@ pub struct Pack {
     )]
     pub enforce_layers: Option<CheckerSetting>,
 
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub owner: Option<String>,
-
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub layer: Option<String>,
 
+    #[serde(
+        default,
+        skip_serializing_if = "Option::is_none",
+        serialize_with = "serialize_checker_setting",
+        deserialize_with = "deserialize_checker_setting"
+    )]
+    pub enforce_dependencies: Option<CheckerSetting>,
+
     #[serde(
         default,
         skip_serializing_if = "HashSet::is_empty",
@@ -102,14 +110,6 @@ pub struct Pack {
     )]
     pub visible_to: Option<HashSet<String>>,
 
-    #[serde(
-        default,
-        skip_serializing_if = "Option::is_none",
-        serialize_with = "serialize_checker_setting",
-        deserialize_with = "deserialize_checker_setting"
-    )]
-    pub enforce_folder_privacy: Option<CheckerSetting>,
-
     #[serde(
         default,
         skip_serializing_if = "Option::is_none",
@@ -513,8 +513,8 @@ foobar: true
         let actual = reserialize_pack(pack_yml);
 
         let expected = r#"
-enforce_dependencies: strict
 enforce_privacy: true
+enforce_dependencies: strict
 dependencies:
 - packs/a
 - packs/b
@@ -626,8 +626,8 @@ enforce_dependencies: true
         let actual = reserialize_pack(pack_yml);
 
         let expected = r#"
-enforce_dependencies: true
 owner: Foobar
+enforce_dependencies: true
 "#
         .trim_start();
 

tests/check_unused_dependencies.rs

@@ -61,9 +61,9 @@ fn assert_auto_correct_unused_dependencies(
         .success();
 
     let expected_autocorrect = [
-        "enforce_dependencies: true",
         "enforce_privacy: true",
         "layer: technical_services",
+        "enforce_dependencies: true",
         "dependencies:",
         "- packs/bar\n",
     ]

tests/create_test.rs

@@ -7,6 +7,8 @@ mod common;
 
 #[test]
 fn test_create() -> Result<(), Box<dyn Error>> {
+    common::delete_foobar();
+
     Command::cargo_bin("pks")?
         .arg("--project-root")
         .arg("tests/fixtures/simple_app")