Consistent version formatting

lib/color-formatters.js

@@ -10,13 +10,11 @@ function version(version) {
   let first = version[0];
   if (first === 'v') {
     first = version[1];
-  } else if (/^[0-9]/.test(version)) {
-    version = 'v' + version;
   }
-  if (first === '0' || (version.indexOf('-') !== -1)) {
-    return { version: version, color: 'orange' };
+  if (first === '0' || /alpha|beta|snapshot|dev|pre/.test(version.toLowerCase())) {
+    return 'orange';
   } else {
-    return { version: version, color: 'blue' };
+    return 'blue';
   }
 }
 

lib/color-formatters.spec.js

@@ -4,7 +4,8 @@ const { test, given, forCases } = require('sazerac');
 const {
   coveragePercentage,
   colorScale,
-  age
+  age,
+  version
 } = require('./color-formatters');
 
 describe('Color formatters', function() {
@@ -52,4 +53,17 @@ describe('Color formatters', function() {
     given(monthsAgo(2)).describe('when given a Date two months ago').expect('yellowgreen');
     given(monthsAgo(15)).describe('when given a Date 15 months ago').expect('orange');
   });
+
+  test(version, () => {
+    given('1.0').expect('blue');
+
+    forCases([
+      given('0.9'),
+      given('1.0-Beta'),
+      given('1.1-alpha'),
+      given('6.0-SNAPSHOT'),
+      given('1.0.1-dev'),
+      given('2.1.6-prerelease'),
+      ]).expect('orange');
+  });
 });

lib/text-formatters.js

@@ -1,6 +1,6 @@
 /**
  * Commonly-used functions for formatting text in badge labels. Includes
- * ordinal numbers, currency codes, star ratings, etc.
+ * ordinal numbers, currency codes, star ratings, versions, etc.
  */
 'use strict';
 
@@ -63,6 +63,18 @@ function omitv(version) {
   return version;
 }
 
+// Add a starting v to the version unless:
+// - it does not start with a digit
+// - it is a date (yyyy-mm-dd)
+const ignoredVersionPatterns = /^[^0-9]|[0-9]{4}-[0-9]{2}-[0-9]{2}/;
+function addv(version) {
+  if (version.startsWith('v') || ignoredVersionPatterns.test(version)) {
+    return version;
+  } else {
+    return `v${version}`;
+  }
+}
+
 function maybePluralize(singular, countable, plural) {
   plural = plural || `${singular}s`;
 
@@ -91,6 +103,7 @@ module.exports = {
   ordinalNumber,
   metric,
   omitv,
+  addv,
   maybePluralize,
   formatDate
 };

lib/text-formatters.spec.js

@@ -8,6 +8,7 @@ const {
   ordinalNumber,
   metric,
   omitv,
+  addv,
   maybePluralize,
   formatDate
 } = require('./text-formatters');
@@ -54,6 +55,13 @@ describe('Text formatters', function() {
     given('v1.0.1').expect('1.0.1');
   });
 
+  test(addv, () => {
+    given('1.0.0').expect('v1.0.0');
+    given('v0.6').expect('v0.6');
+    given('hello').expect('hello');
+    given('2017-05-05-Release-2.3.17').expect('2017-05-05-Release-2.3.17');
+  });
+
   test(maybePluralize, () => {
     given('foo', []).expect('foos');
     given('foo', [123]).expect('foo');