From 5f124ee2e2ea5fbc3b8cf9662f1d3ef6d04be5ab Mon Sep 17 00:00:00 2001 From: Brendan Forster Date: Tue, 18 Feb 2014 21:34:28 +1100 Subject: [PATCH] moved deployment client under Repository, updated errything related --- .../Clients/IObservableRepositoriesClient.cs | 9 +++++++++ .../Clients/ObservableDeploymentStatusClient.cs | 2 +- .../Clients/ObservableDeploymentsClient.cs | 2 +- .../Clients/ObservableRepositoriesClient.cs | 10 ++++++++++ .../Clients/DeploymentStatusClientTests.cs | 2 +- .../Clients/DeploymentsClientTests.cs | 2 +- .../Reactive/ObservableDeploymentStatusClientTests.cs | 4 ++-- .../Reactive/ObservableDeploymentsClientTests.cs | 4 ++-- Octokit/Clients/IRepositoriesClient.cs | 8 ++++++++ Octokit/Clients/RepositoriesClient.cs | 8 ++++++++ Octokit/IGitHubClient.cs | 1 - 11 files changed, 43 insertions(+), 9 deletions(-) diff --git a/Octokit.Reactive/Clients/IObservableRepositoriesClient.cs b/Octokit.Reactive/Clients/IObservableRepositoriesClient.cs index ee4eb044..956270e0 100644 --- a/Octokit.Reactive/Clients/IObservableRepositoriesClient.cs +++ b/Octokit.Reactive/Clients/IObservableRepositoriesClient.cs @@ -1,6 +1,7 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Reactive; +using Octokit.Reactive.Clients; namespace Octokit.Reactive { @@ -99,6 +100,14 @@ namespace Octokit.Reactive /// IObservableCommitStatusClient CommitStatus { get; } + /// + /// Client for GitHub's Repository Deployments API + /// + /// + /// See the Collaborators API documentation for more details + /// + IObservableDeploymentsClient Deployment { get; } + /// /// Gets all the branches for the specified repository. /// diff --git a/Octokit.Reactive/Clients/ObservableDeploymentStatusClient.cs b/Octokit.Reactive/Clients/ObservableDeploymentStatusClient.cs index ec646d9e..3e28963c 100644 --- a/Octokit.Reactive/Clients/ObservableDeploymentStatusClient.cs +++ b/Octokit.Reactive/Clients/ObservableDeploymentStatusClient.cs @@ -14,7 +14,7 @@ namespace Octokit.Reactive.Clients { Ensure.ArgumentNotNull(client, "client"); - _client = client.Deployment.Status; + _client = client.Repository.Deployment.Status; _connection = client.Connection; } diff --git a/Octokit.Reactive/Clients/ObservableDeploymentsClient.cs b/Octokit.Reactive/Clients/ObservableDeploymentsClient.cs index 06f5c258..b94dfbeb 100644 --- a/Octokit.Reactive/Clients/ObservableDeploymentsClient.cs +++ b/Octokit.Reactive/Clients/ObservableDeploymentsClient.cs @@ -13,7 +13,7 @@ namespace Octokit.Reactive.Clients { Ensure.ArgumentNotNull(client, "client"); - _client = client.Deployment; + _client = client.Repository.Deployment; _connection = client.Connection; } diff --git a/Octokit.Reactive/Clients/ObservableRepositoriesClient.cs b/Octokit.Reactive/Clients/ObservableRepositoriesClient.cs index 5320f434..96e1ae95 100644 --- a/Octokit.Reactive/Clients/ObservableRepositoriesClient.cs +++ b/Octokit.Reactive/Clients/ObservableRepositoriesClient.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Reactive; using System.Reactive.Linq; using System.Reactive.Threading.Tasks; +using Octokit.Reactive.Clients; using Octokit.Reactive.Internal; namespace Octokit.Reactive @@ -20,6 +21,7 @@ namespace Octokit.Reactive _connection = client.Connection; CommitStatus = new ObservableCommitStatusClient(client); RepoCollaborators = new ObservableRepoCollaboratorsClient(client); + Deployment = new ObservableDeploymentsClient(client); } /// @@ -160,6 +162,14 @@ namespace Octokit.Reactive /// public IObservableCommitStatusClient CommitStatus { get; private set; } + /// + /// Client for GitHub's Repository Deployments API + /// + /// + /// See the Collaborators API documentation for more details + /// + public IObservableDeploymentsClient Deployment { get; private set; } + /// /// Gets all the branches for the specified repository. /// diff --git a/Octokit.Tests.Integration/Clients/DeploymentStatusClientTests.cs b/Octokit.Tests.Integration/Clients/DeploymentStatusClientTests.cs index 1fce0b71..025e3b56 100644 --- a/Octokit.Tests.Integration/Clients/DeploymentStatusClientTests.cs +++ b/Octokit.Tests.Integration/Clients/DeploymentStatusClientTests.cs @@ -21,7 +21,7 @@ public class DeploymentStatusClientTests : IDisposable Credentials = Helper.Credentials }; - _deploymentsClient = _gitHubClient.Deployment; + _deploymentsClient = _gitHubClient.Repository.Deployment; var newRepository = new NewRepository { diff --git a/Octokit.Tests.Integration/Clients/DeploymentsClientTests.cs b/Octokit.Tests.Integration/Clients/DeploymentsClientTests.cs index 9c0b182c..3262e3cd 100644 --- a/Octokit.Tests.Integration/Clients/DeploymentsClientTests.cs +++ b/Octokit.Tests.Integration/Clients/DeploymentsClientTests.cs @@ -20,7 +20,7 @@ public class DeploymentsClientTests : IDisposable Credentials = Helper.Credentials }; - _deploymentsClient = _gitHubClient.Deployment; + _deploymentsClient = _gitHubClient.Repository.Deployment; var newRepository = new NewRepository { diff --git a/Octokit.Tests/Reactive/ObservableDeploymentStatusClientTests.cs b/Octokit.Tests/Reactive/ObservableDeploymentStatusClientTests.cs index 0c98d2a0..44a34c6d 100644 --- a/Octokit.Tests/Reactive/ObservableDeploymentStatusClientTests.cs +++ b/Octokit.Tests/Reactive/ObservableDeploymentStatusClientTests.cs @@ -87,7 +87,7 @@ namespace Octokit.Tests.Reactive public void SetupWithNonReactiveClient() { var deploymentStatusClient = new DeploymentStatusClient(Substitute.For()); - _githubClient.Deployment.Status.Returns(deploymentStatusClient); + _githubClient.Repository.Deployment.Status.Returns(deploymentStatusClient); _client = new ObservableDeploymentStatusClient(_githubClient); } @@ -125,7 +125,7 @@ namespace Octokit.Tests.Reactive var newStatus = new NewDeploymentStatus(); _client.Create("owner", "repo", 1, newStatus); - _githubClient.Deployment.Status.Received(1) + _githubClient.Repository.Deployment.Status.Received(1) .Create(Arg.Is("owner"), Arg.Is("repo"), Arg.Is(1), diff --git a/Octokit.Tests/Reactive/ObservableDeploymentsClientTests.cs b/Octokit.Tests/Reactive/ObservableDeploymentsClientTests.cs index 486c31b3..0964cde8 100644 --- a/Octokit.Tests/Reactive/ObservableDeploymentsClientTests.cs +++ b/Octokit.Tests/Reactive/ObservableDeploymentsClientTests.cs @@ -90,7 +90,7 @@ namespace Octokit.Tests.Reactive private void SetupWithNonReactiveClient() { var deploymentsClient = new DeploymentsClient(Substitute.For()); - _githubClient.Deployment.Returns(deploymentsClient); + _githubClient.Repository.Deployment.Returns(deploymentsClient); _client = new ObservableDeploymentsClient(_githubClient); } @@ -131,7 +131,7 @@ namespace Octokit.Tests.Reactive var newDeployment = new NewDeployment(); _client.Create("owner", "repo", newDeployment); - _githubClient.Deployment.Received(1).Create(Arg.Is("owner"), + _githubClient.Repository.Deployment.Received(1).Create(Arg.Is("owner"), Arg.Is("repo"), Arg.Is(newDeployment)); } diff --git a/Octokit/Clients/IRepositoriesClient.cs b/Octokit/Clients/IRepositoriesClient.cs index 47b6c7ae..31124105 100644 --- a/Octokit/Clients/IRepositoriesClient.cs +++ b/Octokit/Clients/IRepositoriesClient.cs @@ -144,6 +144,14 @@ namespace Octokit /// IRepoCollaboratorsClient RepoCollaborators { get; } + /// + /// Client for GitHub's Repository Deployments API + /// + /// + /// See the Collaborators API documentation for more details + /// + IDeploymentsClient Deployment { get; } + /// /// Gets all the branches for the specified repository. /// diff --git a/Octokit/Clients/RepositoriesClient.cs b/Octokit/Clients/RepositoriesClient.cs index c894c179..99c742d1 100644 --- a/Octokit/Clients/RepositoriesClient.cs +++ b/Octokit/Clients/RepositoriesClient.cs @@ -24,6 +24,7 @@ namespace Octokit { CommitStatus = new CommitStatusClient(apiConnection); RepoCollaborators = new RepoCollaboratorsClient(apiConnection); + Deployment = new DeploymentsClient(apiConnection); } /// @@ -222,6 +223,13 @@ namespace Octokit /// public IRepoCollaboratorsClient RepoCollaborators { get; private set; } + /// + /// Client for GitHub's Repository Deployments API + /// + /// + /// See the Collaborators API documentation for more details + /// + public IDeploymentsClient Deployment { get; private set; } /// /// Gets all the branches for the specified repository. diff --git a/Octokit/IGitHubClient.cs b/Octokit/IGitHubClient.cs index 34ca02c8..e12d44ce 100644 --- a/Octokit/IGitHubClient.cs +++ b/Octokit/IGitHubClient.cs @@ -22,7 +22,6 @@ namespace Octokit INotificationsClient Notification { get; } IGitDatabaseClient GitDatabase { get; } ISearchClient Search { get; } - IDeploymentsClient Deployment { get; } IStatisticsClient Statistics { get; } } }