Merge pull request #30 from pvandervelde/issue/youtrackcleanup

Fixed issues noted in #29

Author: JakeGinnivan

src/GitReleaseNotes/GitReleaseNotesArguments.cs

@@ -33,8 +33,8 @@ public class GitReleaseNotesArguments
         [Description("Issue tracker password")]
         public string Password { get; set; }
 
-        [Description("Jira project ID")]
-        public string JiraProjectId { get; set; }
+        [Description("Issue tracker project ID")]
+        public string ProjectId { get; set; }
 
         [Description("Jql query for closed issues you would like included if mentioned. Defaults to project = <YOURPROJECTID> AND (issuetype = Bug OR issuetype = Story OR issuetype = \"New Feature\") AND status in (Closed, Done, Resolved)")]
         public string Jql { get; set; }
@@ -45,9 +45,6 @@ public class GitReleaseNotesArguments
         [Description("Url of YouTrack server")]
         public string YouTrackServer { get; set; }
 
-        [Description("YouTrack project ID")]
-        public string YouTrackProjectId { get; set; }
-
         [Description("YouTrack filter for closed issues that you would like included if mentioned. Defaults to project:<YOURPROJECTID> State:Resolved State:-{{Won't fix}} State:-{{Can't Reproduce}} State:-Duplicate")]
         public string YouTrackFilter { get; set; }
 

src/GitReleaseNotes/IssueTrackers/Jira/JiraIssueTracker.cs

@@ -15,7 +15,7 @@ public JiraIssueTracker(IJiraApi jiraApi, GitReleaseNotesArguments arguments)
         {
             _jiraApi = jiraApi;
             _arguments = arguments;
-            _issueNumberRegex = new Regex(string.Format(@"(?<issueNumber>{0}-\d+)", arguments.JiraProjectId));
+            _issueNumberRegex = new Regex(string.Format(@"(?<issueNumber>{0}-\d+)", arguments.ProjectId));
         }
 
         public bool VerifyArgumentsAndWriteErrorsToConsole()
@@ -27,7 +27,7 @@ public bool VerifyArgumentsAndWriteErrorsToConsole()
                 return false;
             }
 
-            if (string.IsNullOrEmpty(_arguments.JiraProjectId))
+            if (string.IsNullOrEmpty(_arguments.ProjectId))
             {
                 Console.WriteLine("/JiraProjectId is a required parameter for Jira");
                 return false;
@@ -48,7 +48,7 @@ public bool VerifyArgumentsAndWriteErrorsToConsole()
             {
                 _arguments.Jql = string.Format("project = {0} AND " +
                                "(issuetype = Bug OR issuetype = Story OR issuetype = \"New Feature\") AND " +
-                               "status in (Closed, Done, Resolved)", _arguments.JiraProjectId);
+                               "status in (Closed, Done, Resolved)", _arguments.ProjectId);
             }
 
             return true;

src/GitReleaseNotes/IssueTrackers/YouTrack/YouTrackApi.cs

