Move "good" badge helpers from lib/ to services/ (#3101)

This moves a few helpers from `lib/` to `services/`: build-status.js build-status.spec.js color-formatters.js color-formatters.spec.js contributor-count.js licenses.js licenses.spec.js php-version.js php-version.spec.js text-formatters.js text-formatters.spec.js version.js version.spec.js And one from `lib/` to `core/`: unhandled-rejection.spec.js The diff is long, but the changes are straightforward. Ref #2832
badges · Feb 28, 2019 · fafb22e · fafb22e
1 parent 8b2ecae
commit fafb22e
Show file tree

Hide file tree

Showing 178 changed files with 326 additions and 354 deletions.
diff --git a/core/service-test-runner/cli.js b/core/service-test-runner/cli.js
@@ -57,7 +57,7 @@ const readAllStdinSync = require('read-all-stdin-sync')
 const { createTestServer } = require('../server/in-process-server-test-helpers')
 const Runner = require('./runner')
 
-require('../../lib/unhandled-rejection.spec')
+require('../unhandled-rejection.spec')
 
 let baseUrl, server
 if (process.env.TESTED_SERVER_URL) {

diff --git a/lib/unhandled-rejection.spec.js → core/unhandled-rejection.spec.js b/lib/unhandled-rejection.spec.js → core/unhandled-rejection.spec.js
diff --git a/doc/TUTORIAL.md b/doc/TUTORIAL.md
diff --git a/scripts/refactoring-cli.js b/scripts/refactoring-cli.js
@@ -2,7 +2,7 @@
 
 const chalk = require('chalk')
 const { namedColors } = require('../gh-badges/lib/color')
-const { floorCount } = require('../lib/color-formatters')
+const { floorCount } = require('../services/color-formatters')
 const { loadServiceClasses } = require('../core/base-service/loader')
 
 const serviceClasses = loadServiceClasses()

diff --git a/services/amo/amo-downloads.service.js b/services/amo/amo-downloads.service.js
@@ -1,7 +1,7 @@
 'use strict'
 
-const { metric } = require('../../lib/text-formatters')
-const { downloadCount } = require('../../lib/color-formatters')
+const { metric } = require('../text-formatters')
+const { downloadCount } = require('../color-formatters')
 const { redirector } = require('..')
 const { BaseAmoService, keywords } = require('./amo-base')
 

diff --git a/services/amo/amo-rating.service.js b/services/amo/amo-rating.service.js
@@ -1,7 +1,7 @@
 'use strict'
 
-const { starRating } = require('../../lib/text-formatters')
-const { floorCount: floorCountColor } = require('../../lib/color-formatters')
+const { starRating } = require('../text-formatters')
+const { floorCount: floorCountColor } = require('../color-formatters')
 const { BaseAmoService, keywords } = require('./amo-base')
 
 module.exports = class AmoRating extends BaseAmoService {

diff --git a/services/amo/amo-users.service.js b/services/amo/amo-users.service.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const { metric } = require('../../lib/text-formatters')
+const { metric } = require('../text-formatters')
 const { BaseAmoService, keywords } = require('./amo-base')
 
 module.exports = class AmoUsers extends BaseAmoService {

diff --git a/services/amo/amo-version.service.js b/services/amo/amo-version.service.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const { renderVersionBadge } = require('../../lib/version')
+const { renderVersionBadge } = require('../version')
 const { BaseAmoService, keywords } = require('./amo-base')
 
 module.exports = class AmoVersion extends BaseAmoService {

diff --git a/services/ansible/ansible-quality.service.js b/services/ansible/ansible-quality.service.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const Joi = require('joi')
-const { floorCount } = require('../../lib/color-formatters')
+const { floorCount } = require('../color-formatters')
 const { BaseJsonService, InvalidResponse } = require('..')
 
 const ansibleContentSchema = Joi.object({

diff --git a/services/ansible/ansible-role.service.js b/services/ansible/ansible-role.service.js
@@ -1,8 +1,8 @@
 'use strict'
 
 const Joi = require('joi')
-const { downloadCount } = require('../../lib/color-formatters')
-const { metric } = require('../../lib/text-formatters')
+const { downloadCount } = require('../color-formatters')
+const { metric } = require('../text-formatters')
 const { BaseJsonService } = require('..')
 const { nonNegativeInteger } = require('../validators')
 

diff --git a/services/apm/apm.service.js b/services/apm/apm.service.js
@@ -1,9 +1,9 @@
 'use strict'
 
 const Joi = require('joi')
-const { renderLicenseBadge } = require('../../lib/licenses')
-const { renderVersionBadge } = require('../../lib/version')
-const { metric } = require('../../lib/text-formatters')
+const { renderLicenseBadge } = require('../licenses')
+const { renderVersionBadge } = require('../version')
+const { metric } = require('../text-formatters')
 const { BaseJsonService, InvalidResponse } = require('..')
 const { nonNegativeInteger } = require('../validators')
 

diff --git a/services/appveyor/appveyor-base.js b/services/appveyor/appveyor-base.js
@@ -3,7 +3,7 @@
 const Joi = require('joi')
 const { BaseJsonService } = require('..')
 const { nonNegativeInteger } = require('../validators')
-const { isBuildStatus } = require('../../lib/build-status')
+const { isBuildStatus } = require('../build-status')
 
 const schema = Joi.object({
   build: Joi.object({

diff --git a/services/appveyor/appveyor-ci.service.js b/services/appveyor/appveyor-ci.service.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const { renderBuildStatusBadge } = require('../../lib/build-status')
+const { renderBuildStatusBadge } = require('../build-status')
 const AppVeyorBase = require('./appveyor-base')
 
 module.exports = class AppVeyorCi extends AppVeyorBase {

diff --git a/services/appveyor/appveyor-ci.tester.js b/services/appveyor/appveyor-ci.tester.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const Joi = require('joi')
-const { isBuildStatus } = require('../../lib/build-status')
+const { isBuildStatus } = require('../build-status')
 const t = (module.exports = require('../tester').createServiceTester())
 
 t.create('CI status')

diff --git a/services/appveyor/appveyor-tests.service.js b/services/appveyor/appveyor-tests.service.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const Joi = require('joi')
-const { renderTestResultBadge } = require('../../lib/text-formatters')
+const { renderTestResultBadge } = require('../text-formatters')
 const AppVeyorBase = require('./appveyor-base')
 
 const documentation = `

diff --git a/services/aur/aur.service.js b/services/aur/aur.service.js
@@ -1,8 +1,8 @@
 'use strict'
 
 const Joi = require('joi')
-const { floorCount: floorCountColor } = require('../../lib/color-formatters')
-const { addv, metric } = require('../../lib/text-formatters')
+const { floorCount: floorCountColor } = require('../color-formatters')
+const { addv, metric } = require('../text-formatters')
 const { BaseJsonService, NotFound } = require('..')
 const { nonNegativeInteger } = require('../validators')
 

diff --git a/services/azure-devops/azure-devops-build.service.js b/services/azure-devops/azure-devops-build.service.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const { renderBuildStatusBadge } = require('../../lib/build-status')
+const { renderBuildStatusBadge } = require('../build-status')
 const { BaseSvgScrapingService, NotFound } = require('..')
 const { keywords, fetch } = require('./azure-devops-helpers')
 

diff --git a/services/azure-devops/azure-devops-build.tester.js b/services/azure-devops/azure-devops-build.tester.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const Joi = require('joi')
-const { isBuildStatus } = require('../../lib/build-status')
+const { isBuildStatus } = require('../build-status')
 const t = (module.exports = require('../tester').createServiceTester())
 
 // https://dev.azure.com/totodem/Shields.io is a public Azure DevOps project

diff --git a/services/azure-devops/azure-devops-coverage.service.js b/services/azure-devops/azure-devops-coverage.service.js
@@ -3,7 +3,7 @@
 const Joi = require('joi')
 const {
   coveragePercentage: coveragePercentageColor,
-} = require('../../lib/color-formatters')
+} = require('../color-formatters')
 const AzureDevOpsBase = require('./azure-devops-base')
 const { keywords, getHeaders } = require('./azure-devops-helpers')
 

diff --git a/services/azure-devops/azure-devops-helpers.js b/services/azure-devops/azure-devops-helpers.js
@@ -2,7 +2,7 @@
 
 const Joi = require('joi')
 const serverSecrets = require('../../lib/server-secrets')
-const { isBuildStatus } = require('../../lib/build-status')
+const { isBuildStatus } = require('../build-status')
 
 const keywords = ['vso', 'vsts', 'azure-devops']
 

diff --git a/services/azure-devops/azure-devops-release.service.js b/services/azure-devops/azure-devops-release.service.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const { renderBuildStatusBadge } = require('../../lib/build-status')
+const { renderBuildStatusBadge } = require('../build-status')
 const { BaseSvgScrapingService } = require('..')
 const { keywords, fetch } = require('./azure-devops-helpers')
 

diff --git a/services/azure-devops/azure-devops-release.tester.js b/services/azure-devops/azure-devops-release.tester.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const Joi = require('joi')
-const { isBuildStatus } = require('../../lib/build-status')
+const { isBuildStatus } = require('../build-status')
 const t = (module.exports = require('../tester').createServiceTester())
 
 // https://dev.azure.com/totodem/Shields.io is a public Azure DevOps project

diff --git a/services/azure-devops/azure-devops-tests.service.js b/services/azure-devops/azure-devops-tests.service.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const Joi = require('joi')
-const { renderTestResultBadge } = require('../../lib/text-formatters')
+const { renderTestResultBadge } = require('../text-formatters')
 const AzureDevOpsBase = require('./azure-devops-base')
 const { getHeaders } = require('./azure-devops-helpers')
 

diff --git a/services/bintray/bintray.service.js b/services/bintray/bintray.service.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const Joi = require('joi')
-const { renderVersionBadge } = require('../../lib/version')
+const { renderVersionBadge } = require('../version')
 const serverSecrets = require('../../lib/server-secrets')
 const { BaseJsonService } = require('..')
 

diff --git a/services/bitbucket/bitbucket-issues.service.js b/services/bitbucket/bitbucket-issues.service.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const Joi = require('joi')
-const { metric } = require('../../lib/text-formatters')
+const { metric } = require('../text-formatters')
 const { BaseJsonService } = require('..')
 const { nonNegativeInteger } = require('../validators')
 

diff --git a/services/bitbucket/bitbucket-pipelines.service.js b/services/bitbucket/bitbucket-pipelines.service.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const Joi = require('joi')
-const { renderBuildStatusBadge } = require('../../lib/build-status')
+const { renderBuildStatusBadge } = require('../build-status')
 const { BaseJsonService } = require('..')
 
 const bitbucketPipelinesSchema = Joi.object({

diff --git a/services/bitbucket/bitbucket-pull-request.service.js b/services/bitbucket/bitbucket-pull-request.service.js
@@ -2,7 +2,7 @@
 
 const Joi = require('joi')
 const serverSecrets = require('../../lib/server-secrets')
-const { metric } = require('../../lib/text-formatters')
+const { metric } = require('../text-formatters')
 const { nonNegativeInteger, optionalUrl } = require('../validators')
 const { BaseJsonService } = require('..')
 

diff --git a/services/bitbucket/bitbucket.tester.js b/services/bitbucket/bitbucket.tester.js
@@ -3,7 +3,7 @@
 const Joi = require('joi')
 const { ServiceTester } = require('../tester')
 const { isMetric, isMetricOpenIssues } = require('../test-validators')
-const { isBuildStatus } = require('../../lib/build-status')
+const { isBuildStatus } = require('../build-status')
 const {
   mockBitbucketCreds,
   mockBitbucketServerCreds,

diff --git a/services/bountysource/bountysource.service.js b/services/bountysource/bountysource.service.js
@@ -3,7 +3,7 @@
 const { BaseJsonService } = require('..')
 const Joi = require('joi')
 const { nonNegativeInteger } = require('../validators')
-const { metric } = require('../../lib/text-formatters')
+const { metric } = require('../text-formatters')
 
 const schema = Joi.object({ activity_total: nonNegativeInteger })
 

diff --git a/services/bower/bower-license.service.js b/services/bower/bower-license.service.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const { renderLicenseBadge } = require('../../lib/licenses')
+const { renderLicenseBadge } = require('../licenses')
 const BaseBowerService = require('./bower-base')
 
 module.exports = class BowerLicense extends BaseBowerService {

diff --git a/services/bower/bower-version.service.js b/services/bower/bower-version.service.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const BaseBowerService = require('./bower-base')
-const { renderVersionBadge } = require('../../lib/version')
+const { renderVersionBadge } = require('../version')
 const { InvalidResponse } = require('..')
 
 module.exports = class BowerVersion extends BaseBowerService {

diff --git a/services/bstats/bstats-players.service.js b/services/bstats/bstats-players.service.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const Joi = require('joi')
-const { metric } = require('../../lib/text-formatters')
+const { metric } = require('../text-formatters')
 const { BaseJsonService } = require('..')
 
 const schema = Joi.array()

diff --git a/services/bstats/bstats-servers.service.js b/services/bstats/bstats-servers.service.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const Joi = require('joi')
-const { metric } = require('../../lib/text-formatters')
+const { metric } = require('../text-formatters')
 const { BaseJsonService } = require('..')
 
 const schema = Joi.array()

diff --git a/lib/build-status.js → services/build-status.js b/lib/build-status.js → services/build-status.js
diff --git a/lib/build-status.spec.js → services/build-status.spec.js b/lib/build-status.spec.js → services/build-status.spec.js
diff --git a/services/buildkite/buildkite.tester.js b/services/buildkite/buildkite.tester.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const Joi = require('joi')
-const { isBuildStatus } = require('../../lib/build-status')
+const { isBuildStatus } = require('../build-status')
 const { invalidJSON } = require('../response-fixtures')
 const { ServiceTester } = require('../tester')
 

diff --git a/services/cdnjs/cdnjs.service.js b/services/cdnjs/cdnjs.service.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const Joi = require('joi')
-const { renderVersionBadge } = require('../../lib/version')
+const { renderVersionBadge } = require('../version')
 const { BaseJsonService, NotFound } = require('..')
 
 const cdnjsSchema = Joi.object({

diff --git a/services/chrome-web-store/chrome-web-store.service.js b/services/chrome-web-store/chrome-web-store.service.js
@@ -5,16 +5,13 @@ const {
   makeBadgeData: getBadgeData,
   makeLabel: getLabel,
 } = require('../../lib/badge-data')
-const { metric, starRating } = require('../../lib/text-formatters')
+const { metric, starRating } = require('../text-formatters')
 const {
   downloadCount: downloadCountColor,
   floorCount: floorCountColor,
   version: versionColor,
-} = require('../../lib/color-formatters')
-const {
-  addv: versionText,
-  currencyFromCode,
-} = require('../../lib/text-formatters')
+} = require('../color-formatters')
+const { addv: versionText, currencyFromCode } = require('../text-formatters')
 
 const commonExample = {
   title: 'Chrome Web Store',

diff --git a/services/cii-best-practices/cii-best-practices.service.js b/services/cii-best-practices/cii-best-practices.service.js
@@ -4,7 +4,7 @@ const Joi = require('joi')
 const {
   colorScale,
   coveragePercentage: coveragePercentageColor,
-} = require('../../lib/color-formatters')
+} = require('../color-formatters')
 const { BaseJsonService } = require('..')
 
 const ciiBestPracticesSchema = Joi.object({

diff --git a/services/circleci/circleci.service.js b/services/circleci/circleci.service.js
@@ -1,10 +1,7 @@
 'use strict'
 
 const Joi = require('joi')
-const {
-  isBuildStatus,
-  renderBuildStatusBadge,
-} = require('../../lib/build-status')
+const { isBuildStatus, renderBuildStatusBadge } = require('../build-status')
 const { BaseJsonService } = require('..')
 
 const circleSchema = Joi.array()

diff --git a/services/circleci/circleci.tester.js b/services/circleci/circleci.tester.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const Joi = require('joi')
-const { isBuildStatus } = require('../../lib/build-status')
+const { isBuildStatus } = require('../build-status')
 const { ServiceTester } = require('../tester')
 
 const t = (module.exports = new ServiceTester({

diff --git a/services/clojars/clojars-downloads.service.js b/services/clojars/clojars-downloads.service.js
@@ -1,8 +1,8 @@
 'use strict'
 
 const Joi = require('joi')
-const { metric } = require('../../lib/text-formatters')
-const { downloadCount: downloadsColor } = require('../../lib/color-formatters')
+const { metric } = require('../text-formatters')
+const { downloadCount: downloadsColor } = require('../color-formatters')
 const { nonNegativeInteger } = require('../validators')
 const { BaseJsonService } = require('..')
 

diff --git a/services/clojars/clojars-version.service.js b/services/clojars/clojars-version.service.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const Joi = require('joi')
-const { version: versionColor } = require('../../lib/color-formatters')
+const { version: versionColor } = require('../color-formatters')
 const { BaseJsonService, NotFound } = require('..')
 
 const clojarsSchema = Joi.object({

diff --git a/services/cocoapods/cocoapods-docs.service.js b/services/cocoapods/cocoapods-docs.service.js
@@ -2,7 +2,7 @@
 
 const {
   coveragePercentage: coveragePercentageColor,
-} = require('../../lib/color-formatters')
+} = require('../color-formatters')
 const Joi = require('joi')
 const { BaseJsonService } = require('..')
 

diff --git a/services/cocoapods/cocoapods-version.service.js b/services/cocoapods/cocoapods-version.service.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const { renderVersionBadge } = require('../../lib/version')
+const { renderVersionBadge } = require('../version')
 const BaseCocoaPodsService = require('./cocoapods-base')
 
 module.exports = class CocoapodsVersion extends BaseCocoaPodsService {

diff --git a/services/codacy/codacy-coverage.service.js b/services/codacy/codacy-coverage.service.js
@@ -3,7 +3,7 @@
 const Joi = require('joi')
 const {
   coveragePercentage: coveragePercentageColor,
-} = require('../../lib/color-formatters')
+} = require('../color-formatters')
 const { BaseSvgScrapingService } = require('..')
 const { NotFound } = require('..')