Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move gh-badges CLI into lib/ #1231

Merged
merged 1 commit into from
Oct 31, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
server.js
server.spec.js
gh-badge.js
gh-badge.spec.js
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ifeq ($(UNAME_S),Darwin)
endif

favicon:
node gh-badge.js '' '' '#bada55' .png > favicon.png
node lib/badge-cli.js '' '' '#bada55' .png > favicon.png

footer-production-transform:
@$(SED) "s,(<img src=\")(/[^\"\?]+)\",\1https://img.shields.io\2?maxAge=2592000\"," \
Expand Down
27 changes: 15 additions & 12 deletions gh-badge.js → lib/badge-cli.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
#!/usr/bin/env node
var path = require('path');
var badge = require(path.join(__dirname, 'lib', 'badge.js'));
var svg2img = require(path.join(__dirname, 'lib', 'svg-to-img.js'));
var colorscheme = require(path.join(__dirname, 'lib', 'colorscheme.json'));

'use strict';

const badge = require('./badge');
const svg2img = require('./svg-to-img');
const colorscheme = require('./colorscheme.json');

if (process.argv.length < 4) {
console.log('Usage: badge subject status [:colorscheme] [.output] [@style]');
console.log('Or: badge subject status right-color [left-color] [.output] [@style]');
Expand All @@ -22,9 +25,9 @@ if (process.argv.length < 4) {
}

// Find a format specifier.
var format = 'svg';
var style = '';
for (var i = 4; i < process.argv.length; i++) {
let format = 'svg';
let style = '';
for (let i = 4; i < process.argv.length; i++) {
if (process.argv[i][0] === '.') {
format = process.argv[i].slice(1);
process.argv.splice(i, 1);
Expand All @@ -37,12 +40,12 @@ for (var i = 4; i < process.argv.length; i++) {
}
}

var subject = process.argv[2];
var status = process.argv[3];
var color = process.argv[4] || ':green';
var colorA = process.argv[5];
const subject = process.argv[2];
const status = process.argv[3];
let color = process.argv[4] || ':green';
const colorA = process.argv[5];

var badgeData = {text: [subject, status], format: format};
const badgeData = {text: [subject, status], format: format};
if (style) {
badgeData.template = style;
}
Expand Down
4 changes: 3 additions & 1 deletion gh-badge.spec.js → lib/badge-cli.spec.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
'use strict';

const assert = require('assert');
const isPng = require('is-png');
const isSvg = require('is-svg');
const {spawn} = require('child-process-promise');

function runCli (args) {
return spawn('node', ['gh-badge.js', ...args], { capture: ['stdout'] })
return spawn('node', ['lib/badge-cli.js', ...args], { capture: ['stdout'] })
.then(result => result.stdout);
}

Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"coverage:report:reopen": "opn coverage/lcov-report/index.html",
"coverage:report:open": "npm run coverage:report && npm run coverage:report:reopen",
"lint": "eslint '**/*.js'",
"test:js": "mocha lib '*.spec.js'",
"test:js": "mocha '*.spec.js' 'lib/**/*.spec.js'",
"test:services": "mocha --delay service-tests/runner/cli.js",
"test:services:pr:prepare": "node service-tests/runner/pull-request-services-cli.js > pull-request-services.log",
"test:services:pr:run": "mocha --delay service-tests/runner/cli.js --stdin < pull-request-services.log",
Expand All @@ -62,11 +62,11 @@
"start": "INFOSITE=/ node server 8080 ::"
},
"bin": {
"badge": "./gh-badge.js"
"badge": "lib/badge-cli.js"
},
"files": [
"README.md",
"gh-badge.js",
"lib/badge-cli.js",
"lib/badge.js",
"lib/colorscheme.json",
"lib/lru-cache.js",
Expand Down