fensu-cli 0.29.2__tar.gz → 0.29.3__tar.gz

{fensu_cli-0.29.2 → fensu_cli-0.29.3}/Cargo.lock

@@ -388,7 +388,7 @@ checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
 
 [[package]]
 name = "fensu-cli"
-version = "0.29.2"
+version = "0.29.3"
 dependencies = [
  "cap-fs-ext",
  "cap-std",
@@ -458,7 +458,7 @@ dependencies = [
 
 [[package]]
 name = "fensu-policy"
-version = "0.29.2"
+version = "0.29.3"
 dependencies = [
  "command-group",
  "globset",

{fensu_cli-0.29.2 → fensu_cli-0.29.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fensu-cli
-Version: 0.29.2
+Version: 0.29.3
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License

{fensu_cli-0.29.2 → fensu_cli-0.29.3}/crates/fensu-cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fensu-cli"
-version = "0.29.2" # x-release-please-version
+version = "0.29.3" # x-release-please-version
 edition.workspace = true
 license.workspace = true
 publish = false

{fensu_cli-0.29.2 → fensu_cli-0.29.3}/crates/fensu-cli/src/check/_helpers/evaluation.rs

@@ -946,7 +946,7 @@ pub(crate) fn render_results(
     mut results: Vec<CheckResult>,
     root: &Path,
     color: bool,
-    show_warnings: bool,
+    (show_warnings, incomplete): (bool, bool),
 ) -> (String, i32) {
     let selected = results.iter().map(|result| result.selected).sum::<usize>();
     let excluded = results.iter().map(|result| result.excluded).sum::<usize>();
@@ -1009,6 +1009,7 @@ pub(crate) fn render_results(
         evaluation_summary: summary.as_deref(),
         applied_exceptions,
         threshold_uses: &threshold_uses,
+        incomplete,
     });
     (output, i32::from(!faults.is_empty()))
 }

{fensu_cli-0.29.2 → fensu_cli-0.29.3}/crates/fensu-cli/src/check/_helpers/execution.rs

@@ -44,7 +44,8 @@ pub(crate) fn render_check(
     let cacheable = results
         .iter()
         .all(|result| result.cacheable.unwrap_or(true));
-    let (output, exit_code) = render_results(results, &plan.root, plan.color, options.warn);
+    let (output, exit_code) =
+        render_results(results, &plan.root, plan.color, (options.warn, false));
     let mut stderr = String::new();
     stderr.push_str(&freshness(&plan));
     if options.cache_stats {

fensu_cli-0.29.3/crates/fensu-cli/src/check/main/render_check_results.rs

@@ -0,0 +1,19 @@
+//! Render one aggregate set of analyzer check results, marked incomplete when a target could not run.
+
+use std::path::Path;
+
+use crate::check::models::CheckResult;
+
+pub(crate) fn render_check_results(
+    results: Vec<CheckResult>,
+    root: &Path,
+    color: bool,
+    (show_warnings, incomplete): (bool, bool),
+) -> (String, i32) {
+    crate::check::_helpers::evaluation::render_results(
+        results,
+        root,
+        color,
+        (show_warnings, incomplete),
+    )
+}

{fensu_cli-0.29.2 → fensu_cli-0.29.3}/crates/fensu-cli/src/command/_helpers/check_partition/execution.rs

@@ -218,7 +218,7 @@ fn structured_check(request: StructuredCheckRequest<'_>) -> CliOutput {
     let (stdout, report_exit_code) = if command_error && results.is_empty() {
         (String::new(), 0)
     } else {
-        render_check_results(results, &root, color, show_warnings)
+        render_check_results(results, &root, color, (show_warnings, command_error))
     };
     let mut stderr = String::new();
     if show_cache_stats {

{fensu_cli-0.29.2 → fensu_cli-0.29.3}/crates/fensu-cli/src/reporting/main/report.rs

@@ -14,7 +14,14 @@ pub(crate) fn report(request: ReportRequest<'_>) -> String {
     } else {
         "faults"
     };
-    let mut summary = format!("Found {} {noun}", request.faults.len());
+    let mut summary = if request.incomplete {
+        format!(
+            "Check incomplete: found {} {noun} in the targets that ran",
+            request.faults.len()
+        )
+    } else {
+        format!("Found {} {noun}", request.faults.len())
+    };
     if request.show_warnings {
         let noun = if request.warnings.len() == 1 {
             "warning"
@@ -24,7 +31,7 @@ pub(crate) fn report(request: ReportRequest<'_>) -> String {
         summary.push_str(&format!(" and {} {noun}", request.warnings.len()));
     }
     if request.color {
-        let style = if request.faults.is_empty() {
+        let style = if request.faults.is_empty() && !request.incomplete {
             GREEN
         } else {
             ORANGE

{fensu_cli-0.29.2 → fensu_cli-0.29.3}/crates/fensu-cli/src/reporting/models.rs

@@ -14,4 +14,6 @@ pub(crate) struct ReportRequest<'a> {
     pub(crate) evaluation_summary: Option<&'a str>,
     pub(crate) applied_exceptions: usize,
     pub(crate) threshold_uses: &'a [ThresholdUse],
+    /// Whether a target could not run, so the faults cover only the targets that did.
+    pub(crate) incomplete: bool,
 }

{fensu_cli-0.29.2 → fensu_cli-0.29.3}/crates/fensu-cli/src/tests/test_render.rs

@@ -44,6 +44,7 @@ fn given_colored_faults_when_rendering_then_uses_historical_orange_styles() {
             evaluation_summary: None,
             applied_exceptions: 0,
             threshold_uses: &[],
+            incomplete: false,
         });
 
         assert_eq!(

{fensu_cli-0.29.2 → fensu_cli-0.29.3}/crates/fensu-cli/tests/command/test_check_mixed_targets.rs

@@ -46,3 +46,58 @@ fn given_custom_python_rust_and_web_rules_when_checking_then_native_and_hosted_t
         }
     }
 }
+
+#[test]
+fn given_custom_python_and_rust_targets_without_cargo_when_checking_then_the_summary_says_incomplete(
+) {
+    let test_cases = [crate::test_types::RustMixedTargetUnavailableTestCase {
+        description: "a Rust target that cannot run fails the check, and the summary of the \
+                      Python findings says the check is incomplete",
+        expected_exit_code: 2,
+        expected_error: "FPRSL902 Rust analysis cannot run: cargo not found",
+        expected_summary: "Check incomplete: found 1 fault in the targets that ran",
+    }];
+    for test_case in test_cases {
+        let repository = tempfile::tempdir().expect("temporary repository");
+        write(
+            repository.path().join("Cargo.toml"),
+            "[package]\nname = \"example\"\nversion = \"0.1.0\"\nedition = \"2021\"\n",
+        );
+        write(
+            repository.path().join("src/lib.rs"),
+            "pub fn sum(left: usize, right: usize) -> usize { left + right }\n",
+        );
+        write(
+            repository.path().join("python/value.py"),
+            "def value(item):\n    return item\n",
+        );
+        write(repository.path().join("rules/custom.py"), "import ast\nfrom fensu import Family, Fault, RuleContext, rule\n@rule(code='XMIX001', family=Family.CUSTOM, slug='mixed-python', message='mixed Python')\ndef mixed_python(module: ast.Module, ctx: RuleContext) -> list[Fault]:\n    return []\n");
+        write(repository.path().join("fensu.toml"), "[targets.python]\nanalyzer = \"python\"\nroots = [\"python\"]\ntests = []\ntooling = []\nselect = [\"FFA001\", \"XMIX001\"]\nrule_paths = [\"rules/custom.py\"]\n[targets.rust]\nanalyzer = \"rust\"\nroots = [\"src\"]\ntests = []\ntooling = []\nrule_packs = [\"rust\"]\nselect = [\"FPRSS010\"]\n");
+        let output = std::process::Command::new(env!("CARGO_BIN_EXE_fensu"))
+            .args(["check", "--no-color", "--no-cache"])
+            .current_dir(repository.path())
+            .env("FENSU_PYTHON", crate::helpers::workspace_python())
+            .env("CARGO", "/cargo-does-not-exist/cargo")
+            .env("PATH", "/cargo-does-not-exist")
+            .output()
+            .expect("mixed check runs");
+        let stdout = String::from_utf8_lossy(&output.stdout);
+        let stderr = String::from_utf8_lossy(&output.stderr);
+        assert_eq!(
+            output.status.code(),
+            Some(test_case.expected_exit_code),
+            "{}: {stdout} {stderr}",
+            test_case.description
+        );
+        assert!(
+            stderr.contains(test_case.expected_error),
+            "{}: {stderr}",
+            test_case.description
+        );
+        assert!(
+            stdout.contains(test_case.expected_summary) && !stdout.contains("Found "),
+            "{}: {stdout}",
+            test_case.description
+        );
+    }
+}

{fensu_cli-0.29.2 → fensu_cli-0.29.3}/crates/fensu-cli/tests/command/test_types.rs

@@ -80,6 +80,13 @@ pub(crate) struct RustMixedTargetTestCase {
     pub(crate) expected_codes: &'static [&'static str],
 }
 
+pub(crate) struct RustMixedTargetUnavailableTestCase {
+    pub(crate) description: &'static str,
+    pub(crate) expected_exit_code: i32,
+    pub(crate) expected_error: &'static str,
+    pub(crate) expected_summary: &'static str,
+}
+
 pub(crate) struct RepositoryRuleTestCase {
     pub(crate) description: &'static str,
     pub(crate) expected_exit_code: i32,

{fensu_cli-0.29.2 → fensu_cli-0.29.3}/crates/fensu-policy/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fensu-policy"
-version = "0.29.2" # x-release-please-version
+version = "0.29.3" # x-release-please-version
 edition.workspace = true
 license.workspace = true
 publish = true

{fensu_cli-0.29.2 → fensu_cli-0.29.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "fensu-cli"
-version = "0.29.2" # x-release-please-version
+version = "0.29.3" # x-release-please-version
 description = "Native command-line executable for fensu"
 readme = "README.md"
 requires-python = ">=3.12"

fensu_cli-0.29.2/crates/fensu-cli/src/check/main/render_check_results.rs

@@ -1,14 +0,0 @@
-//! Render one aggregate set of analyzer check results.
-
-use std::path::Path;
-
-use crate::check::models::CheckResult;
-
-pub(crate) fn render_check_results(
-    results: Vec<CheckResult>,
-    root: &Path,
-    color: bool,
-    show_warnings: bool,
-) -> (String, i32) {
-    crate::check::_helpers::evaluation::render_results(results, root, color, show_warnings)
-}