Skip to content

Commit

Permalink
deps: upgrade ms to 0.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
fengmk2 committed Apr 5, 2015
1 parent be36edb commit 4cf945f
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
5 changes: 0 additions & 5 deletions .npmignore

This file was deleted.

2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,7 @@ language: node_js
node_js:
- "0.10"
- "0.11"
- "0.12"
- "iojs-1"
script: "make test-travis"
after_script: "npm install coveralls@2.10.0 && cat ./coverage/lcov.info | coveralls"
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
TESTS = test/*.test.js
REPORTER = tap
REPORTER = spec
TIMEOUT = 3000
MOCHA_OPTS =

install:
@npm install --registry=http://registry.npm.taobao.org
@npm install

test:
@NODE_ENV=test ./node_modules/mocha/bin/mocha \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ $ npm install humanize-ms

## Examples

```
```js
var ms = require('humanize-ms');

ms('1s') // 1000
Expand Down
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ var ms = require('ms');
module.exports = function (t) {
if (typeof t === 'number') return t;
var r = ms(t);
if (r === undefined) console.warn('ms(%s) got undefined in %s', t, __filename);
if (r === undefined) console.warn('ms(%j) got undefined in %s', t, __filename);
return r;
};
11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"version": "1.0.1",
"description": "transform humanize time to ms",
"main": "index.js",
"files": ["index.js"],
"scripts": {
"test": "make test"
},
Expand All @@ -21,12 +22,12 @@
},
"license": "MIT",
"dependencies": {
"ms": "~0.6.2"
"ms": "~0.7.0"
},
"devDependencies": {
"autod": "~0.3.2",
"istanbul": "~0.3.0",
"mocha": "~1.21.4",
"should": "~4.0.4"
"autod": "*",
"istanbul": "*",
"mocha": "*",
"should": "*"
}
}
2 changes: 2 additions & 0 deletions test/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ describe('humanize-ms', function () {
describe('when string', function () {
it('should transform to number', function () {
ms('1s').should.equal(1000);
ms('1m').should.equal(60000);
ms('1').should.equal(1);
});
});

Expand Down

0 comments on commit 4cf945f

Please sign in to comment.