From cfd8762020c38aec27f86877208f2bdc0ece3609 Mon Sep 17 00:00:00 2001 From: SparrowBrain Date: Fri, 4 Oct 2024 22:18:34 +0300 Subject: [PATCH] v1.5.2 extension.yaml update --- PlayNext/extension.yaml | 2 +- .../GitHubTools/AuthStatusParserTests.cs | 46 +++++++++---------- ReleaseTools/GitHubTools/AuthStatusParser.cs | 2 +- ReleaseTools/Program.cs | 9 ++-- 4 files changed, 30 insertions(+), 29 deletions(-) diff --git a/PlayNext/extension.yaml b/PlayNext/extension.yaml index 8cc2321..09395b0 100644 --- a/PlayNext/extension.yaml +++ b/PlayNext/extension.yaml @@ -1,7 +1,7 @@ Id: SparrowBrain_PlayNext Name: Play Next Author: SparrowBrain -Version: 1.5.1 +Version: 1.5.2 Module: PlayNext.dll Type: GenericPlugin Icon: icon.png diff --git a/ReleaseTools.UnitTests/GitHubTools/AuthStatusParserTests.cs b/ReleaseTools.UnitTests/GitHubTools/AuthStatusParserTests.cs index 72e6b5d..891f801 100644 --- a/ReleaseTools.UnitTests/GitHubTools/AuthStatusParserTests.cs +++ b/ReleaseTools.UnitTests/GitHubTools/AuthStatusParserTests.cs @@ -4,32 +4,32 @@ namespace ReleaseTools.UnitTests.GitHubTools { - public class AuthStatusParserTests - { - [Theory, AutoData] - public void IsUserLoggedIn_ReturnsTrue_When_UserIsLoggedIn(AuthStatusParser sut) - { - // Arrange - var output = "\u001b[0;1;39mgithub.com\u001b[0m\r\n \u001b[0;32mŌ£ō\u001b[0m Logged in to github.com as \u001b[0;1;39mSparrowBrain\u001b[0m (keyring)\r\n \u001b[0;32mŌ£ō\u001b[0m Git operations for github.com configured to use \u001b[0;1;39mhttps\u001b[0m protocol.\r\n \u001b[0;32mŌ£ō\u001b[0m Token: gho_************************************\r\n \u001b[0;32mŌ£ō\u001b[0m Token scopes: gist, read:org, repo\r\n\r\n"; + public class AuthStatusParserTests + { + [Theory, AutoData] + public void IsUserLoggedIn_ReturnsTrue_When_UserIsLoggedIn(AuthStatusParser sut) + { + // Arrange + var output = "\u001b[0;1;39mgithub.com\u001b[0m\r\n \u001b[0;32mŌ£ō\u001b[0m Logged in to github.com account \u001b[0;1;39mSparrowBrain\u001b[0m (keyring)\r\n \u001b[0;32mŌ£ō\u001b[0m Git operations for github.com configured to use \u001b[0;1;39mhttps\u001b[0m protocol.\r\n \u001b[0;32mŌ£ō\u001b[0m Token: gho_************************************\r\n \u001b[0;32mŌ£ō\u001b[0m Token scopes: gist, read:org, repo\r\n\r\n"; - // Act - var result = sut.IsUserLoggedIn(output); + // Act + var result = sut.IsUserLoggedIn(output); - // Assert - Assert.True(result); - } + // Assert + Assert.True(result); + } - [Theory, AutoData] - public void IsUserLoggedIn_ReturnsFalse_When_UserIsLoggedOut(AuthStatusParser sut) - { - // Arrange - var output = "You are not logged into any GitHub hosts. Run \u001b[0;1;39mgh auth login\u001b[0m to authenticate.\r\n\r\n"; + [Theory, AutoData] + public void IsUserLoggedIn_ReturnsFalse_When_UserIsLoggedOut(AuthStatusParser sut) + { + // Arrange + var output = "You are not logged into any GitHub hosts. Run \u001b[0;1;39mgh auth login\u001b[0m to authenticate.\r\n\r\n"; - // Act - var result = sut.IsUserLoggedIn(output); + // Act + var result = sut.IsUserLoggedIn(output); - // Assert - Assert.False(result); - } - } + // Assert + Assert.False(result); + } + } } \ No newline at end of file diff --git a/ReleaseTools/GitHubTools/AuthStatusParser.cs b/ReleaseTools/GitHubTools/AuthStatusParser.cs index e798a8b..4348dcd 100644 --- a/ReleaseTools/GitHubTools/AuthStatusParser.cs +++ b/ReleaseTools/GitHubTools/AuthStatusParser.cs @@ -4,7 +4,7 @@ public class AuthStatusParser { public bool IsUserLoggedIn(string output) { - return output.Contains("Logged in to github.com as"); + return output.Contains("Logged in to github.com account"); } } } \ No newline at end of file diff --git a/ReleaseTools/Program.cs b/ReleaseTools/Program.cs index f0c8eeb..733d509 100644 --- a/ReleaseTools/Program.cs +++ b/ReleaseTools/Program.cs @@ -21,7 +21,7 @@ private static async Task Main(string[] args) var pathToSolution = ".."; var msBuild = @"""C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin\MSBuild.exe"""; - var testRunner = @"""C:\Users\Qwx\Documents\src\Playnite.PlayNext\packages\xunit.runner.console.2.4.2\tools\net462\xunit.console.exe"""; + var testRunner = $@"""{pathToSolution}\packages\xunit.runner.console.2.4.2\tools\net462\xunit.console.exe"""; var toolbox = @"""C:\Users\Qwx\AppData\Local\Playnite\Toolbox.exe"""; await EnsureGitHubAuthentication(); @@ -55,11 +55,12 @@ private static async Task EnsureGitHubAuthentication() var p = new Process(); p.StartInfo.UseShellExecute = false; p.StartInfo.RedirectStandardError = true; - p.StartInfo.FileName = "gh"; + p.StartInfo.RedirectStandardOutput = true; + p.StartInfo.FileName = "gh"; p.StartInfo.Arguments = "auth status"; p.Start(); - var output = await p.StandardError.ReadToEndAsync(); - p.WaitForExit(); + var output = await p.StandardOutput.ReadToEndAsync(); + p.WaitForExit(); if (!authStatusParser.IsUserLoggedIn(output)) {