zoriya/octokit.net
1
0
Fork 0
mirror of https://github.com/zoriya/octokit.net.git synced 2025-12-05 23:06:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

some cleanup of the project (#2063)

Browse Source
This commit is contained in:
Brendan Forster
2020-01-23 14:51:00 -04:00
committed by GitHub
parent 00f60510d6
commit 28892df03d
20 changed files with 48 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Octokit.Reactive/Clients/IObservableOrganizationMembersClient.cs
View File

@@ -273,7 +273,7 @@ namespace Octokit.Reactive
/// <param name="user">The login for the user</param>
/// <returns></returns>
IObservable<Unit> Conceal(string org, string user);
/// <summary>
/// Get a user's membership with an organization.
/// </summary>

6
Octokit.Reactive/Clients/IObservableRepoCollaboratorsClient.cs
View File

@@ -54,7 +54,7 @@ namespace Octokit.Reactive
/// <param name="options">Options for changing the API response</param>
/// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
IObservable<User> GetAll(long repositoryId, ApiOptions options);
/// <summary>
/// Gets all the collaborators on a repository.
/// </summary>
@@ -77,7 +77,7 @@ namespace Octokit.Reactive
/// <param name="request">Used to request and filter a list of repository collaborators</param>
/// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
IObservable<User> GetAll(long repositoryId, RepositoryCollaboratorListRequest request);
/// <summary>
/// Gets all the collaborators on a repository.
/// </summary>
@@ -90,7 +90,7 @@ namespace Octokit.Reactive
/// <param name="options">Options for changing the API response</param>
/// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
IObservable<User> GetAll(string owner, string name, RepositoryCollaboratorListRequest request, ApiOptions options);
/// <summary>
/// Gets all the collaborators on a repository.
/// </summary>

6
Octokit.Reactive/Clients/ObservableRepoCollaboratorsClient.cs
View File

@@ -89,7 +89,7 @@ namespace Octokit.Reactive
public IObservable<User> GetAll(long repositoryId, ApiOptions options)
{
Ensure.ArgumentNotNull(options, nameof(options));
return GetAll(repositoryId, new RepositoryCollaboratorListRequest(), options);
}
@@ -108,7 +108,7 @@ namespace Octokit.Reactive
Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
Ensure.ArgumentNotNull(request, nameof(request));
return GetAll(owner, name, request, ApiOptions.None);
}
@@ -124,7 +124,7 @@ namespace Octokit.Reactive
public IObservable<User> GetAll(long repositoryId, RepositoryCollaboratorListRequest request)
{
Ensure.ArgumentNotNull(request, nameof(request));
return GetAll(repositoryId, request, ApiOptions.None);
}

5
Octokit.Reactive/Octokit.Reactive.csproj
View File

@@ -15,6 +15,7 @@
<RepositoryUrl>https://github.com/octokit/octokit.net</RepositoryUrl>
<PackageProjectUrl>https://github.com/octokit/octokit.net</PackageProjectUrl>
<PackageIconUrl>https://f.cloud.github.com/assets/19977/1510987/64af2b26-4a9d-11e3-89fc-96a185171c75.png</PackageIconUrl>
<PackageIcon>octokit.png</PackageIcon>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageTags>GitHub API Octokit linqpad-samples dotnetcore</PackageTags>
<Copyright>Copyright GitHub 2017</Copyright>
@@ -41,6 +42,10 @@
<ProjectReference Include="..\Octokit\Octokit.csproj" />
</ItemGroup>
<ItemGroup>
<None Include="images\octokit.png" Pack="true" PackagePath="\"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Reactive" Version="3.1.0" />
<PackageReference Include="SourceLink.Create.GitHub" Version="2.8.3" PrivateAssets="all" />

BIN
Octokit.Reactive/images/octokit.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

10
Octokit.Tests.Integration/Clients/OrganizationMembersClientTests.cs
View File

