wymiller/DrillSergeant
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: wymiller:pdfDataService
Branches Tags
wymiller:master wymiller:exceptionHandling wymiller:staging wymiller:tagFilter wymiller:pdfDataService
wymiller:1.0.0
...
pull from: wymiller:exceptionHandling
Branches Tags
wymiller:master wymiller:exceptionHandling wymiller:staging wymiller:tagFilter wymiller:pdfDataService
wymiller:1.0.0

5 Commits
pdfDataSer ... exceptionH

Author SHA1 Message Date
Wyatt J. Miller
5873bdb2a6 try catch all the things 2022-08-23 19:31:39 -04:00
Wyatt J. Miller
895f322bd6 Merge branch 'staging' of https://scm.wyattjmiller.com/wymiller/DrillSergeant into staging 2022-08-23 19:13:05 -04:00
Wyatt J. Miller
7721031d62 added command line arg for tag filtering, added arg logic for tag filtering 2022-08-23 18:57:18 -04:00
Wyatt J. Miller
e4d8e3f66e added commit filtering by tag 2022-08-23 18:56:56 -04:00
Wyatt J. Miller
82b8cd5c04 Merge pull request 'Added PDF export functionality' (#4) from pdfDataService into staging 
Reviewed-on: #4
 2022-08-23 17:55:17 -05:00
2 changed files with 112 additions and 39 deletions
Expand all files Collapse all files

48
BLL/CommitDetail.cs
View File

@ -93,11 +93,19 @@ public class CommitDetail
{ {
var branchResult = repo.Branches[branchName]; var branchResult = repo.Branches[branchName];
if (branchResult == null) try
{ {
branchResult = repo.Branches[$"origin/{branchName}"]; if (branchResult == null)
var remoteBranch = repo.CreateBranch(branchName, branchResult.Tip); {
repo.Branches.Update(remoteBranch, b => b.UpstreamBranch = $"refs/heads/{branchName}"); branchResult = repo.Branches[$"origin/{branchName}"];
var remoteBranch = repo.CreateBranch(branchName, branchResult.Tip);
repo.Branches.Update(remoteBranch, b => b.UpstreamBranch = $"refs/heads/{branchName}");
}
}
catch (System.Exception)
{
Console.WriteLine($"Cannot fetch {branchName} branch.");
Environment.Exit(1);
} }
foreach (var c in branchResult.Commits) foreach (var c in branchResult.Commits)
@ -120,8 +128,36 @@ public class CommitDetail
{ {
using (var repo = new Repository(Directory.GetCurrentDirectory())) using (var repo = new Repository(Directory.GetCurrentDirectory()))
{ {
var tagResult = repo.Tags[tagName]; try
System.Console.WriteLine(tagResult); {
var tagResult = repo.Tags[tagName].Target.Sha;
var commitFilter = new CommitFilter
{
IncludeReachableFrom = tagResult,
};
var query = repo.Commits.QueryBy(commitFilter);
foreach (var c in query)
{
if (!_authors.Contains(c.Author.Name))
{
_authors.Add(c.Author.Name);
}
}
foreach (var a in _authors)
{
int commitCount = query.Where(r => r.Author.Name == a).Count();
_commitDetails.Add(a, commitCount);
}
}
catch (System.Exception)
{
Console.WriteLine($"Cannot find the tag {tagName}");
Environment.Exit(3);
}
} }
} }
} }

103
Program.cs
View File

@ -16,13 +16,20 @@ static class Program
); );
branchOption.AddAlias("-b"); branchOption.AddAlias("-b");
var tagOption = new Option<string>(
"--tag",
"Specify the tag to filter by"
);
tagOption.AddAlias("-t");
var rootCommand = new RootCommand("Get a tally of contributors' commits") var rootCommand = new RootCommand("Get a tally of contributors' commits")
{ {
outputOption, outputOption,
branchOption, branchOption,
tagOption,
}; };
rootCommand.SetHandler((outputOptionValue, branchOptionValue) => { rootCommand.SetHandler((outputOptionValue, branchOptionValue, tagOptionValue) => {
CommitDetail commits = new CommitDetail(); CommitDetail commits = new CommitDetail();
switch (outputOptionValue) switch (outputOptionValue)
@ -31,32 +38,50 @@ static class Program
StdOutDataService outDataService = new StdOutDataService(); StdOutDataService outDataService = new StdOutDataService();
DataAccess dataAccess = new DataAccess(outDataService); DataAccess dataAccess = new DataAccess(outDataService);
switch (branchOptionValue) if (branchOptionValue != null && tagOptionValue != null) {
{ Console.WriteLine("Please specify either a branch or a tag");
case null: Environment.Exit(2);
commits.GetCurrentCommitsByName(); } else if (branchOptionValue != null && tagOptionValue == null) {
dataAccess.WriteData(commits.CommitDetails); switch (branchOptionValue)
break; {
default: case null:
commits.GetCommitsByBranch(branchOptionValue); commits.GetCurrentCommitsByName();
dataAccess.WriteData(commits.CommitDetails); dataAccess.WriteData(commits.CommitDetails);
break; break;
default:
commits.GetCommitsByBranch(branchOptionValue);
dataAccess.WriteData(commits.CommitDetails);
break;
}
break;
} else if (branchOptionValue == null && tagOptionValue != null) {
commits.GetCommitsByTag(tagOptionValue);
dataAccess.WriteData(commits.CommitDetails);
} }
break; break;
case "xlsx": case "xlsx":
ExcelDataService excelDataService = new ExcelDataService(); ExcelDataService excelDataService = new ExcelDataService();
DataAccess dataAccessExcelCase = new DataAccess(excelDataService); DataAccess dataAccessExcelCase = new DataAccess(excelDataService);
switch (branchOptionValue) if (branchOptionValue != null && tagOptionValue != null) {
{ Console.WriteLine("Please specify either a branch or a tag.");
case null: Environment.Exit(2);
commits.GetCurrentCommitsByName(); } else if (branchOptionValue != null && tagOptionValue == null) {
dataAccessExcelCase.WriteData(commits.CommitDetails); switch (branchOptionValue)
break; {
default: case null:
commits.GetCommitsByBranch(branchOptionValue); commits.GetCurrentCommitsByName();
dataAccessExcelCase.WriteData(commits.CommitDetails); dataAccessExcelCase.WriteData(commits.CommitDetails);
break; break;
default:
commits.GetCommitsByBranch(branchOptionValue);
dataAccessExcelCase.WriteData(commits.CommitDetails);
break;
}
break;
} else if (branchOptionValue == null && tagOptionValue != null) {
commits.GetCommitsByTag(tagOptionValue);
dataAccessExcelCase.WriteData(commits.CommitDetails);
} }
break; break;
case "pdf": case "pdf":
@ -79,25 +104,37 @@ static class Program
StdOutDataService stdOutDataService = new StdOutDataService(); StdOutDataService stdOutDataService = new StdOutDataService();
DataAccess dataAccessNullCase = new DataAccess(stdOutDataService); DataAccess dataAccessNullCase = new DataAccess(stdOutDataService);
switch (branchOptionValue) if (branchOptionValue != null && tagOptionValue != null) {
{ Console.WriteLine("Please specify either a branch or a tag.");
case null: Environment.Exit(2);
commits.GetCurrentCommitsByName(); } else if (branchOptionValue != null && tagOptionValue == null) {
dataAccessNullCase.WriteData(commits.CommitDetails); switch (branchOptionValue)
break; {
default: case null:
commits.GetCommitsByBranch(branchOptionValue); commits.GetCurrentCommitsByName();
dataAccessNullCase.WriteData(commits.CommitDetails); dataAccessNullCase.WriteData(commits.CommitDetails);
break; break;
default:
commits.GetCommitsByBranch(branchOptionValue);
dataAccessNullCase.WriteData(commits.CommitDetails);
break;
}
break;
} else if (branchOptionValue == null && tagOptionValue != null) {
commits.GetCommitsByTag(tagOptionValue);
dataAccessNullCase.WriteData(commits.CommitDetails);
} else {
commits.GetCurrentCommitsByName();
dataAccessNullCase.WriteData(commits.CommitDetails);
} }
break; break;
default: default:
System.Console.WriteLine("This should not happen..."); System.Console.WriteLine("This should not happen...");
Environment.Exit(90); Environment.Exit(4);
break; break;
} }
}, },
outputOption, branchOption); outputOption, branchOption, tagOption);
rootCommand.Invoke(args); rootCommand.Invoke(args);
} }