From 683fa974469f1b399c0a1ce2a5cb9b40123291e9 Mon Sep 17 00:00:00 2001 From: SidHarder Date: Mon, 14 Nov 2016 12:58:37 -0700 Subject: [PATCH 1/9] added transport to options so it can be used to filter by --- src/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/index.js b/src/index.js index 8c9a91f5..3bf18d81 100644 --- a/src/index.js +++ b/src/index.js @@ -41,6 +41,7 @@ Multiaddr.prototype.toOptions = function toOptions () { var parsed = this.toString().split('/') opts.family = parsed[1] === 'ip4' ? 'ipv4' : 'ipv6' opts.host = parsed[2] + opts.transport = parsed[3] opts.port = parsed[4] return opts } From 890f2380794fc972a1c2a9177dbc3aeb02a47d95 Mon Sep 17 00:00:00 2001 From: SidHarder Date: Thu, 17 Nov 2016 10:42:47 -0700 Subject: [PATCH 2/9] fixed well formed object test --- test/index.spec.js | 1 + 1 file changed, 1 insertion(+) diff --git a/test/index.spec.js b/test/index.spec.js index e8928a9a..e5a09d20 100644 --- a/test/index.spec.js +++ b/test/index.spec.js @@ -302,6 +302,7 @@ describe('helpers', () => { ).to.be.eql({ family: 'ipv4', host: '0.0.0.0', + transport: 'tcp', port: '1234' }) }) From ddb7dd5005e7756ffbb41c5fae3d585c6eebf997 Mon Sep 17 00:00:00 2001 From: David Dias Date: Thu, 17 Nov 2016 18:51:54 +0000 Subject: [PATCH 3/9] chore: update deps --- .gitignore | 1 - package.json | 11 +++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 5b1fd197..907c78a7 100644 --- a/.gitignore +++ b/.gitignore @@ -27,4 +27,3 @@ build/Release node_modules dist -lib \ No newline at end of file diff --git a/package.json b/package.json index d84ae670..9b4b42da 100644 --- a/package.json +++ b/package.json @@ -2,8 +2,7 @@ "name": "multiaddr", "version": "2.0.3", "description": "multiaddr implementation (binary + string representation of network addresses)", - "main": "lib/index.js", - "jsnext:main": "src/index.js", + "main": "src/index.js", "scripts": { "lint": "aegir-lint", "test": "aegir-test", @@ -36,16 +35,16 @@ }, "homepage": "https://github.com/multiformats/js-multiaddr", "dependencies": { - "babel-runtime": "^6.11.6", + "babel-runtime": "^6.18.0", "bs58": "^3.0.0", - "ip": "^1.1.3", + "ip": "^1.1.4", "lodash.filter": "^4.6.0", "lodash.map": "^4.6.0", - "varint": "^4.0.1", + "varint": "^5.0.0", "xtend": "^4.0.1" }, "devDependencies": { - "aegir": "^8.0.0", + "aegir": "^9.1.2", "buffer-loader": "0.0.1", "chai": "^3.5.0", "pre-commit": "^1.1.3" From c80f953a43aacb9091ccdd47fb6173f5aea1b14a Mon Sep 17 00:00:00 2001 From: David Dias Date: Thu, 17 Nov 2016 18:52:51 +0000 Subject: [PATCH 4/9] chore: update badges --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 7994a34b..c9989cce 100644 --- a/README.md +++ b/README.md @@ -4,10 +4,10 @@ js-multiaddr [![](https://img.shields.io/badge/made%20by-Protocol%20Labs-blue.svg?style=flat-square)](http://ipn.io) [![](https://img.shields.io/badge/project-multiformats-blue.svg?style=flat-square)](http://github.com/multiformats/multiformats) [![](https://img.shields.io/badge/freenode-%23ipfs-blue.svg?style=flat-square)](http://webchat.freenode.net/?channels=%23ipfs) -[![Coverage Status](https://coveralls.io/repos/github/jbenet/js-multiaddr/badge.svg?branch=master)](https://coveralls.io/github/jbenet/js-multiaddr?branch=master) -[![Travis CI](https://travis-ci.org/jbenet/js-multiaddr.svg?branch=master)](https://travis-ci.org/jbenet/js-multiaddr) -[![Circle CI](https://circleci.com/gh/jbenet/js-multiaddr.svg?style=svg)](https://circleci.com/gh/jbenet/js-multiaddr) -[![Dependency Status](https://david-dm.org/jbenet/js-multiaddr.svg?style=flat-square)](https://david-dm.org/jbenet/js-multiaddr) [![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/feross/standard) +[![Coverage Status](https://coveralls.io/repos/github/multiformats/js-multiaddr/badge.svg?branch=master)](https://coveralls.io/github/multiformats/js-multiaddr?branch=master) +[![Travis CI](https://travis-ci.org/multiformats/js-multiaddr.svg?branch=master)](https://travis-ci.org/multiformats/js-multiaddr) +[![Circle CI](https://circleci.com/gh/multiformats/js-multiaddr.svg?style=svg)](https://circleci.com/gh/multiformats/js-multiaddr) +[![Dependency Status](https://david-dm.org/multiformats/js-multiaddr.svg?style=flat-square)](https://david-dm.org/multiformats/js-multiaddr) [![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/feross/standard) > JavaScript implementation of [multiaddr](https://github.com/multiformats/multiaddr). From f2ba70c0496bb0e6a5e0a2f5cd23977e6578045c Mon Sep 17 00:00:00 2001 From: David Dias Date: Thu, 17 Nov 2016 18:56:13 +0000 Subject: [PATCH 5/9] chore: update contributors --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 9b4b42da..d5897d84 100644 --- a/package.json +++ b/package.json @@ -54,6 +54,7 @@ "Friedel Ziegelmayer ", "Juan Batiz-Benet ", "Richard Littauer ", - "Stephen Whitmore " + "Stephen Whitmore ", + "npm-to-cdn-bot (by Forbes Lindesay) " ] -} +} \ No newline at end of file From c21f8c7c81deba526a55122fd611dbddc6089ae1 Mon Sep 17 00:00:00 2001 From: David Dias Date: Thu, 17 Nov 2016 18:56:13 +0000 Subject: [PATCH 6/9] chore: release version v2.1.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d5897d84..2a857936 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "multiaddr", - "version": "2.0.3", + "version": "2.1.0", "description": "multiaddr implementation (binary + string representation of network addresses)", "main": "src/index.js", "scripts": { From a4d3accdfb7d03e0f33717e9876010da1704ca36 Mon Sep 17 00:00:00 2001 From: SidHarder Date: Mon, 14 Nov 2016 12:58:37 -0700 Subject: [PATCH 7/9] added transport to options so it can be used to filter by --- src/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/index.js b/src/index.js index 8c9a91f5..3bf18d81 100644 --- a/src/index.js +++ b/src/index.js @@ -41,6 +41,7 @@ Multiaddr.prototype.toOptions = function toOptions () { var parsed = this.toString().split('/') opts.family = parsed[1] === 'ip4' ? 'ipv4' : 'ipv6' opts.host = parsed[2] + opts.transport = parsed[3] opts.port = parsed[4] return opts } From cebc083fc6694314de8ecb95e7ca539753c7d5e3 Mon Sep 17 00:00:00 2001 From: SidHarder Date: Thu, 17 Nov 2016 10:42:47 -0700 Subject: [PATCH 8/9] fixed well formed object test --- test/index.spec.js | 1 + 1 file changed, 1 insertion(+) diff --git a/test/index.spec.js b/test/index.spec.js index e8928a9a..e5a09d20 100644 --- a/test/index.spec.js +++ b/test/index.spec.js @@ -302,6 +302,7 @@ describe('helpers', () => { ).to.be.eql({ family: 'ipv4', host: '0.0.0.0', + transport: 'tcp', port: '1234' }) }) From ab44230de7575c19a8ae183ba1cbbde23e4c15ad Mon Sep 17 00:00:00 2001 From: SidHarder Date: Thu, 17 Nov 2016 13:43:30 -0700 Subject: [PATCH 9/9] replaced tabs with spaces --- test/index.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/index.spec.js b/test/index.spec.js index e5a09d20..7b233944 100644 --- a/test/index.spec.js +++ b/test/index.spec.js @@ -302,7 +302,7 @@ describe('helpers', () => { ).to.be.eql({ family: 'ipv4', host: '0.0.0.0', - transport: 'tcp', + transport: 'tcp', port: '1234' }) })