Skip to content

Commit fc66c06

Browse files
authored
feat: Windows interop (#146)
* chore: update deps * chore: update gitignore * chore: update deps * chore: add appveyor CI * chore: update CI configs * chore: update package.json to be new aegir friendly * bring leveldown down * chore: fix linting
1 parent 72b74ce commit fc66c06

8 files changed

+68
-49
lines changed

.appveyor.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
environment:
2+
matrix:
3+
- nodejs_version: "6"
4+
- nodejs_version: "8"
5+
6+
# cache:
7+
# - node_modules
8+
9+
platform:
10+
- x64
11+
12+
install:
13+
- ps: Install-Product node $env:nodejs_version $env:platform
14+
- npm install
15+
16+
test_script:
17+
- node --version
18+
- npm --version
19+
- npm test
20+
21+
build: off
22+
23+
version: "{build}"

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
yarn.lock
2+
package-lock.json
3+
14
test/test-repo-for*
25

36
# Logs

.travis.yml

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,16 @@ language: node_js
33

44
matrix:
55
include:
6-
- node_js: 4
7-
env: CXX=g++-4.8
86
- node_js: 6
9-
env:
10-
- CXX=g++-4.8
11-
- node_js: stable
127
env: CXX=g++-4.8
13-
14-
# Make sure we have new NPM.
15-
before_install:
16-
- npm install -g npm@4
8+
- node_js: 8
9+
env: CXX=g++-4.8
10+
# - node_js: stable
11+
# env: CXX=g++-4.8
1712

1813
script:
1914
- npm run lint
20-
- npm test
21-
- npm run coverage
22-
- make test
15+
- npm run test
2316

2417
before_script:
2518
- export DISPLAY=:99.0

circle.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ machine:
22
node:
33
version: stable
44

5+
test:
6+
post:
7+
- npm run coverage -- --upload
8+
59
dependencies:
610
pre:
711
- google-chrome --version

package.json

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@
1111
"./src/default-options.js": "./src/default-options-browser.js"
1212
},
1313
"scripts": {
14-
"test": "aegir-test",
15-
"test:node": "aegir-test node",
16-
"test:browser": "aegir-test browser",
17-
"build": "aegir-build",
18-
"lint": "aegir-lint",
19-
"release": "aegir-release --docs",
20-
"release-minor": "aegir-release --type minor --docs",
21-
"release-major": "aegir-release --type major --docs",
22-
"coverage": "aegir-coverage",
23-
"coverage-publish": "aegir-coverage publish",
24-
"docs": "aegir-docs"
14+
"test": "aegir test",
15+
"test:node": "aegir test --target node",
16+
"test:browser": "aegir test --target browser",
17+
"build": "aegir build",
18+
"lint": "aegir lint",
19+
"release": "aegir release --docs",
20+
"release-minor": "aegir release --type minor --docs",
21+
"release-major": "aegir release --type major --docs",
22+
"coverage": "aegir coverage",
23+
"coverage-publish": "aegir-coverage --provider coveralls",
24+
"docs": "aegir docs"
2525
},
2626
"repository": {
2727
"type": "git",
@@ -38,37 +38,37 @@
3838
],
3939
"homepage": "https://github.com/ipfs/js-ipfs-repo",
4040
"engines": {
41-
"node": ">=4.0.0",
41+
"node": ">=6.0.0",
4242
"npm": ">=3.0.0"
4343
},
4444
"devDependencies": {
45-
"aegir": "^11.0.2",
46-
"chai": "^4.1.0",
45+
"aegir": "^12.1.3",
46+
"chai": "^4.1.2",
4747
"dirty-chai": "^2.0.1",
4848
"lodash": "^4.17.4",
49-
"memdown": "^1.2.4",
50-
"multihashes": "~0.4.5",
49+
"memdown": "^1.4.1",
50+
"multihashes": "~0.4.12",
5151
"ncp": "^2.0.0",
5252
"pre-commit": "^1.2.2",
53-
"rimraf": "^2.6.1"
53+
"rimraf": "^2.6.2"
5454
},
5555
"dependencies": {
5656
"async": "^2.5.0",
57-
"base32.js": "^0.1.0",
58-
"cids": "^0.5.1",
59-
"interface-datastore": "^0.3.0",
60-
"datastore-core": "^0.3.0",
61-
"datastore-fs": "^0.3.0",
62-
"datastore-level": "^0.6.0",
63-
"debug": "^2.6.8",
57+
"base32.js": "~0.1.0",
58+
"cids": "~0.5.2",
59+
"interface-datastore": "~0.4.0",
60+
"datastore-core": "~0.4.0",
61+
"datastore-fs": "~0.4.0",
62+
"datastore-level": "~0.6.0",
63+
"debug": "^3.1.0",
6464
"ipfs-block": "~0.6.0",
6565
"level-js": "timkuijsten/level.js#idbunwrapper",
6666
"leveldown": "^1.7.2",
67-
"lock-me": "^1.0.2",
67+
"lock-me": "^1.0.3",
6868
"lodash.get": "^4.4.2",
6969
"lodash.has": "^4.5.2",
7070
"lodash.set": "^4.3.2",
71-
"safe-buffer": "^5.1.1"
71+
"multiaddr": "^3.0.1"
7272
},
7373
"license": "MIT",
7474
"contributors": [

src/version.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ module.exports = (store) => {
3939
* @returns {void}
4040
*/
4141
set (version, callback) {
42-
store.put(versionKey, new Buffer(String(version)), callback)
42+
store.put(versionKey, Buffer.from(String(version)), callback)
4343
},
4444
/**
4545
* Check the current version, and return an error on missmatch

test/datastore-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ const Key = require('interface-datastore').Key
1313

1414
module.exports = (repo) => {
1515
describe('datastore', () => {
16-
const dataList = _.range(100).map((i) => new Buffer(`hello-${i}-${Math.random()}`))
17-
const data = new Buffer('hello world')
16+
const dataList = _.range(100).map((i) => Buffer.from(`hello-${i}-${Math.random()}`))
17+
const data = Buffer.from('hello world')
1818
const b = new Key('hello')
1919

2020
describe('.put', () => {

test/interop-test.js

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,7 @@ module.exports = (repo) => {
1818

1919
repo.blocks.get(new CID(welcomeHash), (err, val) => {
2020
expect(err).to.not.exist()
21-
expect(
22-
val.data.toString()
23-
).to.match(
24-
/Hello and Welcome to IPFS/
25-
)
21+
expect(val.data.toString()).to.match(/Hello and Welcome to IPFS/)
2622
done()
2723
})
2824
})
@@ -36,23 +32,23 @@ module.exports = (repo) => {
3632
map(cids, repo.blocks.get, (err, values) => {
3733
expect(err).to.not.exist()
3834
expect(values.length).to.equal(2)
39-
expect(values.map(value => value.data.length)).to.deep.equal([2659, 12783])
35+
expect(values.map((value) => value.data.length)).to.eql([2659, 12783])
4036
done()
4137
})
4238
})
4339

4440
it('reads pin set from the datastore', (done) => {
4541
repo.datastore.get(new Key('/local/pins'), (err, val) => {
4642
expect(err).to.not.exist()
47-
expect(mh.toB58String(val)).to.be.equal('QmYAuyf2LzMba65NnhxLtGJxixKNUev9qYSu4MYM88hdwK')
43+
expect(mh.toB58String(val)).to.equal('QmYAuyf2LzMba65NnhxLtGJxixKNUev9qYSu4MYM88hdwK')
4844
done()
4945
})
5046
})
5147

5248
it('reads DHT records from the datastore', (done) => {
5349
repo.datastore.get(new Key('/AHE5I5B7TY'), (err, val) => {
5450
expect(err).to.not.exist()
55-
expect(val.toString('hex')).to.deep.equal('0a0601c9d4743f9e12097465737476616c75651a2212201d22e2a5e140e5cd20d88fc59cd560f4887c7d9acf938ddb24d7207eac40fd2f')
51+
expect(val.toString('hex')).to.eql('0a0601c9d4743f9e12097465737476616c75651a2212201d22e2a5e140e5cd20d88fc59cd560f4887c7d9acf938ddb24d7207eac40fd2f')
5652
done()
5753
})
5854
})

0 commit comments

Comments
 (0)