PRs with issues data source (#200)

* new issues repo option

* pull requests with issues as a new data source

* linter fixes

Author: pawk

lib/_options.js

@@ -82,10 +82,10 @@ module.exports = {
         {
             short: '-D',
             name: 'data-source',
-            valueType: '<issues|commits|milestones|prs>',
+            valueType: '<issues|commits|milestones|prs|prs-with-issues>',
             description:
                 'The informations you want to use to build release notes. [issues]',
-            action: /^(issues|commits|milestones|prs)$/i,
+            action: /^(issues|commits|milestones|prs|prs-with-issues)$/i,
             defaultValue: 'issues'
         },
         {

lib/src/Gren.js

@@ -67,12 +67,12 @@ class Gren {
             this._outputOptions(this.options);
         }
 
-        const githubApi = new Github({
+        this.githubApi = new Github({
             token
         }, apiUrl);
 
-        this.repo = githubApi.getRepo(username, repo);
-        this.issues = githubApi.getIssues(username, repo);
+        this.repo = this.githubApi.getRepo(username, repo);
+        this.issues = this.githubApi.getIssues(username, repo);
     }
 
     /**
@@ -731,6 +731,13 @@ class Gren {
         return issues;
     }
 
+    async _getSingleIssue({ user, repo, number }) {
+        const loaded = utils.task(this, `Getting single ${number} issue data`);
+        const { data: issue } = await this.githubApi.getIssues(user, repo).getIssue(number);
+        loaded(`Issue details found: ${issue.number} ${issue.title}`);
+        return issue;
+    }
+
     /**
      * Group the issues based on their first label
      *
@@ -954,6 +961,55 @@ class Gren {
         return release;
     }
 
+    async _getPullRequestWithIssueBlocks(releaseRanges) {
+        const loaded = utils.task(this, `Getting all merged pull requests`);
+        const since = releaseRanges[releaseRanges.length - 1][1].date;
+        let relevantIssues = [];
+
+        const re = new RegExp(`([\\w-]+)/([\\w-]+)/issues/([0-9]+)`, 'gi');
+
+        const prs = (await this._getMergedPullRequests(since))
+            .filter(this._filterPullRequest.bind(this))
+            .map(pr => {
+                const matches = pr.body.match(re);
+                const relatedIssues = matches && matches.map(issue => {
+                    const [user, repo, , number] = issue.split('/');
+                    return { user, repo, number };
+                });
+                return Object.assign({}, pr, { relatedIssues });
+            });
+
+        const release = releaseRanges
+            .map(range => {
+                const list = prs.filter(this._filterBlockPullRequest.bind(this, range));
+                list.forEach(({ relatedIssues }) => { relevantIssues = relevantIssues.concat(relatedIssues || []); });
+                loaded(`Pull Requests found: ${list.length}`);
+                return Object.assign({}, range, { list });
+            });
+
+        const issuesDetails = (await Promise.all(relevantIssues.map(this._getSingleIssue.bind(this))))
+            .reduce((acc, el) => { acc[el.number] = el; return acc; }, {});
+
+        return release
+            .map(range => {
+                const list = range.list.map(el => el.relatedIssues && el.relatedIssues.length ? el.relatedIssues.map(({ number }) => issuesDetails[number]) : [el]);
+                return Object.assign({}, range, { list: [].concat(...list) });
+            })
+            .map(this._render.bind(this));
+    }
+
+    _render(range) {
+        const body = (!range[0].body || this.options.override) && this._groupBy(range.list);
+
+        return {
+            id: range[0].id,
+            release: range[0].name,
+            name: this.options.prefix + range[0].name,
+            published_at: range[0].date,
+            body: this._templateBody(body, range[0].body)
+        };
+    }
+
     /**
      * Sort releases by dates
      *
@@ -1017,7 +1073,8 @@ class Gren {
             issues: this._getIssueBlocks.bind(this),
             commits: this._getCommitBlocks.bind(this),
             milestones: this._getIssueBlocks.bind(this),
-            prs: this._getPullRequestsBlocks.bind(this)
+            prs: this._getPullRequestsBlocks.bind(this),
+            'prs-with-issues': this._getPullRequestWithIssueBlocks.bind(this)
         };
         const releases = await this._getListReleases();
         this.tasks['Getting releases'].text = 'Getting tags';