Skip to content

Commit 222c289

Browse files
authored
Logical package yml serialization (#9)
* reordering package.yml serialization * adding violations.md
1 parent bb6fe1a commit 222c289

File tree

3 files changed

+17
-15
lines changed

3 files changed

+17
-15
lines changed

src/packs/pack.rs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ use super::{
1717

1818
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Clone)]
1919
pub struct Pack {
20+
#[serde(default, skip_serializing_if = "Option::is_none")]
21+
pub owner: Option<String>,
22+
2023
#[serde(skip)]
2124
pub yml: PathBuf,
2225

@@ -32,7 +35,7 @@ pub struct Pack {
3235
serialize_with = "serialize_checker_setting",
3336
deserialize_with = "deserialize_checker_setting"
3437
)]
35-
pub enforce_dependencies: Option<CheckerSetting>,
38+
pub enforce_folder_privacy: Option<CheckerSetting>,
3639

3740
#[serde(
3841
default,
@@ -58,12 +61,17 @@ pub struct Pack {
5861
)]
5962
pub enforce_layers: Option<CheckerSetting>,
6063

61-
#[serde(default, skip_serializing_if = "Option::is_none")]
62-
pub owner: Option<String>,
63-
6464
#[serde(default, skip_serializing_if = "Option::is_none")]
6565
pub layer: Option<String>,
6666

67+
#[serde(
68+
default,
69+
skip_serializing_if = "Option::is_none",
70+
serialize_with = "serialize_checker_setting",
71+
deserialize_with = "deserialize_checker_setting"
72+
)]
73+
pub enforce_dependencies: Option<CheckerSetting>,
74+
6775
#[serde(
6876
default,
6977
skip_serializing_if = "HashSet::is_empty",
@@ -102,14 +110,6 @@ pub struct Pack {
102110
)]
103111
pub visible_to: Option<HashSet<String>>,
104112

105-
#[serde(
106-
default,
107-
skip_serializing_if = "Option::is_none",
108-
serialize_with = "serialize_checker_setting",
109-
deserialize_with = "deserialize_checker_setting"
110-
)]
111-
pub enforce_folder_privacy: Option<CheckerSetting>,
112-
113113
#[serde(
114114
default,
115115
skip_serializing_if = "Option::is_none",
@@ -513,8 +513,8 @@ foobar: true
513513
let actual = reserialize_pack(pack_yml);
514514

515515
let expected = r#"
516-
enforce_dependencies: strict
517516
enforce_privacy: true
517+
enforce_dependencies: strict
518518
dependencies:
519519
- packs/a
520520
- packs/b
@@ -626,8 +626,8 @@ enforce_dependencies: true
626626
let actual = reserialize_pack(pack_yml);
627627

628628
let expected = r#"
629-
enforce_dependencies: true
630629
owner: Foobar
630+
enforce_dependencies: true
631631
"#
632632
.trim_start();
633633

tests/check_unused_dependencies.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ fn assert_auto_correct_unused_dependencies(
6161
.success();
6262

6363
let expected_autocorrect = [
64-
"enforce_dependencies: true",
6564
"enforce_privacy: true",
6665
"layer: technical_services",
66+
"enforce_dependencies: true",
6767
"dependencies:",
6868
"- packs/bar\n",
6969
]

tests/create_test.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ mod common;
77

88
#[test]
99
fn test_create() -> Result<(), Box<dyn Error>> {
10+
common::delete_foobar();
11+
1012
Command::cargo_bin("pks")?
1113
.arg("--project-root")
1214
.arg("tests/fixtures/simple_app")

0 commit comments

Comments
 (0)