Adds `no-exit-message` Setting and `[exit-message]` attribute #2568

ArchieAtkinson · 2025-01-12T15:47:09Z

This adds both the no-exit-message setting and the [exit-message] attribute. Current behaviour is [exit-message] overrides both set no-exit-message and [no-exit-message].

Idea from #2566.

I would like feedback on whether I need to add anything to the documents and whether any test cases are missing.

casey

Looks good!

I think there is an additional test case, just a plain recipe with the [no-exit-message] attribute with no setting.
- [exit-message] and [no-exit-message] on the same recipe should produce an error, and this should also have a test

casey · 2025-01-12T18:09:59Z

src/attribute.rs

@@ -17,6 +17,7 @@ pub(crate) enum Attribute<'src> {
  Macos,
  NoCd,
  NoExitMessage,
+  ExitMessage,


These should be sorted alphabetically.

casey · 2025-01-12T18:10:14Z

src/attribute.rs

@@ -36,6 +37,7 @@ impl AttributeDiscriminant {
      | Self::Macos
      | Self::NoCd
      | Self::NoExitMessage
+      | Self::ExitMessage


These should be sorted alphabetically.

casey · 2025-01-12T18:10:18Z

src/attribute.rs

@@ -84,6 +86,7 @@ impl<'src> Attribute<'src> {
      AttributeDiscriminant::Macos => Self::Macos,
      AttributeDiscriminant::NoCd => Self::NoCd,
      AttributeDiscriminant::NoExitMessage => Self::NoExitMessage,
+      AttributeDiscriminant::ExitMessage => Self::ExitMessage,


casey · 2025-01-12T18:10:23Z

src/attribute.rs

@@ -133,6 +136,7 @@ impl Display for Attribute<'_> {
      | Self::Macos
      | Self::NoCd
      | Self::NoExitMessage
+      | Self::ExitMessage


casey · 2025-01-12T18:13:50Z

src/justfile.rs

@@ -724,6 +724,54 @@ mod tests {
    }
  }

+  run_error! {


I'm trying to move away from the test generation macros. New tests should be integration tests, and use Test::new(), see examples in the tests directory.

casey · 2025-01-12T18:17:08Z

src/settings.rs

@@ -67,6 +68,9 @@ impl<'src> Settings<'src> {
        Setting::Quiet(quiet) => {
          settings.quiet = quiet;
        }
+        Setting::NoExitMessage(no_exit_message) => {


casey · 2025-01-12T18:17:12Z

tests/json.rs

@@ -86,6 +86,7 @@ struct Settings<'a> {
  ignore_comments: bool,
  positional_arguments: bool,
  quiet: bool,
+  no_exit_message: bool,


casey · 2025-01-12T18:17:23Z

tests/no_exit_message.rs

@@ -129,3 +129,67 @@ hello:
  stderr: "",
  status: 100,
 }
+
+test! {


These should use the Test::new() builder.

casey · 2025-01-12T18:19:56Z

tests/no_exit_message.rs

+}
+
+
+test! {


I think this test can be removed, since whether or not a recipe is silent doesn't interact with exit messages.

casey · 2025-01-12T18:24:26Z

tests/no_exit_message.rs

+  status: 100,
+}
+
+test! {


I think this test can be removed. It would be a quite weird interaction in this code if this failed.

ArchieAtkinson

All comments done.

Added additional suggested tests and moved all tests to no_exit_messsage.rs.

Also added a commit to refactor the other tests in no_exit_messsage.rs to Test::new() if that is suitable for this PR.

Let me know if there is anything else that needs changing.

ArchieAtkinson · 2025-01-12T18:44:56Z

tests/no_exit_message.rs

@@ -129,3 +129,67 @@ hello:
  stderr: "",
  status: 100,
 }
+
+test! {


ArchieAtkinson · 2025-01-12T18:45:05Z

tests/json.rs

@@ -86,6 +86,7 @@ struct Settings<'a> {
  ignore_comments: bool,
  positional_arguments: bool,
  quiet: bool,
+  no_exit_message: bool,


ArchieAtkinson · 2025-01-12T18:45:18Z

src/attribute.rs

@@ -17,6 +17,7 @@ pub(crate) enum Attribute<'src> {
  Macos,
  NoCd,
  NoExitMessage,
+  ExitMessage,


ArchieAtkinson · 2025-01-12T18:45:22Z

src/attribute.rs

@@ -36,6 +37,7 @@ impl AttributeDiscriminant {
      | Self::Macos
      | Self::NoCd
      | Self::NoExitMessage
+      | Self::ExitMessage


ArchieAtkinson · 2025-01-12T18:45:25Z

src/attribute.rs

@@ -84,6 +86,7 @@ impl<'src> Attribute<'src> {
      AttributeDiscriminant::Macos => Self::Macos,
      AttributeDiscriminant::NoCd => Self::NoCd,
      AttributeDiscriminant::NoExitMessage => Self::NoExitMessage,
+      AttributeDiscriminant::ExitMessage => Self::ExitMessage,


ArchieAtkinson · 2025-01-12T18:55:20Z

src/setting.rs

@@ -34,6 +35,7 @@ impl Display for Setting<'_> {
      | Self::IgnoreComments(value)
      | Self::PositionalArguments(value)
      | Self::Quiet(value)
+      | Self::NoExitMessage(value)


ArchieAtkinson · 2025-01-12T18:55:37Z

src/settings.rs

@@ -18,6 +18,7 @@ pub(crate) struct Settings<'src> {
  pub(crate) ignore_comments: bool,
  pub(crate) positional_arguments: bool,
  pub(crate) quiet: bool,
+  pub(crate) no_exit_message: bool,


ArchieAtkinson · 2025-01-12T18:55:48Z

src/settings.rs

@@ -67,6 +68,9 @@ impl<'src> Settings<'src> {
        Setting::Quiet(quiet) => {
          settings.quiet = quiet;
        }
+        Setting::NoExitMessage(no_exit_message) => {


ArchieAtkinson · 2025-01-12T18:55:57Z

tests/no_exit_message.rs

+  status: 100,
+}
+
+test! {


ArchieAtkinson · 2025-01-12T18:56:02Z

tests/no_exit_message.rs

+}
+
+
+test! {


ArchieAtkinson added 2 commits January 12, 2025 15:41

Adds no-exit-message setting and exit-message attribute

3226a79

Additional Tests

dcab358

ArchieAtkinson marked this pull request as ready for review January 12, 2025 15:51

casey requested changes Jan 12, 2025

View reviewed changes

ArchieAtkinson added 2 commits January 12, 2025 19:18

PR Comments

b27a26a

Refactored other tests

7d8c264

ArchieAtkinson commented Jan 12, 2025

View reviewed changes

Additional just single attributes tes

aeed6a8

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adds `no-exit-message` Setting and `[exit-message]` attribute #2568

Adds `no-exit-message` Setting and `[exit-message]` attribute #2568

ArchieAtkinson commented Jan 12, 2025

casey left a comment

casey Jan 12, 2025

ArchieAtkinson Jan 12, 2025

casey Jan 12, 2025

ArchieAtkinson Jan 12, 2025

casey Jan 12, 2025

ArchieAtkinson Jan 12, 2025

casey Jan 12, 2025

ArchieAtkinson Jan 12, 2025

casey Jan 12, 2025

ArchieAtkinson Jan 12, 2025

casey Jan 12, 2025

ArchieAtkinson Jan 12, 2025

casey Jan 12, 2025

ArchieAtkinson Jan 12, 2025

casey Jan 12, 2025

ArchieAtkinson Jan 12, 2025

casey Jan 12, 2025

ArchieAtkinson Jan 12, 2025

casey Jan 12, 2025

ArchieAtkinson Jan 12, 2025

ArchieAtkinson left a comment •

edited

Loading

ArchieAtkinson Jan 12, 2025

ArchieAtkinson Jan 12, 2025

ArchieAtkinson Jan 12, 2025

ArchieAtkinson Jan 12, 2025

ArchieAtkinson Jan 12, 2025

ArchieAtkinson Jan 12, 2025

ArchieAtkinson Jan 12, 2025

ArchieAtkinson Jan 12, 2025

ArchieAtkinson Jan 12, 2025

ArchieAtkinson Jan 12, 2025

		}


		test! {

		}


		test! {

Adds no-exit-message Setting and [exit-message] attribute #2568

Are you sure you want to change the base?

Adds no-exit-message Setting and [exit-message] attribute #2568

Conversation

ArchieAtkinson commented Jan 12, 2025

casey left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ArchieAtkinson left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Adds `no-exit-message` Setting and `[exit-message]` attribute #2568

Adds `no-exit-message` Setting and `[exit-message]` attribute #2568

ArchieAtkinson left a comment •

edited

Loading