Merge pull request #90 from oracle/Issue#89-Add-new-executeScript-method-to-ScriptRunner.java

Issue#89 add new execute script method to script runner.java

Author: ddsharpe

core/src/main/java/oracle/weblogic/deploy/util/ProcessHandler.java

@@ -10,6 +10,7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
+import java.io.FileOutputStream;
 import java.io.PrintStream;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
@@ -34,6 +35,7 @@ public class ProcessHandler {
     private ProcessBuilder procBuilder;
     private Process process;
     private File logFile;
+    private boolean appendFlag = false;
     private PrintStream stdoutWriter;
     private int timeout = -1;
     private WaitHandler waitHandler;
@@ -53,12 +55,24 @@ public ProcessHandler(String[] cmd, File workingDir) {
     }
 
     /**
-     * Set the log to which to write the standard output of the process.
+     * Set the file to which standard out of the process should be written.
      *
      * @param log the stdout log file
      */
     public void setStdoutLog(File log) {
-        logFile = log;
+        setStdoutLog(log, false);
+    }
+
+    /**
+     * Set the log that standard out of process will be written to, using
+     * the specified append flag. The default is to not append to <code>log</code>.
+     *
+     * @param log the stdout log file
+     * @param appendFlag flag indicating if file should be appended to
+     */
+    public void setStdoutLog(File log, boolean appendFlag) {
+        this.logFile = log;
+        this.appendFlag = appendFlag;
     }
 
     /**
@@ -192,8 +206,7 @@ public void exec(List<String> linesToPipeToStdin) throws ScriptRunnerException {
         LOGGER.entering(CLASS, METHOD);
 
         if (waitHandler == null) {
-            ScriptRunnerException sre =
-                new ScriptRunnerException("WLSDPLY-01201", this.toString());
+            ScriptRunnerException sre = new ScriptRunnerException("WLSDPLY-01201", this.toString());
             LOGGER.throwing(CLASS, METHOD, sre);
             throw sre;
         }
@@ -214,6 +227,7 @@ public void exec(List<String> linesToPipeToStdin) throws ScriptRunnerException {
         if (linesToPipeToStdin != null && !linesToPipeToStdin.isEmpty()) {
             try (BufferedWriter writer =
                 new BufferedWriter(new OutputStreamWriter(process.getOutputStream(), DEFAULT_CHARSET))) {
+
                 for (String line : linesToPipeToStdin) {
                     writer.write(line);
                     writer.newLine();
@@ -292,8 +306,10 @@ public void run() {
             PrintStream logWriter = null;
             try (BufferedReader reader =
                 new BufferedReader(new InputStreamReader(process.getInputStream(), DEFAULT_CHARSET))) {
+
                 if (logFile != null) {
-                    logWriter = new PrintStream(logFile, StandardCharsets.UTF_8.toString());
+                    FileOutputStream fos = new FileOutputStream(logFile, appendFlag);
+                    logWriter = new PrintStream(fos, true, StandardCharsets.UTF_8.toString());
                 }
 
                 String msg;

core/src/main/java/oracle/weblogic/deploy/util/ScriptRunner.java

@@ -45,12 +45,27 @@ public ScriptRunner(Map<String, String> env, String stdoutBaseFileName) {
      * Run the external program.
      *
      * @param scriptToRun the executable program to run
-     * @param linesToPipeToStdout an optional list of lines to write to the external program's starndard input
+     * @param linesToPipeToStdout an optional list of lines to write to the external program's standard input
      * @param args the arguments to pass to the external program on the command-line
      * @return the exit code of the external program
      * @throws ScriptRunnerException if argument validation error or error running the external program occurs
      */
     public int executeScript(File scriptToRun, List<String> linesToPipeToStdout, String... args)
+            throws ScriptRunnerException{
+        return executeScript(scriptToRun,false, linesToPipeToStdout, args);
+    }
+
+    /**
+     * Run the external program.
+     *
+     * @param scriptToRun the executable program to run
+     * @param appendFlag flag indicating if stdout file should be appended to
+     * @param linesToPipeToStdout an optional list of lines to write to the external program's standard input
+     * @param args the arguments to pass to the external program on the command-line
+     * @return the exit code of the external program
+     * @throws ScriptRunnerException if argument validation error or error running the external program occurs
+     */
+    public int executeScript(File scriptToRun, boolean appendFlag, List<String> linesToPipeToStdout, String... args)
         throws ScriptRunnerException{
         final String METHOD = "executeScript";
 
@@ -60,7 +75,7 @@ public int executeScript(File scriptToRun, List<String> linesToPipeToStdout, Str
         String[] command = getCommandStringArray(scriptToRun, args);
 
         ProcessHandler processHandler = new ProcessHandler(command, cwd);
-        processHandler.setStdoutLog(stdoutFile);
+        processHandler.setStdoutLog(stdoutFile, appendFlag);
         processHandler.setBufferStdout();
 
         for (Map.Entry<String, String> envEntry : env.entrySet()) {