Merge branch 'develop'

GeorgDangl · Jul 16, 2020 · 1751dc3 · 1751dc3
2 parents b8129ee + 43d130e
commit 1751dc3
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 13 deletions.
diff --git a/src/Nuke.GitHub/GitHubSettingsExtensions.cs b/src/Nuke.GitHub/GitHubSettingsExtensions.cs
@@ -63,5 +63,24 @@ public static T ResetToken<T>(this T toolSettings) where T : GitHubSettings
             return toolSettings;
         }
         #endregion
-    }
+        #region GitHub Enterprise URL
+        /// <summary><p><em>Sets <see cref="GitHubSettings.Url"/>.</em></p><p>The GitHub Enterprise URL</p></summary>
+        [Pure]
+        public static T SetGitHubEnterpriseUrl<T>(this T toolSettings, string url) where T : GitHubSettings
+        {
+          var x = new GitHubReleaseSettings();
+          toolSettings = toolSettings.NewInstance();
+          toolSettings.Url = url;
+          return toolSettings;
+        }
+        /// <summary><p><em>Resets <see cref="GitHubSettings.Url"/>.</em></p><p>The GitHub Enterprise URL</p></summary>
+        [Pure]
+        public static T ResetGitHubEnterpriseUrl<T>(this T toolSettings) where T : GitHubSettings
+        {
+          toolSettings = toolSettings.NewInstance();
+          toolSettings.Url = null;
+          return toolSettings;
+        }
+        #endregion
+  }
 }
diff --git a/src/Nuke.GitHub/GitHubTasks.Generated.cs b/src/Nuke.GitHub/GitHubTasks.Generated.cs
@@ -101,7 +101,11 @@ public partial class GitHubSettings : ToolSettings
         ///   The Token for the GitHub API
         /// </summary>
         public virtual string Token { get; internal set; }
-    }
+        /// <summary>
+        ///   The URL for GitHub Enterprise 
+        /// </summary>
+        public virtual string Url { get; internal set; }
+  }
     #endregion
     #region GitHubReleaseSettingsExtensions
     /// <summary>

diff --git a/src/Nuke.GitHub/GitHubTasks.cs b/src/Nuke.GitHub/GitHubTasks.cs
@@ -18,7 +18,7 @@ public static async Task PublishRelease(Configure<GitHubReleaseSettings> configu
             var settings = configure.Invoke(new GitHubReleaseSettings());
             settings.Validate();
             var releaseTag = settings.Tag;
-            var client = GetAuthenticatedClient(settings.Token);
+            var client = GetAuthenticatedClient(settings.Token, settings.Url);
             var existingReleases = await client.Repository.Release.GetAll(settings.RepositoryOwner, settings.RepositoryName);
 
             if (existingReleases.Any(r => r.TagName == releaseTag))
@@ -70,7 +70,7 @@ public static async Task CreatePullRequest(Configure<GitHubPullRequestSettings>
         {
             var settings = configure.Invoke(new GitHubPullRequestSettings());
             settings.Validate();
-            var client = GetAuthenticatedClient(settings.Token);
+            var client = GetAuthenticatedClient(settings.Token, settings.Url);
             var repository = await GetRepository(x => settings);
             var pullRequests = await client.Repository.PullRequest.GetAllForRepository(repository.Id,
                 new PullRequestRequest
@@ -103,33 +103,47 @@ public static async Task<IReadOnlyList<Release>> GetReleases(Configure<GitHubSet
                 apiOptions.PageCount = (int) Math.Ceiling((double) numberOfReleases.Value / 100);
             }
 
-            var client = GetAuthenticatedClient(settings.Token);
+            var client = GetAuthenticatedClient(settings.Token, settings.Url);
             return await client.Repository.Release.GetAll(settings.RepositoryOwner, settings.RepositoryName, apiOptions);
         }
 
         public static async Task<Repository> GetRepository(Configure<GitHubSettings> configurator)
         {
             var settings = configurator.Invoke(new GitHubSettings());
             settings.Validate();
-            var client = GetAuthenticatedClient(settings.Token);
+            var client = GetAuthenticatedClient(settings.Token, settings.Url);
             return await client.Repository.Get(settings.RepositoryOwner, settings.RepositoryName);
         }
 
-        static GitHubClient GetAuthenticatedClient(string token)
+        static GitHubClient GetAuthenticatedClient(string token, string url)
         {
-            var client = new GitHubClient(new ProductHeaderValue("dangl-bot"))
+            if (String.IsNullOrEmpty(url))
             {
+             return new GitHubClient(new ProductHeaderValue("dangl-bot"))
+              {
                 Credentials = new Credentials(token)
-            };
-            return client;
+              };
+            }
+            else
+            {
+              return new GitHubClient(new ProductHeaderValue("dangl-bot"), new Uri(url))
+              {
+                Credentials = new Credentials(token)
+              };
+            }           
         }
 
         public static (string gitHubOwner, string repositoryName) GetGitHubRepositoryInfo(GitRepository gitRepository)
         {
-            ControlFlow.Assert(gitRepository.IsGitHubRepository(), $"The {nameof(gitRepository)} parameter must reference a GitHub repository.");   
-
+            ControlFlow.Assert(gitRepository.IsGitHubRepository(), $"The {nameof(gitRepository)} parameter must reference a GitHub repository.");
             var split = gitRepository.Identifier.Split('/');
             return (split[0], split[1]);
         }
-    }
+
+        public static (string gitHubOwner, string repositoryName) GetGitHubEnterpriseRepositoryInfo(GitRepository gitRepository)
+        {
+          var split = gitRepository.Identifier.Split('/');
+          return (split[0], split[1]);
+        }
+  }
 }