@@ -12,6 +12,17 @@ namespace GitReleaseNotes.IssueTrackers.YouTrack
 {
     public sealed class YouTrackApi : IYouTrackApi
     {
+        public IEnumerable<OnlineIssue> GetClosedIssues(GitReleaseNotesArguments arguments, DateTimeOffset? since)
+        {
+            var authenticationCookies = ConnectToYouTrack(arguments.Username, arguments.Password, arguments.YouTrackServer);
+            return IssuesClosedSinceDate(
+                authenticationCookies,
+                arguments.YouTrackFilter,
+                arguments.YouTrackServer,
+                arguments.ProjectId,
+                since);
+        }
+
         private static CookieCollection ConnectToYouTrack(string userName, string password, string youtrackHostUrl)
         {
             var loginUrl = string.Format(
@@ -64,9 +75,9 @@ private static IEnumerable<OnlineIssue> IssuesClosedSinceDate(
             if (since.HasValue)
             {
                 query = string.Format(
-                    "{0} updated: {1:yyyy-MM-ddTHH:mm:ss} .. {2:yyyy-MM-ddTHH:mm:ss}", 
+                    "{0} updated: {1:yyyy-MM-ddTHH:mm:ss} .. {2:yyyy-MM-ddTHH:mm:ss}",
                     filter,
-                    since.Value, 
+                    since.Value,
                     DateTimeOffset.Now);
             }
             else
@@ -101,9 +112,9 @@ private static IEnumerable<OnlineIssue> IssuesClosedSinceDate(
                 }
 
                 string rawText;
-                using(var responseStream = response.GetResponseStream())
+                using (var responseStream = response.GetResponseStream())
                 {
-                    using(var responseReader = new StreamReader(responseStream))
+                    using (var responseReader = new StreamReader(responseStream))
                     {
                         rawText = responseReader.ReadToEnd();
                     }
@@ -121,8 +132,8 @@ select subElement.Element("value").Value).FirstOrDefault(),
                                             where string.Equals("summary", subElement.Attribute("name").Value, StringComparison.OrdinalIgnoreCase)
                                             select subElement.Element("value").Value).FirstOrDefault(),
                                  Resolved = (from subElement in element.Descendants("field")
-                                            where string.Equals("resolved", subElement.Attribute("name").Value, StringComparison.InvariantCultureIgnoreCase)
-                                            select subElement.Element("value").Value).FirstOrDefault(),
+                                             where string.Equals("resolved", subElement.Attribute("name").Value, StringComparison.InvariantCultureIgnoreCase)
+                                             select subElement.Element("value").Value).FirstOrDefault(),
                              };
 
                 int count = 0;
@@ -158,16 +169,5 @@ select subElement.Element("value").Value).FirstOrDefault(),
 
             return result;
         }
-
-        public IEnumerable<OnlineIssue> GetClosedIssues(GitReleaseNotesArguments arguments, DateTimeOffset? since)
-        {
-            var authenticationCookies = ConnectToYouTrack(arguments.Username, arguments.Password, arguments.YouTrackServer);
-            return IssuesClosedSinceDate(
-                authenticationCookies,
-                arguments.YouTrackFilter,
-                arguments.YouTrackServer,
-                arguments.YouTrackProjectId,
-                since);
-        }
     }
 }

src/GitReleaseNotes/IssueTrackers/YouTrack/YouTrackIssueTracker.cs

@@ -15,7 +15,7 @@ public YouTrackIssueTracker(IYouTrackApi youTrackApi, GitReleaseNotesArguments a
         {
             _youTrackApi = youTrackApi;
             _arguments = arguments;
-            _issueNumberRegex = new Regex(string.Format(@"(?<issueNumber>{0}-\d+)", arguments.JiraProjectId));
+            _issueNumberRegex = new Regex(string.Format(@"(?<issueNumber>{0}-\d+)", arguments.ProjectId));
         }
 
         public bool VerifyArgumentsAndWriteErrorsToConsole()
@@ -27,9 +27,9 @@ public bool VerifyArgumentsAndWriteErrorsToConsole()
                 return false;
             }
 
-            if (string.IsNullOrEmpty(_arguments.YouTrackProjectId))
+            if (string.IsNullOrEmpty(_arguments.ProjectId))
             {
-                Console.WriteLine("/YouTrackProjectId is a required parameter for YouTrack");
+                Console.WriteLine("/ProjectId is a required parameter for YouTrack");
                 return false;
             }
 
@@ -48,7 +48,7 @@ public bool VerifyArgumentsAndWriteErrorsToConsole()
             {
                 _arguments.YouTrackFilter = string.Format(
                     "project:{0} State:Resolved State:-{{Won't fix}} State:-{{Can't Reproduce}} State:-Duplicate", 
-                    _arguments.YouTrackProjectId);
+                    _arguments.ProjectId);
             }
 
             return true;