diff --git a/README.md b/README.md index f272a70..e7455d9 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,15 @@ -# detect-port +[![logo][logo-image]][logo-url] + +--- [![NPM version][npm-image]][npm-url] +[![node version][node-image]][node-url] [![build status][travis-image]][travis-url] [![Coveralls][coveralls-image]][coveralls-url] -[![node version][node-image]][node-url] [![npm download][download-image]][download-url] +[logo-image]: ./logo.png +[logo-url]: https://npmjs.org/package/detect-port [npm-image]: https://img.shields.io/npm/v/detect-port.svg?style=flat-square [npm-url]: https://npmjs.org/package/detect-port [travis-image]: https://img.shields.io/travis/xudafeng/detect-port.svg?style=flat-square @@ -48,17 +52,17 @@ detect(port, (err, _port) => { * for a yield syntax instead of callback function implement */ -var co = require('co'); +const co = require('co'); co(function *() { - var _port = yield detect(port); + const _port = yield detect(port); if (port === _port) { console.log(`port: ${port} was not occupied`); } else { console.log(`port: ${port} was occupied, try port: ${_port}`); } -})(); +}); /** * use as a promise @@ -78,7 +82,7 @@ detect(port) ``` -## Cli Tool +## Command Line Tool ```shell $ npm i detect-port -g diff --git a/bin/detect-port b/bin/detect-port index a4ad11a..8cc08ef 100755 --- a/bin/detect-port +++ b/bin/detect-port @@ -55,10 +55,14 @@ if (!arg_0) { console.log(` ${pkg.homepage}`); console.log(); } else { - main(port, (err, port) => { + main(port, (err, _port) => { if (err) { console.log(`get available port failed with ${err}`); } - console.log(`get available port ${port}`); + + if (port !== _port) { + console.log(`port ${port} was occupied`); + } + console.log(`get available port ${_port}`); }); } diff --git a/index.js b/index.js index 970d3b9..9f157c0 100644 --- a/index.js +++ b/index.js @@ -13,4 +13,4 @@ 'use strict'; -module.exports = require('./lib'); +module.exports = require('./lib/detect-port'); diff --git a/lib/index.js b/lib/detect-port.js similarity index 100% rename from lib/index.js rename to lib/detect-port.js diff --git a/logo.png b/logo.png new file mode 100644 index 0000000..2dc13db Binary files /dev/null and b/logo.png differ diff --git a/package.json b/package.json index 1b75469..d0b03fb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "detect-port", - "version": "1.0.2", + "version": "1.0.4", "description": "detect available port", "keywords": [ "detect", diff --git a/test/cli.test.js b/test/cli.test.js index 4fdc4a4..840787b 100644 --- a/test/cli.test.js +++ b/test/cli.test.js @@ -48,8 +48,8 @@ describe('command-line tool test', () => { }); it('should output available port from the given port', function *() { - const givenPort = 8080; - var res = yield cliTest.execFile(binFile, [givenPort], {}); + const givenPort = 9000; + const res = yield cliTest.execFile(binFile, [givenPort], {}); const port = parseInt(res.stdout.split(' ')[3], 10); port.should.within(givenPort, 65535); }); diff --git a/test/detect-port.test.js b/test/detect-port.test.js index 25e9091..391e611 100644 --- a/test/detect-port.test.js +++ b/test/detect-port.test.js @@ -18,7 +18,7 @@ const detectPort = require('..'); describe('detect port test', () => { it('callback with occupied port', done => { - var _port = 80; + const _port = 80; detectPort(_port, (err, port) => { if (err) { console.log(err); @@ -38,9 +38,9 @@ describe('detect port test', () => { }); it('generator usage', function *() { - var _port = 8080; + const _port = 8080; try { - var port = yield detectPort(_port); + const port = yield detectPort(_port); port.should.within(_port, 65535); } catch (err) { console.log(err); @@ -48,7 +48,7 @@ describe('detect port test', () => { }); it('promise usage', done => { - var _port = 8080; + const _port = 8080; detectPort(_port) .then(port => { port.should.within(_port, 65535);