Skip to content

Commit bb6fe1a

Browse files
perryqhashleywillardtstannard
authored
Renaming unnecessary-dependencies (#7)
* tests for check-unused-dependencies * Renaming check-unnecessary-dependencies to check-unused-dependencies --- Co-authored-by: Ashley Willard <[email protected]> Co-authored-by: Teal Stannard <[email protected]>
1 parent 6181e8d commit bb6fe1a

File tree

4 files changed

+60
-16
lines changed

4 files changed

+60
-16
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[package]
44
name = "pks"
5-
version = "0.2.20"
5+
version = "0.2.21"
66
edition = "2021"
77
description = "Welcome! Please see https://github.com/rubyatscale/pks for more information!"
88
license = "MIT"

src/packs/checker.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,13 +381,14 @@ pub(crate) fn check_unnecessary_dependencies(
381381
"Found 1 unnecessary dependency".to_string()
382382
} else {
383383
format!(
384-
"Found {} unnecessary dependencies",
384+
"Found {} unused dependencies",
385385
unnecessary_dependencies.len()
386386
)
387387
};
388388
bail!(
389-
"{}. Run command with `--auto-correct` to remove them.",
389+
"{}. Run `{} check-unused-dependencies --auto-correct` to remove them.",
390390
found_message,
391+
bin_locater::packs_bin_name(),
391392
);
392393
}
393394
}

src/packs/cli.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,11 @@ enum Command {
109109
},
110110

111111
#[clap(
112-
about = "Check for dependencies that when removed produce no violations."
112+
about = "Check for dependencies that when removed produce no violations.",
113+
alias = "check-unnecessary-dependencies"
113114
)]
114-
CheckUnnecessaryDependencies {
115-
#[arg(long)]
115+
CheckUnusedDependencies {
116+
#[arg(short, long)]
116117
auto_correct: bool,
117118
},
118119

@@ -263,7 +264,7 @@ pub fn run() -> anyhow::Result<()> {
263264
packs::validate(&configuration)
264265
// Err("💡 Please use `packs check` to detect dependency cycles and run other configuration validations".into())
265266
}
266-
Command::CheckUnnecessaryDependencies { auto_correct } => {
267+
Command::CheckUnusedDependencies { auto_correct } => {
267268
packs::check_unnecessary_dependencies(&configuration, auto_correct)
268269
}
269270
Command::UpdateDependenciesForConstant { constant } => Ok(
Lines changed: 51 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@ use predicates::prelude::*;
33
use std::{error::Error, fs, process::Command};
44
mod common;
55

6-
#[test]
7-
fn test_check_unnecessary_dependencies() -> Result<(), Box<dyn Error>> {
6+
fn assert_check_unused_dependencies(cmd: &str) -> Result<(), Box<dyn Error>> {
87
Command::cargo_bin("pks")?
98
.arg("--project-root")
109
.arg("tests/fixtures/app_with_dependency_cycles")
1110
.arg("--debug")
12-
.arg("check-unnecessary-dependencies")
11+
.arg(cmd)
1312
.assert()
1413
.failure()
1514
.stdout(predicate::str::contains(
@@ -19,19 +18,45 @@ fn test_check_unnecessary_dependencies() -> Result<(), Box<dyn Error>> {
1918
"packs/foo depends on packs/bar but does not use it",
2019
))
2120
.stderr(predicate::str::contains(
22-
"Error: Found 3 unnecessary dependencies. Run command with `--auto-correct` to remove them.",
23-
));
21+
"Error: Found 3 unused dependencies. Run `packs check-unused-dependencies --auto-correct` to remove them.")
22+
);
2423
Ok(())
2524
}
2625

2726
#[test]
28-
fn test_auto_correct_unnecessary_dependencies() -> Result<(), Box<dyn Error>> {
27+
fn test_check_unnecessary_dependencies() -> Result<(), Box<dyn Error>> {
28+
assert_check_unused_dependencies("check-unnecessary-dependencies")
29+
}
30+
31+
#[test]
32+
fn test_check_unused_dependencies() -> Result<(), Box<dyn Error>> {
33+
assert_check_unused_dependencies("check-unused-dependencies")
34+
}
35+
36+
fn assert_auto_correct_unused_dependencies(
37+
cmd: &str,
38+
flag: &str,
39+
) -> Result<(), Box<dyn Error>> {
40+
common::set_up_fixtures();
41+
42+
let expected_before_autocorrect = [
43+
"enforce_dependencies: true",
44+
"enforce_privacy: true",
45+
"layer: technical_services",
46+
"dependencies:",
47+
"- packs/bar",
48+
"- packs/baz\n",
49+
]
50+
.join("\n");
51+
let foo_package_yml = fs::read_to_string("tests/fixtures/app_with_unnecessary_dependencies/packs/foo/package.yml").unwrap();
52+
assert_eq!(foo_package_yml, expected_before_autocorrect);
53+
2954
Command::cargo_bin("pks")?
3055
.arg("--project-root")
3156
.arg("tests/fixtures/app_with_unnecessary_dependencies")
3257
.arg("--debug")
33-
.arg("check-unnecessary-dependencies")
34-
.arg("--auto-correct")
58+
.arg(cmd)
59+
.arg(flag)
3560
.assert()
3661
.success();
3762

@@ -49,14 +74,31 @@ fn test_auto_correct_unnecessary_dependencies() -> Result<(), Box<dyn Error>> {
4974
Ok(())
5075
}
5176

77+
#[test]
78+
fn test_auto_correct_unnecessary_dependencies() -> Result<(), Box<dyn Error>> {
79+
assert_auto_correct_unused_dependencies(
80+
"check-unused-dependencies",
81+
"--auto-correct",
82+
)?;
83+
assert_auto_correct_unused_dependencies("check-unused-dependencies", "-a")?;
84+
assert_auto_correct_unused_dependencies(
85+
"check-unnecessary-dependencies",
86+
"-a",
87+
)?;
88+
assert_auto_correct_unused_dependencies(
89+
"check-unnecessary-dependencies",
90+
"--auto-correct",
91+
)
92+
}
93+
5294
#[test]
5395
fn test_check_unnecessary_dependencies_no_issue() -> Result<(), Box<dyn Error>>
5496
{
5597
Command::cargo_bin("pks")?
5698
.arg("--project-root")
5799
.arg("tests/fixtures/simple_app")
58100
.arg("--debug")
59-
.arg("check-unnecessary-dependencies")
101+
.arg("check-unused-dependencies")
60102
.assert()
61103
.success();
62104
Ok(())

0 commit comments

Comments
 (0)