@@ -136,14 +136,14 @@ namespace Octokit.Tests.Integration.Clients
using (var teamContext = await _gitHub.CreateTeamContext(Helper.Organization, new NewTeam(Helper.MakeNameWithTimestamp("team"))))
{
teamContext.InviteMember("alfhenrik-test-2");
var organizationMemberhip = await _gitHub.Organization.Member.GetOrganizationMembership(Helper.Organization, "alfhenrik-test-2");
Assert.Equal(MembershipState.Pending, organizationMemberhip.State);
Assert.Equal(MembershipRole.Member, organizationMemberhip.Role);
}
}
}
public class TheAddOrUpdateOrganizationMembershipMethod
{
readonly IGitHubClient _gitHub;
@@ -165,7 +165,7 @@ namespace Octokit.Tests.Integration.Clients
[OrganizationTest]
public async Task ReturnsUsersPendingAdminOrganizationMembership()
{
var organizationMembership = await _gitHub.Organization.Member.AddOrUpdateOrganizationMembership(Helper.Organization, "alfhenrik-test-2", new OrganizationMembershipUpdate { Role = MembershipRole.Admin});
var organizationMembership = await _gitHub.Organization.Member.AddOrUpdateOrganizationMembership(Helper.Organization, "alfhenrik-test-2", new OrganizationMembershipUpdate { Role = MembershipRole.Admin });
Assert.Equal(MembershipState.Pending, organizationMembership.State);
Assert.Equal(MembershipRole.Admin, organizationMembership.Role);
await _gitHub.Organization.Member.RemoveOrganizationMembership(Helper.Organization, "alfhenrik-test-2");
@@ -175,12 +175,12 @@ namespace Octokit.Tests.Integration.Clients
public class TheRemoveOrganizationMembershipMethod
{
readonly IGitHubClient _gitHub;
public TheRemoveOrganizationMembershipMethod()
{
_gitHub = Helper.GetAuthenticatedClient();
}
[OrganizationTest]
public async Task RemovesOrganizationMembership()
{

10
Octokit.Tests.Integration/Reactive/ObservableOrganizationMembersClientTests.cs
View File

@@ -26,7 +26,7 @@ namespace Octokit.Tests.Integration.Reactive
using (var teamContext = await _gitHub.CreateTeamContext(Helper.Organization, new NewTeam(Helper.MakeNameWithTimestamp("team"))))
{
teamContext.InviteMember("alfhenrik-test-2");
var organizationMemberhip = await _client.GetOrganizationMembership(Helper.Organization, "alfhenrik-test-2");
Assert.Equal(MembershipState.Pending, organizationMemberhip.State);
Assert.Equal(MembershipRole.Member, organizationMemberhip.Role);
@@ -34,7 +34,7 @@ namespace Octokit.Tests.Integration.Reactive
}
}
}
public class TheAddOrUpdateOrganizationMembershipMethod
{
readonly ObservableOrganizationMembersClient _client;
@@ -56,7 +56,7 @@ namespace Octokit.Tests.Integration.Reactive
[OrganizationTest]
public async Task ReturnsUsersPendingAdminOrganizationMembership()
{
var organizationMembership = await _client.AddOrUpdateOrganizationMembership(Helper.Organization, "alfhenrik-test-2", new OrganizationMembershipUpdate { Role = MembershipRole.Admin});
var organizationMembership = await _client.AddOrUpdateOrganizationMembership(Helper.Organization, "alfhenrik-test-2", new OrganizationMembershipUpdate { Role = MembershipRole.Admin });
Assert.Equal(MembershipState.Pending, organizationMembership.State);
Assert.Equal(MembershipRole.Admin, organizationMembership.Role);
await _client.RemoveOrganizationMembership(Helper.Organization, "alfhenrik-test-2");
@@ -66,12 +66,12 @@ namespace Octokit.Tests.Integration.Reactive
public class TheRemoveOrganizationMembershipMethod
{
readonly ObservableOrganizationMembersClient _client;
public TheRemoveOrganizationMembershipMethod()
{
_client = new ObservableOrganizationMembersClient(Helper.GetAuthenticatedClient());
}
[OrganizationTest]
public async Task RemovesOrganizationMembership()
{

4
Octokit.Tests/Clients/OrganizationMembersClientTests.cs
View File

@@ -526,10 +526,10 @@ namespace Octokit.Tests.Clients
public void PostsToTheCorrectUrl()
{
var orgMembershipUpdate = new OrganizationMembershipUpdate();
var connection = Substitute.For<IApiConnection>();
var client = new OrganizationMembersClient(connection);
client.AddOrUpdateOrganizationMembership("org", "username", orgMembershipUpdate);
connection.Received().Put<OrganizationMembership>(Arg.Is<Uri>(u => u.ToString() == "orgs/org/memberships/username"), Arg.Any<object>());

8
Octokit.Tests/Clients/RepoCollaboratorsClientTests.cs
View File

@@ -92,7 +92,7 @@ namespace Octokit.Tests.Clients
Arg.Is<Dictionary<string, string>>(d => d["affiliation"] == "all"),
"application/vnd.github.hellcat-preview+json",
Args.ApiOptions);
request = new RepositoryCollaboratorListRequest
{
Affiliation = CollaboratorAffiliation.Direct
@@ -105,7 +105,7 @@ namespace Octokit.Tests.Clients
Arg.Is<Dictionary<string, string>>(d => d["affiliation"] == "direct"),
"application/vnd.github.hellcat-preview+json",
Args.ApiOptions);
request = new RepositoryCollaboratorListRequest
{
Affiliation = CollaboratorAffiliation.Outside
@@ -150,7 +150,7 @@ namespace Octokit.Tests.Clients
var client = new RepoCollaboratorsClient(connection);
var request = new RepositoryCollaboratorListRequest();
client.GetAll(1, request);
connection.Received()
@@ -173,7 +173,7 @@ namespace Octokit.Tests.Clients
Arg.Is<Dictionary<string, string>>(d => d["affiliation"] == "direct"),
"application/vnd.github.hellcat-preview+json",
Args.ApiOptions);
request = new RepositoryCollaboratorListRequest
{
Affiliation = CollaboratorAffiliation.Outside

2
Octokit.Tests/Reactive/ObservableOrganizationMembersClientTests.cs
View File

@@ -339,7 +339,7 @@ namespace Octokit.Tests.Reactive
public void PostsToTheCorrectUrl()
{
var orgMembershipUpdate = new OrganizationMembershipUpdate();
var gitHubClient = Substitute.For<IGitHubClient>();
var client = new ObservableOrganizationMembersClient(gitHubClient);

2
Octokit/Clients/IOrganizationMembersClient.cs
View File

@@ -279,7 +279,7 @@ namespace Octokit
/// <param name="user">The login for the user</param>
/// <returns></returns>
Task Conceal(string org, string user);
/// <summary>
/// Get a user's membership with an organization.
/// </summary>

6
Octokit/Clients/IRepoCollaboratorsClient.cs
View File

@@ -54,7 +54,7 @@ namespace Octokit
/// <param name="options">Options for changing the API response</param>
/// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
Task<IReadOnlyList<User>> GetAll(long repositoryId, ApiOptions options);
/// <summary>
/// Gets all the collaborators on a repository.
/// </summary>
@@ -77,7 +77,7 @@ namespace Octokit
/// <param name="request">Used to request and filter a list of repository collaborators</param>
/// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
Task<IReadOnlyList<User>> GetAll(long repositoryId, RepositoryCollaboratorListRequest request);
/// <summary>
/// Gets all the collaborators on a repository.
/// </summary>
@@ -90,7 +90,7 @@ namespace Octokit
/// <param name="options">Options for changing the API response</param>
/// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
Task<IReadOnlyList<User>> GetAll(string owner, string name, RepositoryCollaboratorListRequest request, ApiOptions options);
/// <summary>
/// Gets all the collaborators on a repository.
/// </summary>

2
Octokit/Clients/OrganizationMembersClient.cs
View File

@@ -36,7 +36,7 @@ namespace Octokit
[Parameter(Value = "member")]
Member
}
public enum MembershipRole
{
[Parameter(Value = "admin")]

6
Octokit/Clients/RepoCollaboratorsClient.cs
View File

@@ -81,7 +81,7 @@ namespace Octokit
public Task<IReadOnlyList<User>> GetAll(long repositoryId, ApiOptions options)
{
Ensure.ArgumentNotNull(options, nameof(options));
return GetAll(repositoryId, new RepositoryCollaboratorListRequest(), options);
}
@@ -100,7 +100,7 @@ namespace Octokit
Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
Ensure.ArgumentNotNull(request, nameof(request));
return GetAll(owner, name, request, ApiOptions.None);
}
@@ -116,7 +116,7 @@ namespace Octokit
public Task<IReadOnlyList<User>> GetAll(long repositoryId, RepositoryCollaboratorListRequest request)
{
Ensure.ArgumentNotNull(request, nameof(request));
return GetAll(repositoryId, request, ApiOptions.None);
}

2
Octokit/Models/Request/OrganizationMembershipUpdate.cs
View File

@@ -9,7 +9,7 @@ namespace Octokit
{
Role = MembershipRole.Member;
}
/// <summary>
/// The role to give the user in the organization. The default is <see cref="MembershipRole.Member"/>.
/// </summary>

2
Octokit/Models/Request/RepositoryCollaboratorListRequest.cs
View File

@@ -17,7 +17,7 @@ namespace Octokit
{
Affiliation = CollaboratorAffiliation.All; // Default in accordance with the documentation
}
/// <summary>
/// Gets or sets the collaborator affiliation property.
/// </summary>

4
Octokit/Models/Response/EventInfo.cs
View File

@@ -185,7 +185,7 @@ namespace Octokit
/// </summary>
[Parameter(Value = "head_ref_restored")]
HeadRefRestored,
/// <summary>
/// The pull request’s branch was force pushed to.
/// </summary>
@@ -303,7 +303,7 @@ namespace Octokit
/// </summary>
[Parameter(Value = "comment_deleted")]
CommentDeleted,
/// <summary>
/// An issue was transferred.
/// </summary>

4
Octokit/Models/Response/OrganizationMembership.cs
View File

@@ -7,7 +7,7 @@ namespace Octokit
{
public OrganizationMembership()
{
}
public OrganizationMembership(string url, StringEnum<MembershipState> state, StringEnum<MembershipRole> role, string organizationUrl, Organization organization, User user)
@@ -19,7 +19,7 @@ namespace Octokit
Organization = organization;
User = user;
}
public string Url { get; protected set; }
public StringEnum<MembershipState> State { get; protected set; }
public StringEnum<MembershipRole> Role { get; protected set; }

5
Octokit/Octokit.csproj
View File

@@ -15,6 +15,7 @@
<RepositoryUrl>https://github.com/octokit/octokit.net</RepositoryUrl>
<PackageProjectUrl>https://github.com/octokit/octokit.net</PackageProjectUrl>
<PackageIconUrl>https://f.cloud.github.com/assets/19977/1510987/64af2b26-4a9d-11e3-89fc-96a185171c75.png</PackageIconUrl>
<PackageIcon>octokit.png</PackageIcon>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageTags>GitHub API Octokit linqpad-samples dotnetcore</PackageTags>
<Copyright>Copyright GitHub 2017</Copyright>
@@ -47,6 +48,10 @@
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
<ItemGroup>
<None Include="images\octokit.png" Pack="true" PackagePath="\"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="SourceLink.Create.GitHub" Version="2.8.3" PrivateAssets="all" />
<DotNetCliToolReference Include="dotnet-sourcelink-git" Version="2.8.2" />

BIN
Octokit/images/octokit.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB