Skip to content

Commit 769058e

Browse files
authored
Merge pull request #43 from ipfs/move-ipfs
chore: update information after move to ipfs org
2 parents 90e52de + c6a6303 commit 769058e

File tree

6 files changed

+74
-56
lines changed

6 files changed

+74
-56
lines changed

.gitignore

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
1-
## Directory-based project format
2-
.idea/
3-
/*.iml
4-
# if you remove the above rule, at least ignore user-specific stuff:
5-
# .idea/workspace.xml
6-
# .idea/tasks.xml
7-
# .idea/dictionaries
8-
# and these sensitive or high-churn files:
9-
# .idea/dataSources.ids
10-
# .idea/dataSources.xml
11-
# .idea/sqlDataSources.xml
12-
# .idea/dynamic.xml
13-
# and, if using gradle::
14-
# .idea/gradle.xml
15-
# .idea/libraries
16-
17-
## File-based project format
18-
*.ipr
19-
*.iws
20-
21-
## Additional for IntelliJ
22-
out/
23-
24-
# generated by mpeltonen/sbt-idea plugin
25-
.idea_modules/
26-
27-
# generated by JIRA plugin
28-
atlassian-ide-plugin.xml
29-
30-
# generated by Crashlytics plugin (for Android Studio and Intellij)
31-
com_crashlytics_export_strings.xml
32-
/node_modules
1+
**/node_modules/
332
**/*.log
34-
test/repo-just-for-test*
35-
/test/blocks
3+
test/repo-tests*
4+
5+
# Logs
6+
logs
7+
*.log
8+
9+
coverage
10+
11+
# Runtime data
12+
pids
13+
*.pid
14+
*.seed
15+
16+
# Directory for instrumented libs generated by jscoverage/JSCover
17+
lib-cov
18+
19+
# Coverage directory used by tools like istanbul
20+
coverage
21+
22+
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
23+
.grunt
24+
25+
# node-waf configuration
26+
.lock-wscript
27+
28+
build
29+
30+
# Dependency directory
31+
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
32+
node_modules
3633

37-
dist
3834
lib
35+
dist
36+
37+
test/repo-just-for-test*
38+
/test/blocks

.npmignore

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
test
1+
**/node_modules/
2+
**/*.log
3+
test/repo-tests*
24

35
# Logs
46
logs
57
*.log
6-
npm-debug.log*
8+
9+
coverage
710

811
# Runtime data
912
pids
@@ -22,14 +25,10 @@ coverage
2225
# node-waf configuration
2326
.lock-wscript
2427

25-
# Compiled binary addons (http://nodejs.org/api/addons.html)
26-
build/Release
28+
build
2729

2830
# Dependency directory
31+
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
2932
node_modules
3033

31-
# Optional npm cache directory
32-
.npm
33-
34-
# Optional REPL history
35-
.node_repl_history
34+
test

.travis.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
1+
sudo: false
12
language: node_js
23
node_js:
3-
- '4'
4-
- '5'
4+
- 4
5+
- stable
56

7+
# Make sure we have new NPM.
68
before_install:
7-
- npm i -g npm
8-
# Workaround for a permissions issue with Travis virtual machine images
9+
- npm install -g npm
10+
911
script:
1012
- npm run lint
1113
- npm test
14+
- npm run coverage
1215

1316
before_script:
1417
- export DISPLAY=:99.0
1518
- sh -e /etc/init.d/xvfb start
1619

20+
after_success:
21+
- npm run coverage-publish
22+
1723
addons:
1824
firefox: 'latest'

README.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
IPFS Merkle DAG JavaScript Implementation
2-
=========================================
1+
# IPFS Merkle DAG JavaScript Implementation
32

3+
[![](https://img.shields.io/badge/made%20by-Protocol%20Labs-blue.svg?style=flat-square)](http://ipn.io)
4+
[![](https://img.shields.io/badge/project-IPFS-blue.svg?style=flat-square)](http://ipfs.io/)
45
[![](https://img.shields.io/badge/freenode-%23ipfs-blue.svg?style=flat-square)](http://webchat.freenode.net/?channels=%23ipfs)
5-
![](https://img.shields.io/badge/coverage-75%25-yellow.svg?style=flat-square)
6-
![](https://travis-ci.org/vijayee/js-ipfs-merkle-dag.svg?branch=master)
7-
[![Dependency Status](https://david-dm.org/vijayee/js-ipfs-merkle-dag.svg?style=flat-square)](https://david-dm.org/vijayee/js-ipfs-merkledag)
8-
[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/feross/standard)
6+
[![Coverage Status](https://coveralls.io/repos/github/ipfs/js-ipfs-merkle-dag/badge.svg?branch=master)](https://coveralls.io/github/ipfs/js-ipfs-merkle-dag?branch=master)
7+
[![Travis CI](https://travis-ci.org/ipfs/js-ipfs-merkle-dag.svg?branch=master)](https://travis-ci.org/ipfs/js-ipfs-merkle-dag)
8+
[![Circle CI](https://circleci.com/gh/ipfs/js-ipfs-merkle-dag.svg?style=svg)](https://circleci.com/gh/ipfs/js-ipfs-merkle-dag)
9+
[![Dependency Status](https://david-dm.org/ipfs/js-ipfs-merkle-dag.svg?style=flat-square)](https://david-dm.org/ipfs/js-ipfs-merkle-dag) [![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/feross/standard)
910

1011
> JavaScript Implementation of the DAGService and DAGNode data structure
1112

circle.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
machine:
2+
node:
3+
version: stable
4+
5+
dependencies:
6+
pre:
7+
- google-chrome --version
8+
- wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
9+
- sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
10+
- sudo apt-get update
11+
- sudo apt-get --only-upgrade install google-chrome-stable
12+
- google-chrome --version

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"license": "ISC",
3333
"repository": {
3434
"type": "git",
35-
"url": "https://github.com/vijayee/js-ipfs-merkle-dag.git"
35+
"url": "https://github.com/ipfs/js-ipfs-merkle-dag.git"
3636
},
3737
"dependencies": {
3838
"bs58": "^3.0.0",
@@ -57,4 +57,4 @@
5757
"rimraf": "^2.5.0",
5858
"run-series": "^1.1.4"
5959
}
60-
}
60+
}

0 commit comments

Comments
 (0)