Fix exit code in non-interactive shell

Resolves #1339

Author: fmbenhassine

spring-shell-core/src/main/java/org/springframework/shell/core/NonInteractiveShellRunner.java

@@ -23,6 +23,7 @@
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.shell.core.command.CommandContext;
+import org.springframework.shell.core.command.CommandExecutionException;
 import org.springframework.shell.core.command.CommandExecutor;
 import org.springframework.shell.core.command.CommandParser;
 import org.springframework.shell.core.command.CommandRegistry;
@@ -137,7 +138,8 @@ private void executeScript(InputProvider inputProvider) {
 			if (ExitStatus.OK.code() != exitStatus.code()) { // business error
 				log.error("Command " + parsedInput.commandName() + " returned an error: " + exitStatus.description()
 						+ ". Skipping next commands in the script");
-				break;
+				throw new CommandExecutionException("Unable to execute command " + parsedInput.commandName() + ": "
+						+ exitStatus.description() + ". Skipping next commands in the script");
 			}
 		}
 	}
@@ -156,6 +158,8 @@ private void executeCommand(String primaryCommand) {
 		ExitStatus exitStatus = this.commandExecutor.execute(commandContext);
 		if (ExitStatus.OK.code() != exitStatus.code()) {
 			log.error("Command " + parsedInput.commandName() + " returned an error: " + exitStatus.description());
+			throw new CommandExecutionException(
+					"Unable to execute command " + primaryCommand + ": " + exitStatus.description(), exitStatus.code());
 		}
 	}
 

spring-shell-core/src/main/java/org/springframework/shell/core/command/CommandExecutionException.java

@@ -24,12 +24,44 @@
  */
 public class CommandExecutionException extends RuntimeException {
 
+	private int exitCode = ExitStatus.EXECUTION_ERROR.code();
+
+	/**
+	 * Create a new {@code CommandExecutionException} with the given message.
+	 * @param message the detail message
+	 */
 	public CommandExecutionException(String message) {
 		super(message);
 	}
 
+	/**
+	 * Create a new {@code CommandExecutionException} with the given message and exit
+	 * code.
+	 * @param message the detail message
+	 * @param exitCode the exit code associated with this exception
+	 * @since 4.0.2
+	 */
+	public CommandExecutionException(String message, int exitCode) {
+		super(message);
+		this.exitCode = exitCode;
+	}
+
+	/**
+	 * Create a new {@code CommandExecutionException} with the given message and cause.
+	 * @param message the detail message
+	 * @param cause the cause
+	 */
 	public CommandExecutionException(String message, Throwable cause) {
 		super(message, cause);
 	}
 
+	/**
+	 * Return the exit code associated with this exception.
+	 * @return the exit code
+	 * @since 4.0.2
+	 */
+	public int getExitCode() {
+		return this.exitCode;
+	}
+
 }