From f08dbbc8a993f2ab0c3d719dfc6bbecb610ff14f Mon Sep 17 00:00:00 2001 From: dignifiedquire Date: Wed, 23 Mar 2016 15:30:14 +0100 Subject: [PATCH 1/2] Use dignified.js --- .gitignore | 3 +++ .travis.yml | 5 ++++- examples/level1-swarm/node-1.js | 2 ++ examples/level1-swarm/node-2.js | 2 ++ package.json | 22 +++++++++++++++------- src/index.js | 2 ++ test/index.spec.js | 19 +++++++++++++++++++ 7 files changed, 47 insertions(+), 8 deletions(-) create mode 100644 test/index.spec.js diff --git a/.gitignore b/.gitignore index 123ae94d05..5b1fd197ff 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,6 @@ build/Release # Dependency directory # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git node_modules + +dist +lib \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 5679e52cad..3828e30dcd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,8 @@ +use_sudo: false language: node_js node_js: - - "iojs" + - 4 + - 5 branches: only: @@ -10,4 +12,5 @@ before_install: - npm i -g npm # Workaround for a permissions issue with Travis virtual machine images script: + - npm run lint - npm test diff --git a/examples/level1-swarm/node-1.js b/examples/level1-swarm/node-1.js index 3489b06f1d..f6c35228b6 100644 --- a/examples/level1-swarm/node-1.js +++ b/examples/level1-swarm/node-1.js @@ -1,3 +1,5 @@ +'use strict' + var Swarm = require('libp2p-swarm') var tcp = require('libp2p-tcp') var multiaddr = require('multiaddr') diff --git a/examples/level1-swarm/node-2.js b/examples/level1-swarm/node-2.js index 25af2e356b..4e25ad9fab 100644 --- a/examples/level1-swarm/node-2.js +++ b/examples/level1-swarm/node-2.js @@ -1,3 +1,5 @@ +'use strict' + var Swarm = require('libp2p-swarm') var tcp = require('libp2p-tcp') var multiaddr = require('multiaddr') diff --git a/package.json b/package.json index f139322a35..a477bcec8d 100644 --- a/package.json +++ b/package.json @@ -2,9 +2,15 @@ "name": "libp2p", "version": "0.1.1", "description": "Node.js implementation of libp2p", - "main": "src/index.js", + "main": "lib/index.js", + "jsnext:main": "src/index.js", "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" + "lint": "dignified-lint", + "build": "dignified-build", + "test": "dignified-test", + "test:node": "dignified-test node", + "test:browser": "dignified-test browser", + "release": "dignified-release" }, "repository": { "type": "git", @@ -16,7 +22,10 @@ "engines": { "node": "^4.0.0" }, - "pre-commit": [], + "pre-commit": [ + "lint", + "test" + ], "author": "David Dias ", "license": "MIT", "bugs": { @@ -24,15 +33,14 @@ }, "homepage": "https://github.com/diasdavid/js-libp2p", "devDependencies": { - "code": "^1.5.0", - "lab": "^5.17.0", + "chai": "^3.5.0", + "dignified.js": "github:dignifiedquire/dignified.js", "libp2p-spdy": "^0.1.0", "libp2p-swarm": "^0.5.5", "libp2p-tcp": "^0.1.2", "multiaddr": "^1.1.1", "peer-id": "^0.4.0", "peer-info": "^0.4.0", - "pre-commit": "^1.1.1", - "standard": "^5.3.1" + "pre-commit": "^1.1.1" } } diff --git a/src/index.js b/src/index.js index 65d95d884f..d46f08e6ae 100644 --- a/src/index.js +++ b/src/index.js @@ -1,3 +1,5 @@ +'use strict' + exports = module.exports = Libp2p function Libp2p (swarm, peerRouting, recordStore) { diff --git a/test/index.spec.js b/test/index.spec.js new file mode 100644 index 0000000000..b18a94ee04 --- /dev/null +++ b/test/index.spec.js @@ -0,0 +1,19 @@ +/* eslint-env mocha */ +'use strict' + +const expect = require('chai').expect +const Swarm = require('libp2p-swarm') +const Id = require('peer-id') +const Peer = require('peer-info') + +const Node = require('../src') + +describe('libp2p', () => { + it('can be instantiated', () => { + const peer = new Peer(Id.create(), []) + const swarm = new Swarm(peer) + const node = new Node(swarm) + + expect(node.swarm).to.be.eql(swarm) + }) +}) From a6652f295efb1eb0703e00053a0810cb3108a527 Mon Sep 17 00:00:00 2001 From: dignifiedquire Date: Thu, 7 Apr 2016 21:20:56 +0200 Subject: [PATCH 2/2] Use dignified.js 1.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a477bcec8d..a3784321f3 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "homepage": "https://github.com/diasdavid/js-libp2p", "devDependencies": { "chai": "^3.5.0", - "dignified.js": "github:dignifiedquire/dignified.js", + "dignified.js": "^1.0.0", "libp2p-spdy": "^0.1.0", "libp2p-swarm": "^0.5.5", "libp2p-tcp": "^0.1.2",