Adopt next aegir

.aegir.js

@@ -1,5 +1,44 @@
 'use strict'
 
+const parallel = require('async/parallel')
+const series = require('async/series')
+const createTempRepo = require('./test/utils/create-repo-nodejs.js')
+const HTTPAPI = require('./src/http-api')
+const leftPad = require('left-pad')
+
+let nodes = []
+
+/*
+ * spawns a daemon with ports numbers starting in 10 and ending in `num`
+ */
+function spawnDaemon (num, callback) {
+  num = leftPad(num, 3, 0)
+
+  const config = {
+    Addresses: {
+      Swarm: [
+        `/ip4/127.0.0.1/tcp/10${num}`,
+        `/ip4/127.0.0.1/tcp/20${num}/ws`
+      ],
+      API: `/ip4/127.0.0.1/tcp/31${num}`,
+      Gateway: `/ip4/127.0.0.1/tcp/32${num}`
+    },
+    Bootstrap: [],
+    Discovery: {
+      MDNS: {
+        Enabled: false
+      },
+      webRTCStar: {
+        Enabled: false
+      }
+    }
+  }
+
+  const daemon = new HTTPAPI(createTempRepo(), config)
+  nodes.push(daemon)
+  daemon.start(true, callback)
+}
+
 module.exports = {
   karma: {
     files: [{
@@ -8,5 +47,21 @@ module.exports = {
       served: true,
       included: false
     }]
+  },
+  hooks: {
+    pre (callback) {
+      nodes = []
+      parallel([
+        (cb) => spawnDaemon(7, cb),
+        (cb) => spawnDaemon(8, cb),
+        (cb) => spawnDaemon(12, cb),
+        (cb) => spawnDaemon(13, cb)
+      ], callback)
+    },
+    post (callback) {
+      series(nodes.map((node) => (cb) => {
+        setTimeout(() => node.stop(cb), 100)
+      }), callback)
+    }
   }
 }

.gitignore

@@ -40,3 +40,4 @@ test/test-data/go-ipfs-repo/LOG.old
 
 # while testing npm5
 package-lock.json
+yarn.lock

.travis.yml

@@ -13,7 +13,6 @@ matrix:
 script:
   - npm run lint
   - npm run test
-  - npm run coverage
   - make test
 
 before_script:

circle.yml

@@ -1,6 +1,9 @@
 machine:
   node:
     version: stable
+test:
+  post:
+    - npm run coverage -- --upload
 
 dependencies:
   pre:

examples/exchange-files-in-browser/public/js/app.js

@@ -150,8 +150,8 @@ function onDrop (event) {
           let progress = 0
 
           let myReadableStreamBuffer = new streamBuffers.ReadableStreamBuffer({
-            // frequency: 10,   // in milliseconds.
-            chunkSize: 32048  // in bytes.
+            // frequency: 10, // in milliseconds.
+            chunkSize: 32048 // in bytes.
           })
 
           node.files.createAddStream((err, stream) => {
@@ -200,8 +200,8 @@ function onDrop (event) {
         if (files && files.length) {
           $multihashInput.value = files[0].hash
           $filesStatus.innerHTML = files
-          .map((e) => `Added ${e.path} as ${e.hash}`)
-          .join('<br>')
+            .map((e) => `Added ${e.path} as ${e.hash}`)
+            .join('<br>')
         }
       })
       .catch(onError)

examples/traverse-ipld-graphs/get-path-accross-formats.js

@@ -16,7 +16,7 @@ createNode((err, ipfs) => {
 
   series([
     (cb) => {
-      const someData = new Buffer('capoeira')
+      const someData = Buffer.from('capoeira')
 
       dagPB.DAGNode.create(someData, (err, node) => {
         if (err) {

examples/traverse-ipld-graphs/tree.js

@@ -16,7 +16,7 @@ createNode((err, ipfs) => {
 
   series([
     (cb) => {
-      const someData = new Buffer('capoeira')
+      const someData = Buffer.from('capoeira')
 
       dagPB.DAGNode.create(someData, (err, node) => {
         if (err) {

package.json

@@ -19,29 +19,28 @@
     "npm": ">=3.0.0"
   },
   "scripts": {
-    "lint": "aegir-lint",
-    "coverage": "gulp coverage",
-    "test": "gulp test --dom",
-    "test:node": "npm run test:unit:node",
-    "test:browser": "npm run test:unit:browser",
-    "test:unit:node": "gulp test:node",
-    "test:unit:node:core": "TEST=core npm run test:unit:node",
-    "test:unit:node:http": "TEST=http npm run test:unit:node",
-    "test:unit:node:cli": "TEST=cli npm run test:unit:node",
-    "test:unit:browser": "gulp test:browser",
+    "lint": "aegir lint",
+    "coverage": "aegir coverage --timeout 50000",
+    "build": "aegir build",
+    "release": "aegir release --no-parallel",
+    "release-minor": "aegir release --type minor --no-parallel",
+    "release-major": "aegir release --type major --no-parallel",
+    "test": "aegir test --no-parallel --timeout 50000",
+    "test:node": "aegir test --target node --no-parallel --timeout 50000",
+    "test:browser": "aegir test --target browser --no-parallel",
+    "test:unit:node": "npm run test:node --no-parallel",
+    "test:unit:node:core": "aegir test --target node --files test/core/** --no-parallel",
+    "test:unit:node:http": "aegir test --target node --files test/http/** --no-parallel",
+    "test:unit:node:cli": "aegir test --target node --files test/cli/** --no-parallel",
+    "test:unit:browser": "npm run test:browser --no-parallel",
     "test:interop": "npm run test:interop:node",
     "test:interop:node": "mocha -t 60000 test/interop/node.js",
     "test:interop:browser": "mocha -t 60000 test/interop/browser.js",
     "test:benchmark": "echo \"Error: no benchmarks yet\" && exit 1",
     "test:benchmark:node": "echo \"Error: no benchmarks yet\" && exit 1",
     "test:benchmark:node:core": "echo \"Error: no benchmarks yet\" && exit 1",
     "test:benchmark:node:http": "echo \"Error: no benchmarks yet\" && exit 1",
-    "test:benchmark:browser": "echo \"Error: no benchmarks yet\" && exit 1",
-    "build": "gulp build",
-    "release": "gulp release",
-    "release-minor": "gulp release --type minor",
-    "release-major": "gulp release --type major",
-    "coverage-publish": "aegir-coverage publish"
+    "test:benchmark:browser": "echo \"Error: no benchmarks yet\" && exit 1"
   },
   "pre-commit": [
     "lint",
@@ -61,7 +60,7 @@
   },
   "homepage": "https://github.com/ipfs/js-ipfs#readme",
   "devDependencies": {
-    "aegir": "^11.0.2",
+    "aegir": "^12.0.6",
     "buffer-loader": "0.0.1",
     "chai": "^4.1.2",
     "delay": "^2.0.0",

src/cli/commands/bitswap/stat.js

@@ -18,7 +18,7 @@ module.exports = {
 
       stats.Wantlist = stats.Wantlist || []
       stats.Wantlist = stats.Wantlist.map((entry) => {
-        const buf = new Buffer(entry.cid.hash.data)
+        const buf = Buffer.from(entry.cid.hash.data)
         const cid = new CID(entry.cid.version, entry.cid.codec, buf)
         return cid.toBaseEncodedString()
       })

src/cli/commands/config/edit.js

@@ -81,7 +81,7 @@ module.exports = {
 
     function saveConfig (config, next) {
       config = utils.isDaemonOn()
-        ? new Buffer(JSON.stringify(config)) : config
+        ? Buffer.from(JSON.stringify(config)) : config
 
       argv.ipfs.config.replace(config, (err) => {
         if (err) {

src/cli/commands/pubsub/pub.js

@@ -8,7 +8,7 @@ module.exports = {
   builder: {},
 
   handler (argv) {
-    const data = new Buffer(String(argv.data))
+    const data = Buffer.from(String(argv.data))
 
     argv.ipfs.pubsub.publish(argv.topic, data, (err) => {
       if (err) {

src/core/boot.js

@@ -43,7 +43,7 @@ module.exports = (self) => {
         if (err.message.match(/not found/) || // indexeddb
             err.message.match(/ENOENT/) || // fs
             err.message.match(/No value/) // memory
-           ) {
+        ) {
           return cb(null, false)
         }
         return cb(err)

src/core/components/id.js

@@ -14,10 +14,10 @@ module.exports = function id (self) {
       id: self._peerInfo.id.toB58String(),
       publicKey: self._peerInfo.id.pubKey.bytes.toString('base64'),
       addresses: self._peerInfo.multiaddrs
-                               .toArray()
-                               .map((ma) => ma.toString())
-                               .filter((ma) => ma.indexOf('ipfs') >= 0)
-                               .sort(),
+        .toArray()
+        .map((ma) => ma.toString())
+        .filter((ma) => ma.indexOf('ipfs') >= 0)
+        .sort(),
       agentVersion: 'js-ipfs',
       protocolVersion: '9000'
     }))

src/core/components/object.js

@@ -16,7 +16,7 @@ function normalizeMultihash (multihash, enc) {
       return multihash
     }
 
-    return new Buffer(multihash, enc)
+    return Buffer.from(multihash, enc)
   } else if (Buffer.isBuffer(multihash)) {
     return multihash
   } else {
@@ -49,7 +49,7 @@ function parseJSONBuffer (buf, callback) {
         mh.fromB58String(link.Hash || link.hash || link.multihash)
       )
     })
-    data = new Buffer(parsed.Data)
+    data = Buffer.from(parsed.Data)
   } catch (err) {
     return callback(new Error('failed to parse JSON: ' + err))
   }
@@ -104,7 +104,7 @@ module.exports = function object (self) {
         assert(template === 'unixfs-dir', 'unkown template')
         data = (new Unixfs('directory')).marshal()
       } else {
-        data = new Buffer(0)
+        data = Buffer.alloc(0)
       }
 
       DAGNode.create(data, (err, node) => {

src/core/components/pubsub.js

@@ -73,8 +73,8 @@ module.exports = function pubsub (self) {
       }
 
       const peers = Array.from(self._pubsub.peers.values())
-          .filter((peer) => peer.topics.has(topic))
-          .map((peer) => peer.info.id.toB58String())
+        .filter((peer) => peer.topics.has(topic))
+        .map((peer) => peer.info.id.toB58String())
 
       setImmediate(() => callback(null, peers))
     }),

src/http-api/resources/object.js

@@ -149,7 +149,7 @@ exports.put = {
               })
             }
 
-            file = new Buffer(JSON.stringify(answer))
+            file = Buffer.from(JSON.stringify(answer))
             finished = true
           })
         } else {
@@ -190,7 +190,7 @@ exports.put = {
 
     series([
       (cb) => {
-        DAGNode.create(new Buffer(node.Data), node.Links, (err, _node) => {
+        DAGNode.create(Buffer.from(node.Data), node.Links, (err, _node) => {
           if (err) {
             return cb(err)
           }

src/http-api/resources/pubsub.js

@@ -68,7 +68,7 @@ exports.publish = {
       return reply(new Error('Missing buf'))
     }
 
-    ipfs.pubsub.publish(topic, new Buffer(String(buf)), (err) => {
+    ipfs.pubsub.publish(topic, Buffer.from(String(buf)), (err) => {
       if (err) {
         return reply(new Error(`Failed to publish to topic ${topic}: ${err}`))
       }

test/cli/block.js

@@ -33,7 +33,7 @@ describe('block', () => runOnAndOff((thing) => {
       expect(out).to.eql('QmTwbQs4sGcCiPxV97SpbHS7QgmVg9SiKxcG1AcF1Ly2SL\n')
       return ipfs('block get QmTwbQs4sGcCiPxV97SpbHS7QgmVg9SiKxcG1AcF1Ly2SL')
     })
-    .then((out) => expect(out).to.eql('there is no newline at end of this file'))
+      .then((out) => expect(out).to.eql('there is no newline at end of this file'))
   })
 
   it('stat', () => {

test/cli/dag.js

@@ -18,7 +18,7 @@ describe('dag', () => runOnAndOff.off((thing) => {
       // lookup path on eth-block
       return ipfs('dag get z43AaGF23fmvRnDP56Ub9WcJCfzSfqtmzNCCvmz5eudT8dtdCDS/parentHash')
     }).then((out) => {
-      let expectHash = new Buffer('c8c0a17305adea9bbb4b98a52d44f0c1478f5c48fc4b64739ee805242501b256', 'hex')
+      let expectHash = Buffer.from('c8c0a17305adea9bbb4b98a52d44f0c1478f5c48fc4b64739ee805242501b256', 'hex')
       expect(out).to.be.eql('0x' + expectHash.toString('hex') + '\n')
     })
   })

test/cli/files.js

@@ -11,7 +11,7 @@ const runOnAndOff = require('../utils/on-and-off')
 describe('files', () => runOnAndOff((thing) => {
   let ipfs
   const readme = fs.readFileSync(path.join(process.cwd(), '/src/init-files/init-docs/readme'))
-                   .toString('utf-8')
+    .toString('utf-8')
   const recursiveGetDirResults = [
     'added QmR56UJmAaZLXLdTT1ALrE9vVqV8soUEekm9BMd4FnuYqV recursive-get-dir/version',
     'added QmYE7xo6NxbHEVEHej1yzxijYaNY51BaeKxjXxn6Ssa6Bs recursive-get-dir/init-docs/tour/0.0-intro',