Improved support for GitHub issue tracker

Author: GeertvanHorrik

src/GitTools.IssueTrackers/Context/Extensions/IIssueTrackerContextExtensions.cs

@@ -26,19 +26,24 @@ public static bool Validate(this IIssueTrackerContext context)
 
         public static IssueTracker? GetIssueTracker(this IIssueTrackerContext context)
         {
-            return IssueTracker.Jira;
+            var server = string.IsNullOrWhiteSpace(context.Server) ? string.Empty : context.Server.ToLower();
 
             // TODO: implement more detections
 
-            //if (context.IssueTracker is BitBucketContext)
-            //{
-            //    return IssueTracker.BitBucket;
-            //}
+            if (server.Contains("bitbucket"))
+            {
+                return IssueTracker.BitBucket;
+            }
 
-            //if (context.IssueTracker is GitHubContext)
-            //{
-            //    return IssueTracker.GitHub;
-            //}
+            if (server.Contains("github"))
+            {
+                return IssueTracker.GitHub;
+            }
+
+            if (server.Contains("atlassian"))
+            {
+                return IssueTracker.Jira;
+            }
 
             //if (context.IssueTracker is JiraContext)
             //{
@@ -51,6 +56,8 @@ public static bool Validate(this IIssueTrackerContext context)
             //}
 
             //return null;
+
+            return IssueTracker.Jira;
         }
     }
 }

src/GitTools.IssueTrackers/GitTools.IssueTrackers.csproj

@@ -79,7 +79,7 @@
     <Compile Include="Context\IssueTrackerContext.cs" />
     <Compile Include="IssueTrackers\GitHub\GitHubIssueTracker.cs" />
     <Compile Include="IssueTrackers\IssueTrackerBase.cs" />
-    <Compile Include="IssueTrackers\IssueTrackerFactoryr.cs" />
+    <Compile Include="IssueTrackers\IssueTrackerFactory.cs" />
     <Compile Include="IssueTrackers\Jira\JiraIssueTracker.cs" />
     <Compile Include="Models\Contributor.cs" />
     <Compile Include="Models\Issue.cs" />

src/GitTools.IssueTrackers/IssueTrackers/GitHub/GitHubIssueTracker.cs

@@ -5,6 +5,7 @@
     using System.Globalization;
     using System.Linq;
     using System.Text.RegularExpressions;
+    using System.Threading.Tasks;
     using Logging;
     using Octokit;
     using Issue = IssueTrackers.Issue;
@@ -19,7 +20,7 @@ public GitHubIssueTracker(IIssueTrackerContext issueTrackerContext)
 
         }
 
-        public override IEnumerable<Issue> GetIssues(IssueTrackerFilter filter)
+        public override async Task<IEnumerable<Issue>> GetIssuesAsync(IssueTrackerFilter filter)
         {
             var gitHubClient = new GitHubClient(new ProductHeaderValue("GitReleaseNotes"));
 
@@ -42,9 +43,9 @@ public override IEnumerable<Issue> GetIssues(IssueTrackerFilter filter)
             GetRepository(out organisation, out repository);
 
             var repositoryIssueRequest = PrepareFilter(filter);
-            var forRepository = gitHubClient.Issue.GetAllForRepository(organisation, repository, repositoryIssueRequest);
+            var forRepository = await gitHubClient.Issue.GetAllForRepository(organisation, repository, repositoryIssueRequest);
 
-            var readOnlyList = forRepository.Result.Where(i => i.ClosedAt > filter.Since);
+            var readOnlyList = forRepository.Where(i => i.ClosedAt > filter.Since);
 
             //var userCache = new Dictionary<string, User>();
             //Func<User, string> getUserName = u =>

src/GitTools.IssueTrackers/IssueTrackers/Interfaces/IIssueTracker.cs

@@ -1,11 +1,10 @@
 namespace GitTools.IssueTrackers
 {
-    using System;
     using System.Collections.Generic;
-    using Octokit;
+    using System.Threading.Tasks;
 
     public interface IIssueTracker
     {
-        IEnumerable<Issue> GetIssues(IssueTrackerFilter filter);
+        Task<IEnumerable<Issue>> GetIssuesAsync(IssueTrackerFilter filter);
     }
 }

src/GitTools.IssueTrackers/IssueTrackers/IssueTrackerBase.cs

@@ -2,6 +2,7 @@
 {
     using System;
     using System.Collections.Generic;
+    using System.Threading.Tasks;
 
     public abstract class IssueTrackerBase : IIssueTracker
     {
@@ -12,6 +13,6 @@ public IssueTrackerBase(IIssueTrackerContext issueTrackerContext)
 
         protected IIssueTrackerContext IssueTrackerContext { get; private set; }
 
-        public abstract IEnumerable<Issue> GetIssues(IssueTrackerFilter filter);
+        public abstract Task<IEnumerable<Issue>> GetIssuesAsync(IssueTrackerFilter filter);
     }
 }

src/GitTools.IssueTrackers/IssueTrackers/IssueTrackerFactoryr.cs renamed to src/GitTools.IssueTrackers/IssueTrackers/IssueTrackerFactory.cs

@@ -1,6 +1,8 @@
 namespace GitTools.IssueTrackers
 {
+    using GitHub;
     using Jira;
+    using Octokit;
 
     public class IssueTrackerFactory : IIssueTrackerFactory
     {
@@ -11,17 +13,8 @@ public IIssueTracker CreateIssueTracker(IIssueTrackerContext context)
                 //case IssueTracker.BitBucket:
                 //    break;
 
-                //case IssueTracker.GitHub:
-                //    return new GitHubIssueTracker(repository, () =>
-                //    {
-                //        var gitHubClient = new GitHubClient(new ProductHeaderValue("GitReleaseNotes"));
-                //        if (context.IssueTracker.Token != null)
-                //        {
-                //            gitHubClient.Credentials = new Octokit.Credentials(context.IssueTracker.Token);
-                //        }
-
-                //        return gitHubClient;
-                //    }, context);
+                case IssueTracker.GitHub:
+                    return new GitHubIssueTracker(context);
 
                 case IssueTracker.Jira:
                     return new JiraIssueTracker(context);

src/GitTools.IssueTrackers/IssueTrackers/Jira/JiraIssueTracker.cs

@@ -3,6 +3,7 @@
     using System;
     using System.Collections.Generic;
     using System.Linq;
+    using System.Threading.Tasks;
     using Atlassian.Jira;
     using Logging;
     using Issue = IssueTrackers.Issue;
@@ -20,7 +21,7 @@ public JiraIssueTracker(IIssueTrackerContext issueTrackerContext)
         {
         }
 
-        public override IEnumerable<Issue> GetIssues(IssueTrackerFilter filter)
+        public override async Task<IEnumerable<Issue>> GetIssuesAsync(IssueTrackerFilter filter)
         {
             Log.DebugFormat("Connecting to Jira server '{0}'", IssueTrackerContext.Server);