Merge branch 'pr549' into stable

* pr549: (GH-468) Log help to standard out, not standard error Fixes #468
chocolatey · Jan 18, 2016 · d9d59ff · d9d59ff
2 parents 15198fa + 40001d0
commit d9d59ff
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/src/chocolatey.tests/infrastructure.app/configuration/ConfigurationOptionsSpec.cs b/src/chocolatey.tests/infrastructure.app/configuration/ConfigurationOptionsSpec.cs
@@ -39,13 +39,15 @@ public abstract class ConfigurationOptionsSpecBase : TinySpec
 
             protected Mock<IConsole> console = new Mock<IConsole>();
             protected static StringBuilder helpMessageContents = new StringBuilder();
-            protected TextWriter writer = new StringWriter(helpMessageContents);
+            protected TextWriter errorWriter = new StringWriter(helpMessageContents);
+            protected TextWriter outputWriter = new StringWriter(helpMessageContents);
 
             public override void Context()
             {
                 ConfigurationOptions.initialize_with(new Lazy<IConsole>(() => console.Object));
                 ConfigurationOptions.reset_options();
-                console.Setup((c) => c.Error).Returns(writer);
+                console.Setup((c) => c.Error).Returns(errorWriter);
+                console.Setup((c) => c.Out).Returns(outputWriter);
             }
 
             protected Action because;

diff --git a/src/chocolatey/infrastructure.app/configuration/ConfigurationOptions.cs b/src/chocolatey/infrastructure.app/configuration/ConfigurationOptions.cs
@@ -134,7 +134,7 @@ private static void show_help(OptionSet optionSet, Action helpMessage)
                 helpMessage.Invoke();
             }
 
-            optionSet.WriteOptionDescriptions(Console.Error);
+            optionSet.WriteOptionDescriptions(Console.Out);
         }
     }
 }
diff --git a/src/chocolatey/infrastructure/adapters/Console.cs b/src/chocolatey/infrastructure/adapters/Console.cs
@@ -42,6 +42,8 @@ public System.ConsoleKeyInfo ReadKey(int timeoutMilliseconds)
 
         public TextWriter Error { get { return System.Console.Error; } }
 
+        public TextWriter Out { get { return System.Console.Out; } }
+
         public void Write(object value)
         {
             System.Console.Write(value.to_string());

diff --git a/src/chocolatey/infrastructure/adapters/IConsole.cs b/src/chocolatey/infrastructure/adapters/IConsole.cs
@@ -54,6 +54,15 @@ public interface IConsole
         /// <filterpriority>1</filterpriority>
         TextWriter Error { get; }
 
+        /// <summary>
+        ///   Gets the standard output stream.
+        /// </summary>
+        /// <returns>
+        ///   A <see cref="T:System.IO.TextWriter" /> that represents the standard output stream.
+        /// </returns>
+        /// <filterpriority>1</filterpriority>
+        TextWriter Out { get; }
+
         /// <summary>
         ///   Writes the specified string value to the standard output stream.
         /// </summary>