Merge pull request 'Directory option' (#4) from dirOption into master

Reviewed-on: #4
This commit is contained in:
Wyatt J. Miller 2022-12-27 21:20:35 -06:00
commit d7db51824d
3 changed files with 156 additions and 118 deletions

View File

@ -5,6 +5,10 @@ public class CommitDetail
private List<string>? _authors;
private SortedList<string, int>? _commitDetails;
private string _currentBranch;
private string? _outputOption;
private string? _branchOption;
private string? _tagOption;
private string? _selectedDir;
public List<string>? Authors
{
@ -24,16 +28,28 @@ public class CommitDetail
set { _currentBranch = value; }
}
public CommitDetail()
public string? SelectedDir
{
get { return _selectedDir; }
set { _selectedDir = value; }
}
public CommitDetail(string? dir)
{
_selectedDir = !String.IsNullOrEmpty(dir) ? dir : Directory.GetCurrentDirectory();
_authors = new List<string>();
_commitDetails = new SortedList<string, int>();
_currentBranch = GetCurrentBranch();
// unused, might be used later for a refactor
_outputOption = null;
_branchOption = null;
_tagOption = null;
}
public void GetCurrentCommitsByName()
{
using (var repo = new Repository(Directory.GetCurrentDirectory()))
using (var repo = new Repository(_selectedDir))
{
foreach (var c in repo.Commits)
{
@ -53,7 +69,7 @@ public class CommitDetail
public void GetCurrentCommitsByEmail()
{
using (var repo = new Repository(Directory.GetCurrentDirectory()))
using (var repo = new Repository(_selectedDir))
{
foreach (var c in repo.Commits)
{
@ -73,7 +89,7 @@ public class CommitDetail
public int GetCommitTotal()
{
using (var repo = new Repository(Directory.GetCurrentDirectory()))
using (var repo = new Repository(_selectedDir))
{
return repo.Commits.Count();
}
@ -81,7 +97,7 @@ public class CommitDetail
public string GetCurrentBranch()
{
using (var repo = new Repository(Directory.GetCurrentDirectory()))
using (var repo = new Repository(_selectedDir))
{
return repo.Head.Reference.TargetIdentifier;
}
@ -89,7 +105,7 @@ public class CommitDetail
public void GetCommitsByBranch(string branchName)
{
using (var repo = new Repository(Directory.GetCurrentDirectory()))
using (var repo = new Repository(_selectedDir))
{
var branchResult = repo.Branches[branchName];
@ -126,7 +142,7 @@ public class CommitDetail
public void GetCommitsByTag(string tagName)
{
using (var repo = new Repository(Directory.GetCurrentDirectory()))
using (var repo = new Repository(_selectedDir))
{
try
{

View File

@ -7,7 +7,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AssemblyName>drillsergeant</AssemblyName>
<Version>1.1.0</Version>
<Version>1.2.0</Version>
</PropertyGroup>
<ItemGroup>

View File

@ -22,15 +22,23 @@ static class Program
);
tagOption.AddAlias("-t");
var dirOption = new Option<string>(
"--file",
"Specify a git directory"
);
dirOption.AddAlias("-f");
var rootCommand = new RootCommand("Get a tally of contributors' commits")
{
outputOption,
branchOption,
tagOption,
dirOption,
};
rootCommand.SetHandler((outputOptionValue, branchOptionValue, tagOptionValue) => {
CommitDetail commits = new CommitDetail();
rootCommand.SetHandler((outputOptionValue, branchOptionValue, tagOptionValue, dirOptionValue) =>
{
CommitDetail commits = new CommitDetail(dirOptionValue);
switch (outputOptionValue)
{
@ -38,10 +46,13 @@ static class Program
StdOutDataService outDataService = new StdOutDataService();
DataAccess dataAccess = new DataAccess(outDataService);
if (branchOptionValue != null && tagOptionValue != null) {
if (branchOptionValue != null && tagOptionValue != null)
{
Console.WriteLine("Please specify either a branch or a tag");
Environment.Exit(2);
} else if (branchOptionValue != null && tagOptionValue == null) {
}
else if (branchOptionValue != null && tagOptionValue == null)
{
switch (branchOptionValue)
{
case null:
@ -53,8 +64,9 @@ static class Program
dataAccess.WriteData(commits.CommitDetails);
break;
}
break;
} else if (branchOptionValue == null && tagOptionValue != null) {
}
else if (branchOptionValue == null && tagOptionValue != null)
{
commits.GetCommitsByTag(tagOptionValue);
dataAccess.WriteData(commits.CommitDetails);
}
@ -63,10 +75,13 @@ static class Program
ExcelDataService excelDataService = new ExcelDataService();
DataAccess dataAccessExcelCase = new DataAccess(excelDataService);
if (branchOptionValue != null && tagOptionValue != null) {
if (branchOptionValue != null && tagOptionValue != null)
{
Console.WriteLine("Please specify either a branch or a tag.");
Environment.Exit(2);
} else if (branchOptionValue != null && tagOptionValue == null) {
}
else if (branchOptionValue != null && tagOptionValue == null)
{
switch (branchOptionValue)
{
case null:
@ -78,8 +93,9 @@ static class Program
dataAccessExcelCase.WriteData(commits.CommitDetails);
break;
}
break;
} else if (branchOptionValue == null && tagOptionValue != null) {
}
else if (branchOptionValue == null && tagOptionValue != null)
{
commits.GetCommitsByTag(tagOptionValue);
dataAccessExcelCase.WriteData(commits.CommitDetails);
}
@ -104,10 +120,13 @@ static class Program
StdOutDataService stdOutDataService = new StdOutDataService();
DataAccess dataAccessNullCase = new DataAccess(stdOutDataService);
if (branchOptionValue != null && tagOptionValue != null) {
if (branchOptionValue != null && tagOptionValue != null)
{
Console.WriteLine("Please specify either a branch or a tag.");
Environment.Exit(2);
} else if (branchOptionValue != null && tagOptionValue == null) {
}
else if (branchOptionValue != null && tagOptionValue == null)
{
switch (branchOptionValue)
{
case null:
@ -119,11 +138,14 @@ static class Program
dataAccessNullCase.WriteData(commits.CommitDetails);
break;
}
break;
} else if (branchOptionValue == null && tagOptionValue != null) {
}
else if (branchOptionValue == null && tagOptionValue != null)
{
commits.GetCommitsByTag(tagOptionValue);
dataAccessNullCase.WriteData(commits.CommitDetails);
} else {
}
else
{
commits.GetCurrentCommitsByName();
dataAccessNullCase.WriteData(commits.CommitDetails);
}
@ -134,7 +156,7 @@ static class Program
break;
}
},
outputOption, branchOption, tagOption);
outputOption, branchOption, tagOption, dirOption);
rootCommand.Invoke(args);
}