Skip to content
This repository has been archived by the owner on Feb 26, 2021. It is now read-only.

Commit

Permalink
Merge pull request #9 from dignifiedquire/dignified
Browse files Browse the repository at this point in the history
Use dignified.js
  • Loading branch information
daviddias committed Apr 7, 2016
2 parents c579fc6 + a0c02fa commit 4cebe9b
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 80 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

language: node_js
node_js:
- "4.0"
- 4
- 5

branches:
only:
Expand All @@ -19,4 +19,5 @@ before_script:
- sh -e /etc/init.d/xvfb start

script:
- npm test
- npm run lint
- npm test
1 change: 0 additions & 1 deletion .zuul.yml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ peer-info JavaScript implementation

[![](https://img.shields.io/badge/made%20by-Protocol%20Labs-blue.svg?style=flat-square)](http://ipn.io)
[![](https://img.shields.io/badge/freenode-%23ipfs-blue.svg?style=flat-square)](http://webchat.freenode.net/?channels=%23ipfs)
![Build Status](https://travis-ci.org/diasdavid/js-peer-info.svg?style=flat-square)](https://travis-ci.org/diasdavid/js-peer-info) ![](https://img.shields.io/badge/coverage-%3F-yellow.svg?style=flat-square)
[![Build Status](https://travis-ci.org/diasdavid/js-peer-info.svg?style=flat-square)](https://travis-ci.org/diasdavid/js-peer-info)
[![Dependency Status](https://david-dm.org/diasdavid/js-peer-info.svg?style=flat-square)](https://david-dm.org/diasdavid/js-peer-info)
[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/feross/standard)

Expand Down
52 changes: 0 additions & 52 deletions karma.conf.js

This file was deleted.

40 changes: 21 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,16 @@
"name": "peer-info",
"version": "0.6.0",
"description": "IPFS Peer abstraction JavaScript implementation",
"main": "src/index.js",
"main": "lib/index.js",
"jsnext:main": "src/index.js",
"scripts": {
"lint": "standard",
"test": "npm run test:node && npm run test:browser",
"test:node": "mocha tests/*-test.js",
"test:browser": "karma start karma.conf.js",
"coverage": "istanbul cover --print both -- _mocha tests/*-test.js"
"lint": "dignified-lint",
"build": "dignified-build",
"test": "dignified-test",
"test:node": "dignified-test node",
"test:browser": "dignified-test browser",
"release": "dignified-release",
"coverage": "istanbul cover --print both -- _mocha tests/*.spec.js"
},
"repository": {
"type": "git",
Expand All @@ -33,21 +36,20 @@
"devDependencies": {
"buffer-loader": "0.0.1",
"chai": "^3.5.0",
"dignified.js": "^1.0.0",
"istanbul": "^0.4.2",
"json-loader": "^0.5.4",
"karma": "^0.13.19",
"karma-chrome-launcher": "^0.2.2",
"karma-cli": "^0.1.2",
"karma-firefox-launcher": "^0.1.7",
"karma-mocha": "^0.2.1",
"karma-spec-reporter": "0.0.24",
"karma-webpack": "^1.7.0",
"mocha": "^2.4.5",
"multiaddr": "^1.1.1",
"peer-id": "^0.6.0",
"pre-commit": "^1.1.2",
"standard": "^6.0.7",
"webpack": "^1.12.14"
"pre-commit": "^1.1.2"
},
"dependencies": {}
"dependencies": {},
"dignified": {
"webpack": {
"resolve": {
"alias": {
"node-forge": "../deps/forge.bundle.js"
}
}
}
}
}
5 changes: 2 additions & 3 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/*
* Peer represents a peer on the IPFS network
*/
'use strict'

const Id = require('peer-id')

exports = module.exports = Peer

// Peer represents a peer on the IPFS network
function Peer (peerId) {
if (!(this instanceof Peer)) {
return new Peer(peerId)
Expand Down
3 changes: 2 additions & 1 deletion tests/peer-info-test.js → test/index.spec.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
/* eslint-env mocha */
'use strict'

const expect = require('chai').expect
const Id = require('peer-id')
const Multiaddr = require('multiaddr')
const PeerInfo = require('../src')

describe('peer-info', function (done) {
describe('peer-info', function () {
this.timeout(10000)

it('create with Id', (done) => {
Expand Down

0 comments on commit 4cebe9b

Please sign in to comment.