From 805914884142be7eaab96d78366803410a2175ce Mon Sep 17 00:00:00 2001 From: Friedel Ziegelmayer Date: Wed, 26 Oct 2016 14:31:20 +0200 Subject: [PATCH 01/12] test: use multihashing-async --- package.json | 2 +- test/index.spec.js | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index fc60e72..14d824d 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "devDependencies": { "aegir": "^8.0.1", "chai": "^3.5.0", - "multihashing": "^0.2.1", + "multihashing-async": "^0.1.0", "pre-commit": "^1.1.2" }, "engines": { diff --git a/test/index.spec.js b/test/index.spec.js index f3b238a..ef3e50b 100644 --- a/test/index.spec.js +++ b/test/index.spec.js @@ -3,7 +3,7 @@ const expect = require('chai').expect const multihash = require('multihashes') -const multihashing = require('multihashing') +const multihashing = require('multihashing-async') const CID = require('../src') @@ -20,17 +20,19 @@ describe('CID', () => { expect(cid.toBaseEncodedString()).to.be.eql(mhStr) }) - it('handles Buffer multihash', () => { - const mh = multihashing(Buffer('hello world'), 'sha2-256') - const mhStr = 'QmaozNR7DZHQK1ZcU9p7QdrshMvXqWK6gpu5rmrkPdT3L4' + it('handles Buffer multihash', (done) => { + multihashing(Buffer('hello world'), 'sha2-256', (err, mh) => { + const mhStr = 'QmaozNR7DZHQK1ZcU9p7QdrshMvXqWK6gpu5rmrkPdT3L4' - const cid = new CID(mh) + const cid = new CID(mh) - expect(cid).to.have.property('codec', 'dag-pb') - expect(cid).to.have.property('version', 0) - expect(cid).to.have.property('multihash').that.eql(mh) + expect(cid).to.have.property('codec', 'dag-pb') + expect(cid).to.have.property('version', 0) + expect(cid).to.have.property('multihash').that.eql(mh) - expect(cid.toBaseEncodedString()).to.be.eql(mhStr) + expect(cid.toBaseEncodedString()).to.be.eql(mhStr) + done() + }) }) it('create by parts', () => { From bf54b32b05c1effa80e57d5b5ed0c1479db7e3a7 Mon Sep 17 00:00:00 2001 From: Friedel Ziegelmayer Date: Thu, 27 Oct 2016 12:37:36 +0200 Subject: [PATCH 02/12] feat: ready for new aegir --- package.json | 3 +-- test/index.spec.js | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 14d824d..3f600c8 100644 --- a/package.json +++ b/package.json @@ -2,8 +2,7 @@ "name": "cids", "version": "0.2.0", "description": "cid implementation", - "main": "lib/index.js", - "jsnext:main": "src/index.js", + "main": "src/index.js", "scripts": { "test:node": "aegir-test node", "lint": "aegir-lint", diff --git a/test/index.spec.js b/test/index.spec.js index ef3e50b..ac125db 100644 --- a/test/index.spec.js +++ b/test/index.spec.js @@ -22,6 +22,7 @@ describe('CID', () => { it('handles Buffer multihash', (done) => { multihashing(Buffer('hello world'), 'sha2-256', (err, mh) => { + expect(err).to.not.exist const mhStr = 'QmaozNR7DZHQK1ZcU9p7QdrshMvXqWK6gpu5rmrkPdT3L4' const cid = new CID(mh) From 410c1bb1fa2abaefe522e98cc2b8af84cb39b2cb Mon Sep 17 00:00:00 2001 From: Friedel Ziegelmayer Date: Thu, 27 Oct 2016 13:00:43 +0200 Subject: [PATCH 03/12] docs: more badges --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index f0eeaf3..ee69270 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,10 @@ [![Circle CI](https://circleci.com/gh/ipfs/js-cid.svg?style=svg)](https://circleci.com/gh/ipfs/js-cid) [![Dependency Status](https://david-dm.org/ipfs/js-cid.svg?style=flat-square)](https://david-dm.org/ipfs/js-cid) [![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/feross/standard) +![](https://img.shields.io/badge/npm-%3E%3D3.0.0-orange.svg?style=flat-square) +![](https://img.shields.io/badge/Node.js-%3E%3D4.0.0-orange.svg?style=flat-square) + +[![Sauce Test Status](https://saucelabs.com/browser-matrix/js-cid.svg)](https://saucelabs.com/u/js-cid) > CID implementation in JavaScript. From 488173a46046a65a9c083db35ae07fdecc832261 Mon Sep 17 00:00:00 2001 From: Friedel Ziegelmayer Date: Thu, 27 Oct 2016 13:11:00 +0200 Subject: [PATCH 04/12] fix: correct engines field --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3f600c8..8b4ca9b 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "pre-commit": "^1.1.2" }, "engines": { - "node": ">=4.2.2" + "node": ">=4.0.0" }, "contributors": [ "David Dias ", From 13342266e82d3d645c309ce80bb430ea2136aebb Mon Sep 17 00:00:00 2001 From: Friedel Ziegelmayer Date: Thu, 27 Oct 2016 13:13:16 +0200 Subject: [PATCH 05/12] chore(travis): correct nodejs versions --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index dd9e44e..fc1482f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ sudo: false language: node_js node_js: - 4 - - 5 + - 6 - stable # Make sure we have new NPM. From 5ef307104ca31eabd8617e56f54f473cac05ce64 Mon Sep 17 00:00:00 2001 From: Friedel Ziegelmayer Date: Thu, 27 Oct 2016 15:01:24 +0200 Subject: [PATCH 06/12] update aegir --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8b4ca9b..e7a88fb 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "multihashes": "^0.2.2" }, "devDependencies": { - "aegir": "^8.0.1", + "aegir": "^9.0.0", "chai": "^3.5.0", "multihashing-async": "^0.1.0", "pre-commit": "^1.1.2" From e32b17231b9037a9b4e86c113ca94f0c5765636e Mon Sep 17 00:00:00 2001 From: Friedel Ziegelmayer Date: Thu, 27 Oct 2016 15:09:07 +0200 Subject: [PATCH 07/12] chore(travis): enable native addons --- .travis.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index fc1482f..fdb74ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,12 +14,20 @@ script: - npm test - npm run coverage -addons: - firefox: 'latest' - before_script: - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start after_success: - npm run coverage-publish + +env: + - CXX=g++-4.8 + +addons: + firefox: 'latest' + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 From 3f1fc2f13cc8947f87bdc9586f92ce46be8efea0 Mon Sep 17 00:00:00 2001 From: Friedel Ziegelmayer Date: Mon, 31 Oct 2016 09:36:17 +0100 Subject: [PATCH 08/12] chore(travis): try new build matrix --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index fdb74ea..0f9ce3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,12 @@ node_js: - 4 - 6 - stable +matrix: + include: + - node_js: 4 + - node_js: 6 + - node_js: stable + env: SAUCE=true # Make sure we have new NPM. before_install: From cf0f15ac9f83205cc25c4b23fd803c5b234b7994 Mon Sep 17 00:00:00 2001 From: Friedel Ziegelmayer Date: Mon, 31 Oct 2016 09:37:25 +0100 Subject: [PATCH 09/12] chore(travis): less builds --- .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0f9ce3b..28928db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,6 @@ sudo: false language: node_js -node_js: - - 4 - - 6 - - stable + matrix: include: - node_js: 4 From ee7bc936a18f5c390831d2d8ef47ad7d8d697251 Mon Sep 17 00:00:00 2001 From: Friedel Ziegelmayer Date: Mon, 31 Oct 2016 09:46:28 +0100 Subject: [PATCH 10/12] chore: more config --- .travis.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 28928db..fca61ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,9 +4,13 @@ language: node_js matrix: include: - node_js: 4 + env: CXX=g++-4.8 - node_js: 6 + env: CXX=g++-4.8 - node_js: stable - env: SAUCE=true + env: + - SAUCE=true + - CXX=g++-4.8 # Make sure we have new NPM. before_install: @@ -24,8 +28,7 @@ before_script: after_success: - npm run coverage-publish -env: - - CXX=g++-4.8 + addons: firefox: 'latest' From aa96305226b6c43e3a84a60344ca9d54f1c9809d Mon Sep 17 00:00:00 2001 From: Friedel Ziegelmayer Date: Mon, 31 Oct 2016 10:46:21 +0100 Subject: [PATCH 11/12] chore: update sauce badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ee69270..1a8e370 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ ![](https://img.shields.io/badge/npm-%3E%3D3.0.0-orange.svg?style=flat-square) ![](https://img.shields.io/badge/Node.js-%3E%3D4.0.0-orange.svg?style=flat-square) -[![Sauce Test Status](https://saucelabs.com/browser-matrix/js-cid.svg)](https://saucelabs.com/u/js-cid) +[![Sauce Test Status](https://saucelabs.com/browser-matrix/ipfs-js-cid.svg)](https://saucelabs.com/u/ipfs-js-cid) > CID implementation in JavaScript. From 7842c11c38a99893a785fee46b141200a9dc26cc Mon Sep 17 00:00:00 2001 From: David Dias Date: Thu, 3 Nov 2016 13:38:17 +0000 Subject: [PATCH 12/12] chore: update deps --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index e7a88fb..b0303c2 100644 --- a/package.json +++ b/package.json @@ -39,10 +39,10 @@ "multihashes": "^0.2.2" }, "devDependencies": { - "aegir": "^9.0.0", + "aegir": "^9.0.1", "chai": "^3.5.0", - "multihashing-async": "^0.1.0", - "pre-commit": "^1.1.2" + "multihashing-async": "^0.2.0", + "pre-commit": "^1.1.3" }, "engines": { "node": ">=4.0.0"