(maint) Code Refactoring

- Based on issues from StyleCop, and ReSharper

Author: gep13

Source/GitHubReleaseManager.Cli/BaseGitHubSubConfig.cs

@@ -24,8 +24,8 @@ public abstract class BaseGitHubSubConfig : BaseSubOptions
 
         public GitHubClient CreateGitHubClient()
         {
-            var creds = new Credentials(this.UserName, this.Password);
-            var github = new GitHubClient(new ProductHeaderValue("GitHubReleaseManager")) { Credentials = creds };
+            var credentials = new Credentials(this.UserName, this.Password);
+            var github = new GitHubClient(new ProductHeaderValue("GitHubReleaseManager")) { Credentials = credentials };
             return github;
         }
     }

Source/GitHubReleaseManager.Cli/CreateSubOptions.cs

@@ -13,7 +13,7 @@ public class CreateSubOptions : CommonSubOptions
         [Option('a', "asset", HelpText = "Path to the file to include in the release.", Required = false)]
         public string AssetPath { get; set; }
 
-        [Option('t', "targetcommitish", HelpText = "The commit to tag. Can be a branch or SHA. Defaults to repo's default branch.", Required = false)]
+        [Option('t', "targetcommitish", HelpText = "The commit to tag. Can be a branch or SHA. Defaults to repository's default branch.", Required = false)]
         public string TargetCommitish { get; set; }
     }
 }

Source/GitHubReleaseManager.Cli/Program.cs

@@ -35,48 +35,75 @@ private static int Main(string[] args)
                 options,
                 (verb, subOptions) =>
                     {
-                        if (subOptions != null)
+                        result = 1;
+
+                        var baseSubOptions = subOptions as BaseSubOptions;
+                        if (baseSubOptions != null)
                         {
-                            if (string.IsNullOrEmpty(((BaseSubOptions)subOptions).TargetPath))
+                            if (string.IsNullOrEmpty(baseSubOptions.TargetPath))
                             {
-                                ((BaseSubOptions)subOptions).TargetPath = Environment.CurrentDirectory;
+                                baseSubOptions.TargetPath = Environment.CurrentDirectory;
                             }
 
-                            ConfigureLogging(((BaseSubOptions)subOptions).LogFilePath);
+                            ConfigureLogging(baseSubOptions.LogFilePath);
                         }
 
                         var fileSystem = new FileSystem();
 
                         if (verb == "create")
                         {
-                            result = CreateReleaseAsync((CreateSubOptions)subOptions, fileSystem).Result;
+                            var createSubOptions = baseSubOptions as CreateSubOptions;
+                            if (createSubOptions != null)
+                            {
+                                result = CreateReleaseAsync(createSubOptions, fileSystem).Result;
+                            }
                         }
 
                         if (verb == "close")
                         {
-                            result = CloseMilestoneAsync((CloseSubOptions)subOptions).Result;
+                            var closeSubOptions = baseSubOptions as CloseSubOptions;
+                            if (closeSubOptions != null)
+                            {
+                                result = CloseMilestoneAsync(closeSubOptions).Result;
+                            }
                         }
 
                         if (verb == "publish")
                         {
-                            result = CloseAndPublishReleaseAsync((PublishSubOptions)subOptions).Result;
+                            var publishSubOptions = baseSubOptions as PublishSubOptions;
+                            if (publishSubOptions != null)
+                            {
+                                result = CloseAndPublishReleaseAsync(publishSubOptions).Result;
+                            }
                         }
 
                         if (verb == "export")
                         {
-                            result = ExportReleasesAsync((ExportSubOptions)subOptions).Result;
+                            var exportSubOptions = baseSubOptions as ExportSubOptions;
+                            if (exportSubOptions != null)
+                            {
+                                result = ExportReleasesAsync(exportSubOptions).Result;
+                            }
                         }
 
                         if (verb == "init")
                         {
-                            ConfigurationProvider.WriteSample(((InitSubOptions)subOptions).TargetPath, fileSystem);
-                            result = 0;
+                            var initSubOptions = baseSubOptions as InitSubOptions;
+                            if (initSubOptions != null)
+                            {
+                                ConfigurationProvider.WriteSample(initSubOptions.TargetPath, fileSystem);
+                                result = 0;
+                            }
                         }
 
                         if (verb == "showconfig")
                         {
-                            Console.WriteLine(ConfigurationProvider.GetEffectiveConfigAsString(((ShowConfigSubOptions)subOptions).TargetPath, fileSystem));
-                            result = 0;
+                            var showConfigSubOptions = baseSubOptions as ShowConfigSubOptions;
+                            if (showConfigSubOptions != null)
+                            {
+                                Console.WriteLine(ConfigurationProvider.GetEffectiveConfigAsString(showConfigSubOptions.TargetPath, fileSystem));
+                                result = 0;
+                            }
                         }
                     }))
             {

Source/GitHubReleaseManager.Tests/FakeGitHubClient.cs

@@ -20,11 +20,11 @@ public FakeGitHubClient()
             this.Issues = new List<Issue>();
         }
 
-        public List<Milestone> Milestones { get; set; }
+        public List<Milestone> Milestones { get; private set; }
 
