From 0704d7ddfa4d5ad169ac93a7beb48ba7c6b9feda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Thu, 19 Mar 2015 09:19:01 +0100 Subject: [PATCH] puppetforge: use versionColor() to simplify code --- server.js | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/server.js b/server.js index 6f54147..d67dc79 100644 --- a/server.js +++ b/server.js @@ -2260,26 +2260,15 @@ cache(function(data, match, sendBadge, request) { } try { if (info == 'v') { - var unstable = function(ver) { - return /-[0-9A-Za-z.-]+(?:\+[0-9A-Za-z.-]+)?$/.test(ver); - }; - var releases = json['releases']; - if (releases.length == 0) { + if (json['current_release']) { + var vdata = versionColor(json['current_release'].version); + badgeData.text[1] = vdata.version; + badgeData.colorscheme = vdata.color; + } else { badgeData.text[1] = 'none'; badgeData.colorscheme = 'lightgrey'; - sendBadge(format, badgeData); - return; } - var versions = releases.map(function(version) { - return version.version; - }); - var version = latestVersion(versions); - if (unstable(version)) { - badgeData.colorscheme = "yellow"; - } else { - badgeData.colorscheme = "blue"; - } - badgeData.text[1] = "v" + version; + sendBadge(format, badgeData); } else if (info == 'dt') { var total = json['downloads']; if (total === 0) {