From 82096b98b0eee41d5e79910e77b8d1a5ed296f5c Mon Sep 17 00:00:00 2001
From: Aleksandr Mashchenko <aleksandr.7m@gmail.com>
Date: Tue, 14 Jun 2016 23:57:02 +0300
Subject: [PATCH] #18 - Fixes executing commands with verbose parameter

---
 .../plugin/gitflow/AbstractGitFlowMojo.java   | 16 ++-----
 .../gitflow/StringBufferStreamConsumer.java   | 48 +++++++++++++++++++
 2 files changed, 51 insertions(+), 13 deletions(-)
 create mode 100644 src/main/java/com/amashchenko/maven/plugin/gitflow/StringBufferStreamConsumer.java

diff --git a/src/main/java/com/amashchenko/maven/plugin/gitflow/AbstractGitFlowMojo.java b/src/main/java/com/amashchenko/maven/plugin/gitflow/AbstractGitFlowMojo.java
index eb3a3104..5cf21473 100644
--- a/src/main/java/com/amashchenko/maven/plugin/gitflow/AbstractGitFlowMojo.java
+++ b/src/main/java/com/amashchenko/maven/plugin/gitflow/AbstractGitFlowMojo.java
@@ -33,10 +33,7 @@
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.cli.CommandLineException;
 import org.codehaus.plexus.util.cli.CommandLineUtils;
-import org.codehaus.plexus.util.cli.CommandLineUtils.StringStreamConsumer;
 import org.codehaus.plexus.util.cli.Commandline;
-import org.codehaus.plexus.util.cli.DefaultConsumer;
-import org.codehaus.plexus.util.cli.StreamConsumer;
 
 /**
  * Abstract git flow mojo.
@@ -621,12 +618,8 @@ private CommandResult executeCommand(final Commandline cmd,
         cmd.clearArgs();
         cmd.addArguments(args);
 
-        final StreamConsumer out;
-        if (verbose) {
-            out = new DefaultConsumer();
-        } else {
-            out = new CommandLineUtils.StringStreamConsumer();
-        }
+        final StringBufferStreamConsumer out = new StringBufferStreamConsumer(
+                verbose);
 
         final CommandLineUtils.StringStreamConsumer err = new CommandLineUtils.StringStreamConsumer();
 
@@ -634,10 +627,7 @@ private CommandResult executeCommand(final Commandline cmd,
         final int exitCode = CommandLineUtils.executeCommandLine(cmd, out, err);
 
         String errorStr = err.getOutput();
-        String outStr = "";
-        if (out instanceof StringStreamConsumer) {
-            outStr = ((StringStreamConsumer) out).getOutput();
-        }
+        String outStr = out.getOutput();
 
         if (failOnError && exitCode != SUCCESS_EXIT_CODE) {
             // not all commands print errors to error stream
diff --git a/src/main/java/com/amashchenko/maven/plugin/gitflow/StringBufferStreamConsumer.java b/src/main/java/com/amashchenko/maven/plugin/gitflow/StringBufferStreamConsumer.java
new file mode 100644
index 00000000..742b8c5a
--- /dev/null
+++ b/src/main/java/com/amashchenko/maven/plugin/gitflow/StringBufferStreamConsumer.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2014-2016 Aleksandr Mashchenko.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.amashchenko.maven.plugin.gitflow;
+
+import org.codehaus.plexus.util.cli.StreamConsumer;
+
+public class StringBufferStreamConsumer implements StreamConsumer {
+    private static final String LS = System.getProperty("line.separator");
+
+    private final StringBuffer buffer;
+
+    private final boolean printOut;
+
+    public StringBufferStreamConsumer() {
+        this(false);
+    }
+
+    public StringBufferStreamConsumer(boolean printOut) {
+        this.buffer = new StringBuffer();
+        this.printOut = printOut;
+    }
+
+    @Override
+    public void consumeLine(String line) {
+        if (printOut) {
+            System.out.println(line);
+        }
+
+        buffer.append(line).append(LS);
+    }
+
+    public String getOutput() {
+        return buffer.toString();
+    }
+}