-        public List<Issue> Issues { get; set; }
+        public List<Issue> Issues { get; private set; }
 
-        public int NumberOfCommits { get; set; }
+        public int NumberOfCommits { private get; set; }
 
         public Task<int> GetNumberOfCommitsBetween(Milestone previousMilestone, Milestone currentMilestone)
         {

Source/GitHubReleaseManager.Tests/Helper.cs

@@ -1,4 +1,10 @@
-namespace GitHubReleaseManager.Tests
+//-----------------------------------------------------------------------
+// <copyright file="Helper.cs" company="gep13">
+//     Copyright (c) gep13. All rights reserved.
+// </copyright>
+//-----------------------------------------------------------------------
+
+namespace GitHubReleaseManager.Tests
 {
     using System;
     using System.Net;
@@ -7,27 +13,30 @@
     public static class Helper
     {
         // From https://github.com/octokit/octokit.net/blob/master/Octokit.Tests.Integration/Helper.cs
-
-        static readonly Lazy<Credentials> _credentialsThunk = new Lazy<Credentials>(() =>
+        private static readonly Lazy<Credentials> CredentialsThunk = new Lazy<Credentials>(() =>
         {
             var githubUsername = Environment.GetEnvironmentVariable("OCTOKIT_GITHUBUSERNAME");
 
             var githubToken = Environment.GetEnvironmentVariable("OCTOKIT_OAUTHTOKEN");
 
             if (githubToken != null)
+            {
                 return new Credentials(githubToken);
+            }
 
             var githubPassword = Environment.GetEnvironmentVariable("OCTOKIT_GITHUBPASSWORD");
 
             if (githubUsername == null || githubPassword == null)
+            {
                 return Credentials.Anonymous;
+            }
 
             return new Credentials(githubUsername, githubPassword);
         });
 
         public static Credentials Credentials
         {
-            get { return _credentialsThunk.Value; }
+            get { return CredentialsThunk.Value; }
         }
 
         public static IWebProxy Proxy
@@ -45,4 +54,4 @@ public static IWebProxy Proxy
             }
         }
     }
-}
+}

Source/GitHubReleaseManager.Tests/ReleaseNotesBuilderIntegrationTests.cs

@@ -11,7 +11,6 @@ namespace GitHubReleaseManager.Tests
     using GitHubReleaseManager;
     using GitHubReleaseManager.Configuration;
     using GitHubReleaseManager.Helpers;
-
     using NUnit.Framework;
 
     [TestFixture]

Source/GitHubReleaseManager.Tests/ReleaseNotesBuilderTests.cs

@@ -9,10 +9,8 @@ namespace GitHubReleaseManager.Tests
     using System;
     using System.Linq;
     using ApprovalTests;
-
     using GitHubReleaseManager.Configuration;
     using GitHubReleaseManager.Helpers;
-
     using NUnit.Framework;
     using Octokit;
 
@@ -103,7 +101,7 @@ private static void AcceptTest(int commits, params Issue[] issues)
                 fakeClient.Issues.Add(issue);
             }
 
-            var builder = new ReleaseNotesBuilder(fakeClient, "TestUser", "FakeRepo", "1.2.3", configuration);
+            var builder = new ReleaseNotesBuilder(fakeClient, "TestUser", "FakeRepository", "1.2.3", configuration);
             var notes = builder.BuildReleaseNotes().Result;
 
             Approvals.Verify(notes);

Source/GitHubReleaseManager/Configuration/Config.cs

@@ -32,9 +32,9 @@ public Config()
         public string ExportRegex { get; set; }
 
         [YamlMember(Alias = "issue-labels-include")]
-        public IList<string> IssueLabelsInclude { get; set; }
+        public IList<string> IssueLabelsInclude { get; private set; }
 
         [YamlMember(Alias = "issue-labels-exclude")]
-        public IList<string> IssueLabelsExclude { get; set; }
+        public IList<string> IssueLabelsExclude { get; private set; }
     }
 }

Source/GitHubReleaseManager/Logger.cs

@@ -21,7 +21,7 @@ static Logger()
 
         public static Action<string> WriteError { get; set; }
 
-        public static void Reset()
+        private static void Reset()
         {
             WriteInfo = s => { throw new Exception("Logger not defined."); };
             WriteWarning = s => { throw new Exception("Logger not defined."); };

Source/GitHubReleaseManager/OctokitExtensions.cs

@@ -29,12 +29,12 @@ public static async Task<IEnumerable<Issue>> AllIssuesForMilestone(this GitHubCl
         {
             var closedIssueRequest = new RepositoryIssueRequest
             {
-                Milestone = milestone.Number.ToString(),
+                Milestone = milestone.Number.ToString(CultureInfo.InvariantCulture),
                 State = ItemState.Closed
             };
             var openIssueRequest = new RepositoryIssueRequest
             {
-                Milestone = milestone.Number.ToString(),
+                Milestone = milestone.Number.ToString(CultureInfo.InvariantCulture),
                 State = ItemState.Open
             };
             var parts = milestone.Url.AbsolutePath.Split('/');