Skip to content

Console improvements #176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 26, 2014
Merged

Console improvements #176

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a25720
Write to console when output type is BuildServer. Fixes #158
May 10, 2014
78a67b6
When proj or exec args are specified output type is build server. Fix…
May 10, 2014
347abcd
Fixed failing tests
May 24, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions GitVersionExe/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ static void Main()
return;
}

if (!string.IsNullOrEmpty(arguments.Proj) || !string.IsNullOrEmpty(arguments.Exec))
arguments.Output = OutputType.BuildServer;

ConfigureLogging(arguments);

var gitPreparer = new GitPreparer(arguments);
Expand Down Expand Up @@ -142,11 +145,16 @@ static IEnumerable<IBuildServer> GetApplicableBuildServers(Arguments arguments)

static void ConfigureLogging(Arguments arguments)
{
Action<string> writeAction = x => { };
var writeActions = new List<Action<string>>();

if (arguments.Output == OutputType.BuildServer)
{
writeActions.Add(Console.WriteLine);
}

if (arguments.LogFilePath == "console")
{
writeAction = Console.WriteLine;
writeActions.Add(Console.WriteLine);
}
else if (arguments.LogFilePath != null)
{
Expand All @@ -158,17 +166,17 @@ static void ConfigureLogging(Arguments arguments)
using (File.CreateText(arguments.LogFilePath)) { }
}

writeAction = x => WriteLogEntry(arguments, x);
writeActions.Add(x => WriteLogEntry(arguments, x));
}
catch (Exception ex)
{
Console.WriteLine("Failed to configure logging: " + ex.Message);
}
}

Logger.WriteInfo = writeAction;
Logger.WriteWarning = writeAction;
Logger.WriteError = writeAction;
Logger.WriteInfo = s => writeActions.ForEach(a => a(s));
Logger.WriteWarning = s => writeActions.ForEach(a => a(s));
Logger.WriteError = s => writeActions.ForEach(a => a(s));
}

static void WriteLogEntry(Arguments arguments, string s)
Expand Down