Merge remote-tracking branch 'peterdavehello/EnhanceGitHub'
This commit is contained in:
commit
658291fa90
34
index.html
34
index.html
|
@ -695,18 +695,46 @@ Pixel-perfect Retina-ready Fast Consistent Hackable
|
|||
<td><img src='https://img.shields.io/wheelmap/a/2323004600.svg?maxAge=2592000' alt='' /></td>
|
||||
<td><code>https://img.shields.io/wheelmap/a/2323004600.svg</code></td>
|
||||
</tr>
|
||||
<tr><th data-doc='githubDoc'> GitHub issues: </th>
|
||||
<tr><th data-keywords='GitHub issue' data-doc='githubDoc'> GitHub issues: </th>
|
||||
<td><img src='https://img.shields.io/github/issues/badges/shields.svg?maxAge=2592000' alt=''/></td>
|
||||
<td><code>https://img.shields.io/github/issues/badges/shields.svg</code></td>
|
||||
</tr>
|
||||
<tr><th data-keywords='GitHub' data-doc='githubDoc'></th>
|
||||
<tr><th data-keywords='GitHub issue' data-doc='githubDoc'></th>
|
||||
<td><img src='https://img.shields.io/github/issues-raw/badges/shields.svg?maxAge=2592000' alt=''/></td>
|
||||
<td><code>https://img.shields.io/github/issues-raw/badges/shields.svg</code></td>
|
||||
</tr>
|
||||
<tr><th data-keywords='GitHub' data-doc='githubDoc'> label:</th>
|
||||
<tr><th data-keywords='GitHub issue' data-doc='githubDoc'> GitHub closed issues: </th>
|
||||
<td><img src='https://img.shields.io/github/issues-closed/badges/shields.svg?maxAge=2592001' alt=''/></td>
|
||||
<td><code>https://img.shields.io/github/issues-closed/badges/shields.svg</code></td>
|
||||
</tr>
|
||||
<tr><th data-keywords='GitHub issue' data-doc='githubDoc'></th>
|
||||
<td><img src='https://img.shields.io/github/issues-closed-raw/badges/shields.svg?maxAge=2592000' alt=''/></td>
|
||||
<td><code>https://img.shields.io/github/issues-closed-raw/badges/shields.svg</code></td>
|
||||
</tr>
|
||||
<tr><th data-keywords='GitHub issue label' data-doc='githubDoc'> label:</th>
|
||||
<td><img src='https://img.shields.io/github/issues-raw/badges/shields/website.svg?maxAge=2592000' alt=''/></td>
|
||||
<td><code>https://img.shields.io/github/issues-raw/badges/shields/website.svg</code></td>
|
||||
</tr>
|
||||
<tr><th data-keywords='GitHub pullrequest pr' data-doc='githubDoc'> GitHub pull requests: </th>
|
||||
<td><img src='https://img.shields.io/github/issues-pr/cdnjs/cdnjs.svg' alt=''/></td>
|
||||
<td><code>https://img.shields.io/github/issues-pr/cdnjs/cdnjs.svg</code></td>
|
||||
</tr>
|
||||
<tr><th data-keywords='GitHub pullrequest pr' data-doc='githubDoc'></th>
|
||||
<td><img src='https://img.shields.io/github/issues-pr-raw/cdnjs/cdnjs.svg' alt=''/></td>
|
||||
<td><code>https://img.shields.io/github/issues-pr-raw/cdnjs/cdnjs.svg</code></td>
|
||||
</tr>
|
||||
<tr><th data-keywords='GitHub pullrequest pr' data-doc='githubDoc'> GitHub closed pull requests: </th>
|
||||
<td><img src='https://img.shields.io/github/issues-pr-closed/cdnjs/cdnjs.svg' alt=''/></td>
|
||||
<td><code>https://img.shields.io/github/issues-pr-closed/cdnjs/cdnjs.svg</code></td>
|
||||
</tr>
|
||||
<tr><th data-keywords='GitHub pullrequest pr' data-doc='githubDoc'></th>
|
||||
<td><img src='https://img.shields.io/github/issues-pr-closed-raw/cdnjs/cdnjs.svg' alt=''/></td>
|
||||
<td><code>https://img.shields.io/github/issues-pr-closed-raw/cdnjs/cdnjs.svg</code></td>
|
||||
</tr>
|
||||
<tr><th data-keywords='GitHub contributor' data-doc='githubDoc'> GitHub contributors: </th>
|
||||
<td><img src='https://img.shields.io/github/contributors/cdnjs/cdnjs.svg' alt=''/></td>
|
||||
<td><code>https://img.shields.io/github/contributors/cdnjs/cdnjs.svg</code></td>
|
||||
</tr>
|
||||
<tr><th data-keywords='GitHub license' data-doc='githubDoc'> license: </th>
|
||||
<td><img src='https://img.shields.io/github/license/mashape/apistatus.svg?maxAge=2592000' alt=''/></td>
|
||||
<td><code>https://img.shields.io/github/license/mashape/apistatus.svg</code></td>
|
||||
|
|
66
server.js
66
server.js
|
@ -2832,6 +2832,35 @@ cache(function(data, match, sendBadge, request) {
|
|||
});
|
||||
}));
|
||||
|
||||
// GitHub contributors integration.
|
||||
camp.route(/^\/github\/contributors(-anon)?\/([^\/]+)\/([^\/]+)\.(svg|png|gif|jpg|json)$/,
|
||||
cache(function(data, match, sendBadge, request) {
|
||||
var isAnon = match[1];
|
||||
var user = match[2]; // eg, qubyte/rubidium
|
||||
var repo = match[3];
|
||||
var format = match[4];
|
||||
var apiUrl = 'https://api.github.com/repos/' + user + '/' + repo + '/contributors?page=1&per_page=1&anon=' + (0+isAnon);
|
||||
var badgeData = getBadgeData('contributors', data);
|
||||
if (badgeData.template === 'social') {
|
||||
badgeData.logo = badgeData.logo || logos.github;
|
||||
}
|
||||
githubAuth.request(request, apiUrl, {}, function(err, res, buffer) {
|
||||
if (err != null) {
|
||||
badgeData.text[1] = 'inaccessible';
|
||||
sendBadge(format, badgeData);
|
||||
return;
|
||||
}
|
||||
try {
|
||||
var data = JSON.parse(buffer);
|
||||
badgeData.text[1] = metric(data[0].contributions);
|
||||
badgeData.colorscheme = 'blue';
|
||||
} catch(e) {
|
||||
badgeData.text[1] = 'inaccessible';
|
||||
}
|
||||
sendBadge(format, badgeData);
|
||||
});
|
||||
}));
|
||||
|
||||
// GitHub release integration.
|
||||
camp.route(/^\/github\/release\/([^\/]+)\/([^\/]+)\.(svg|png|gif|jpg|json)$/,
|
||||
cache(function(data, match, sendBadge, request) {
|
||||
|
@ -2966,23 +2995,26 @@ cache(function(data, match, sendBadge, request) {
|
|||
}));
|
||||
|
||||
// GitHub issues integration.
|
||||
camp.route(/^\/github\/issues(-raw)?\/([^\/]+)\/([^\/]+)\/?([^\/]+)?\.(svg|png|gif|jpg|json)$/,
|
||||
camp.route(/^\/github\/issues(-pr)?(-closed)?(-raw)?\/([^\/]+)\/([^\/]+)\/?([^\/]+)?\.(svg|png|gif|jpg|json)$/,
|
||||
cache(function(data, match, sendBadge, request) {
|
||||
var isRaw = !!match[1];
|
||||
var user = match[2]; // eg, badges
|
||||
var repo = match[3]; // eg, shields
|
||||
var ghLabel = match[4]; // eg, website
|
||||
var format = match[5];
|
||||
var apiUrl = 'https://api.github.com/repos/' + user + '/' + repo;
|
||||
var isPR = !!match[1];
|
||||
var isClosed = !!match[2];
|
||||
var isRaw = !!match[3];
|
||||
var user = match[4]; // eg, badges
|
||||
var repo = match[5]; // eg, shields
|
||||
var ghLabel = match[6]; // eg, website
|
||||
var format = match[7];
|
||||
var apiUrl = 'https://api.github.com/' + (isPR ? 'search/issues?q=is:pr+is:' + (isClosed ? 'closed' : 'open') + '+' : 'repos/') + user + '/' + repo;
|
||||
var issuesApi = false; // Are we using the issues API instead of the repo one?
|
||||
var query = {};
|
||||
if (ghLabel !== undefined) {
|
||||
if (!isPR && ghLabel !== undefined) {
|
||||
apiUrl += '/issues';
|
||||
apiUrl += (isClosed ? '?state=closed' : '');
|
||||
query.labels = ghLabel;
|
||||
issuesApi = true;
|
||||
}
|
||||
|
||||
var badgeData = getBadgeData('issues', data);
|
||||
var badgeData = getBadgeData( (isClosed ? 'closed ' : '' ) + (isPR ? 'pull requests' : 'issues'), data);
|
||||
if (badgeData.template === 'social') {
|
||||
badgeData.logo = badgeData.logo || logos.github;
|
||||
}
|
||||
|
@ -2995,14 +3027,18 @@ cache(function(data, match, sendBadge, request) {
|
|||
try {
|
||||
var data = JSON.parse(buffer);
|
||||
var modifier = '';
|
||||
if (issuesApi) {
|
||||
var issues = data.length;
|
||||
if (res.headers['link'] &&
|
||||
res.headers['link'].indexOf('rel="last"') >= 0) { modifier = '+'; }
|
||||
if (isPR) {
|
||||
issues = data.total_count;
|
||||
} else {
|
||||
var issues = data.open_issues_count;
|
||||
if (issuesApi) {
|
||||
var issues = data.length;
|
||||
if (res.headers['link'] &&
|
||||
res.headers['link'].indexOf('rel="last"') >= 0) { modifier = '+'; }
|
||||
} else {
|
||||
var issues = data.open_issues_count;
|
||||
}
|
||||
}
|
||||
badgeData.text[1] = issues + modifier + (isRaw? '': ' open');
|
||||
badgeData.text[1] = metric(issues + modifier + (isRaw? '': (isClosed ? ' closed' : ' open')));
|
||||
badgeData.colorscheme = issues ? 'yellow' : 'brightgreen';
|
||||
sendBadge(format, badgeData);
|
||||
} catch(e) {
|
||||
|
|
34
try.html
34
try.html
|
@ -694,18 +694,46 @@ Pixel-perfect Retina-ready Fast Consistent Hackable
|
|||
<td><img src='/wheelmap/a/2323004600.svg' alt='' /></td>
|
||||
<td><code>https://img.shields.io/wheelmap/a/2323004600.svg</code></td>
|
||||
</tr>
|
||||
<tr><th data-doc='githubDoc'> GitHub issues: </th>
|
||||
<tr><th data-keywords='GitHub issue' data-doc='githubDoc'> GitHub issues: </th>
|
||||
<td><img src='/github/issues/badges/shields.svg' alt=''/></td>
|
||||
<td><code>https://img.shields.io/github/issues/badges/shields.svg</code></td>
|
||||
</tr>
|
||||
<tr><th data-keywords='GitHub' data-doc='githubDoc'></th>
|
||||
<tr><th data-keywords='GitHub issue' data-doc='githubDoc'></th>
|
||||
<td><img src='/github/issues-raw/badges/shields.svg' alt=''/></td>
|
||||
<td><code>https://img.shields.io/github/issues-raw/badges/shields.svg</code></td>
|
||||
</tr>
|
||||
<tr><th data-keywords='GitHub' data-doc='githubDoc'> label:</th>
|
||||
<tr><th data-keywords='GitHub issue' data-doc='githubDoc'> GitHub closed issues: </th>
|
||||
<td><img src='/github/issues-closed/badges/shield.svg' alt=''/></td>
|
||||
<td><code>https://img.shields.io/github/issues-closed/badges/shields.svg</code></td>
|
||||
</tr>
|
||||
<tr><th data-keywords='GitHub issue' data-doc='githubDoc'></th>
|
||||
<td><img src='/github/issues-closed-raw/badges/shields.svg' alt=''/></td>
|
||||
<td><code>https://img.shields.io/github/issues-closed-raw/badges/shields.svg</code></td>
|
||||
</tr>
|
||||
<tr><th data-keywords='GitHub issue label' data-doc='githubDoc'> label:</th>
|
||||
<td><img src='/github/issues-raw/badges/shields/website.svg' alt=''/></td>
|
||||
<td><code>https://img.shields.io/github/issues-raw/badges/shields/website.svg</code></td>
|
||||
</tr>
|
||||
<tr><th data-keywords='GitHub pullrequest pr' data-doc='githubDoc'> GitHub pull requests: </th>
|
||||
<td><img src='/github/issues-pr/cdnjs/cdnjs.svg' alt=''/></td>
|
||||
<td><code>https://img.shields.io/github/issues-pr/cdnjs/cdnjs.svg</code></td>
|
||||
</tr>
|
||||
<tr><th data-keywords='GitHub pullrequest pr' data-doc='githubDoc'></th>
|
||||
<td><img src='/github/issues-pr-raw/cdnjs/cdnjs.svg' alt=''/></td>
|
||||
<td><code>https://img.shields.io/github/issues-pr-raw/cdnjs/cdnjs.svg</code></td>
|
||||
</tr>
|
||||
<tr><th data-keywords='GitHub pullrequest pr' data-doc='githubDoc'> GitHub closed pull requests: </th>
|
||||
<td><img src='/github/issues-pr-closed/cdnjs/cdnjs.svg' alt=''/></td>
|
||||
<td><code>https://img.shields.io/github/issues-pr-closed/cdnjs/cdnjs.svg</code></td>
|
||||
</tr>
|
||||
<tr><th data-keywords='GitHub pullrequest pr' data-doc='githubDoc'></th>
|
||||
<td><img src='/github/issues-pr-closed-raw/cdnjs/cdnjs.svg' alt=''/></td>
|
||||
<td><code>https://img.shields.io/github/issues-pr-closed-raw/cdnjs/cdnjs.svg</code></td>
|
||||
</tr>
|
||||
<tr><th data-keywords='GitHub contributor' data-doc='githubDoc'> GitHub contributors: </th>
|
||||
<td><img src='/github/contributors/cdnjs/cdnjs.svg' alt=''/></td>
|
||||
<td><code>https://img.shields.io/github/contributors/cdnjs/cdnjs.svg</code></td>
|
||||
</tr>
|
||||
<tr><th data-keywords='GitHub license' data-doc='githubDoc'> license: </th>
|
||||
<td><img src='/github/license/mashape/apistatus.svg' alt=''/></td>
|
||||
<td><code>https://img.shields.io/github/license/mashape/apistatus.svg</code></td>
|
||||
|
|
Loading…
Reference in New Issue
Block a user