From 7ac216456aff338e4a401d301a132d93d641b6a4 Mon Sep 17 00:00:00 2001 From: Masahiro Fujiwara Date: Tue, 17 Jan 2017 06:07:05 +0900 Subject: [PATCH 1/4] =?UTF-8?q?Fix=20regexp=20for=20Jenkins=20build=20badg?= =?UTF-8?q?es=20to=20allow=20=E2=80=9C/=E2=80=9C=20in=20the=20job=20name.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server.js | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/server.js b/server.js index e5c4e47..443a0e2 100644 --- a/server.js +++ b/server.js @@ -3849,12 +3849,12 @@ cache(function(data, match, sendBadge, request) { })); // Jenkins build status integration -camp.route(/^\/jenkins(-ci)?\/s\/(http(s)?)\/((?:[^\/]+)(?:\/.+?)?)\/([^\/]+)\.(svg|png|gif|jpg|json)$/, +camp.route(/^\/jenkins(?:-ci)?\/s\/(http(?:s)?)\/([^\/]+)\/(.+)\.(svg|png|gif|jpg|json)$/, cache(function(data, match, sendBadge, request) { - var scheme = match[2]; // http(s) - var host = match[4]; // jenkins.qa.ubuntu.com - var job = match[5]; // precise-desktop-amd64_default - var format = match[6]; + var scheme = match[1]; // http(s) + var host = match[2]; // example.org:8080 + var job = match[3]; // folder/job + var format = match[4]; var options = { json: true, uri: scheme + '://' + host + '/job/' + job + '/api/json?tree=color' @@ -3902,12 +3902,12 @@ cache(function(data, match, sendBadge, request) { })); // Jenkins tests integration -camp.route(/^\/jenkins(-ci)?\/t\/(http(s)?)\/((?:[^\/]+)(?:\/.+?)?)\/([^\/]+)\.(svg|png|gif|jpg|json)$/, +camp.route(/^\/jenkins(?:-ci)?\/t\/(http(?:s)?)\/([^\/]+)\/(.+)\.(svg|png|gif|jpg|json)$/, cache(function(data, match, sendBadge, request) { - var scheme = match[2]; // http(s) - var host = match[4]; // jenkins.qa.ubuntu.com - var job = match[5]; // precise-desktop-amd64_default - var format = match[6]; + var scheme = match[1]; // http(s) + var host = match[2]; // example.org:8080 + var job = match[3]; // folder/job + var format = match[4]; var options = { json: true, uri: scheme + '://' + host + '/job/' + job @@ -3958,12 +3958,12 @@ cache(function(data, match, sendBadge, request) { })); // Jenkins coverage integration -camp.route(/^\/jenkins(-ci)?\/c\/(http(s)?)\/((?:[^\/]+)(?:\/.+?)?)\/([^\/]+)\.(svg|png|gif|jpg|json)$/, +camp.route(/^\/jenkins(?:-ci)?\/c\/(http(?:s)?)\/([^\/]+)\/(.+)\.(svg|png|gif|jpg|json)$/, cache(function(data, match, sendBadge, request) { - var scheme = match[2]; // http(s) - var host = match[4]; // jenkins.qa.ubuntu.com - var job = match[5]; // precise-desktop-amd64_default - var format = match[6]; + var scheme = match[1]; // http(s) + var host = match[2]; // example.org:8080 + var job = match[3]; // folder/job + var format = match[4]; var options = { json: true, uri: scheme + '://' + host + '/job/' + job From 70efc96b11a37f0c617ca2eddb2e62d08795f479 Mon Sep 17 00:00:00 2001 From: Masahiro Fujiwara Date: Tue, 17 Jan 2017 06:36:48 +0900 Subject: [PATCH 2/4] =?UTF-8?q?Take=20=E2=80=99/job=E2=80=99=20prefix=20ou?= =?UTF-8?q?t=20only=20if=20=E2=80=98/=E2=80=98=20appears.=20For=20backward?= =?UTF-8?q?=20compatibility.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/server.js b/server.js index 443a0e2..1096a82 100644 --- a/server.js +++ b/server.js @@ -3859,6 +3859,9 @@ cache(function(data, match, sendBadge, request) { json: true, uri: scheme + '://' + host + '/job/' + job + '/api/json?tree=color' }; + if( job.indexOf('/') > -1 ) { + options.uri = scheme + '://' + host + '/' + job + '/api/json?tree=color'; + } if (serverSecrets && serverSecrets.jenkins_user) { options.auth = { @@ -3913,6 +3916,10 @@ cache(function(data, match, sendBadge, request) { uri: scheme + '://' + host + '/job/' + job + '/lastBuild/api/json?tree=actions[failCount,skipCount,totalCount]' }; + if( job.indexOf('/') > -1 ) { + options.uri = scheme + '://' + host + '/' + job + + '/lastBuild/api/json?tree=actions[failCount,skipCount,totalCount]'; + } if (serverSecrets && serverSecrets.jenkins_user) { options.auth = { @@ -3969,6 +3976,10 @@ cache(function(data, match, sendBadge, request) { uri: scheme + '://' + host + '/job/' + job + '/lastBuild/cobertura/api/json?tree=results[elements[name,denominator,numerator,ratio]]' }; + if( job.indexOf('/') > -1 ) { + options.uri = scheme + '://' + host + '/' + job + + '/lastBuild/cobertura/api/json?tree=results[elements[name,denominator,numerator,ratio]]'; + } if (serverSecrets && serverSecrets.jenkins_user) { options.auth = { From 32f4d6d4da44e2e684635e00d8d6b68e6151e035 Mon Sep 17 00:00:00 2001 From: Masahiro Fujiwara Date: Tue, 17 Jan 2017 06:43:25 +0900 Subject: [PATCH 3/4] =?UTF-8?q?Update=20Jenkins=20job=20path=20to=20contai?= =?UTF-8?q?n=20=E2=80=98/=E2=80=98=20in=20try.html=20examples.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- try.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/try.html b/try.html index f4c6c87..a1300b1 100644 --- a/try.html +++ b/try.html @@ -145,16 +145,16 @@ Pixel-perfect   Retina-ready   Fast   Consistent   Hackable https://img.shields.io/snap-ci/ThoughtWorksStudios/eb_deployer/master.svg Jenkins: - - https://img.shields.io/jenkins/s/https/jenkins.qa.ubuntu.com/precise-desktop-amd64_default.svg + + https://img.shields.io/jenkins/s/https/jenkins.qa.ubuntu.com/view/Precise/view/All%20Precise/job/precise-desktop-amd64_default.svg Jenkins tests: - - https://img.shields.io/jenkins/t/https/jenkins.qa.ubuntu.com/precise-desktop-amd64_default.svg + + https://img.shields.io/jenkins/t/https/jenkins.qa.ubuntu.com/view/Precise/view/All%20Precise/job/precise-desktop-amd64_default.svg Jenkins coverage: - - https://img.shields.io/jenkins/c/https/jenkins.qa.ubuntu.com/address-book-service-utopic-i386-ci.svg + + https://img.shields.io/jenkins/c/https/jenkins.qa.ubuntu.com/view/Utopic/view/All/job/address-book-service-utopic-i386-ci.svg Coveralls: From 5eb9eb2bb5bd18a0bb48a1ce65c184f529bb6a62 Mon Sep 17 00:00:00 2001 From: Thaddee Tyl Date: Mon, 30 Jan 2017 23:34:15 +0100 Subject: [PATCH 4/4] Improve consistency of spacing in code --- server.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/server.js b/server.js index 1096a82..d350472 100644 --- a/server.js +++ b/server.js @@ -3859,7 +3859,7 @@ cache(function(data, match, sendBadge, request) { json: true, uri: scheme + '://' + host + '/job/' + job + '/api/json?tree=color' }; - if( job.indexOf('/') > -1 ) { + if (job.indexOf('/') > -1 ) { options.uri = scheme + '://' + host + '/' + job + '/api/json?tree=color'; } @@ -3916,7 +3916,7 @@ cache(function(data, match, sendBadge, request) { uri: scheme + '://' + host + '/job/' + job + '/lastBuild/api/json?tree=actions[failCount,skipCount,totalCount]' }; - if( job.indexOf('/') > -1 ) { + if (job.indexOf('/') > -1 ) { options.uri = scheme + '://' + host + '/' + job + '/lastBuild/api/json?tree=actions[failCount,skipCount,totalCount]'; } @@ -3976,7 +3976,7 @@ cache(function(data, match, sendBadge, request) { uri: scheme + '://' + host + '/job/' + job + '/lastBuild/cobertura/api/json?tree=results[elements[name,denominator,numerator,ratio]]' }; - if( job.indexOf('/') > -1 ) { + if (job.indexOf('/') > -1 ) { options.uri = scheme + '://' + host + '/' + job + '/lastBuild/cobertura/api/json?tree=results[elements[name,denominator,numerator,ratio]]'; } @@ -4643,7 +4643,7 @@ cache(function(data, match, sendBadge, request) { queryParams['filter'] = 'completed'; // Custom Banch if present - if(branch != null) { + if (branch != null) { apiUrl += "/tree/" + branch; } @@ -6251,7 +6251,7 @@ function phpStableVersion(version) { // This searches the serverSecrets for a twitter consumer key // and secret, and exchanges them for a bearer token to use for all requests. function fetchTwitterToken() { - if(serverSecrets.twitter_consumer_key && serverSecrets.twitter_consumer_secret){ + if (serverSecrets.twitter_consumer_key && serverSecrets.twitter_consumer_secret){ // fetch a bearer token good for this app session // construct this bearer request with a base64 encoding of key:secret // docs for this are here: https://dev.twitter.com/oauth/application-only @@ -6268,13 +6268,13 @@ function fetchTwitterToken() { }; console.log('Fetching twitter bearer token...'); request(options,function(err,res,buffer){ - if(err){ + if (err) { console.error('Error fetching twitter bearer token, error: ', err); return; } - try{ + try { var data = JSON.parse(buffer); - if(data.token_type === 'bearer'){ + if (data.token_type === 'bearer') { serverSecrets.twitter_bearer_token = data.access_token; console.log('Fetched twitter bearer token'); return;