Merge pull request #287 from ipfs/update-aegir

update aegir

Author: daviddias

.aegir.js

@@ -2,14 +2,9 @@
 
 module.exports = {
   webpack: {
-    module: {
-      postLoaders: [{
-        test: /\.js$/,
-        loader: 'transform?brfs',
-        exclude: [
-          /js-ipfs-api\/test/
-        ]
-      }]
+    externals: {
+      fs: '{}',
+      mkdirp: '{}'
     }
   }
 }

package.json

@@ -27,15 +27,15 @@
     "url": "https://github.com/ipfs/js-ipfs-api"
   },
   "devDependencies": {
-    "aegir": "^3.0.4",
+    "aegir": "^3.2.0",
     "chai": "^3.5.0",
     "gulp": "^3.9.1",
     "interface-ipfs-core": "^0.1.4",
     "ipfsd-ctl": "^0.14.0",
     "pre-commit": "^1.1.2",
-    "raw-loader": "^0.5.1",
     "stream-equal": "^0.1.8",
-    "stream-http": "^2.2.0"
+    "stream-http": "^2.2.0",
+    "streamifier": "^0.1.1"
   },
   "scripts": {
     "test": "gulp test",
@@ -90,4 +90,4 @@
     "url": "https://github.com/ipfs/js-ipfs-api/issues"
   },
   "homepage": "https://github.com/ipfs/js-ipfs-api"
-}
+}

test/api/add.spec.js

@@ -8,19 +8,8 @@ const path = require('path')
 const isNode = require('detect-node')
 const fs = require('fs')
 
-let testfile
-let testfileBig
-const testfilePath = path.join(__dirname, '/../testfile.txt')
-
-if (isNode) {
-  testfile = fs.readFileSync(testfilePath)
-  testfileBig = fs.createReadStream(path.join(__dirname, '/../15mb.random'), { bufferSize: 128 })
-  // testfileBig = fs.createReadStream(path.join(__dirname, '/../100mb.random'), { bufferSize: 128 })
-} else {
-  testfile = require('raw!../testfile.txt')
-  // browser goes nuts with a 100mb in memory
-  // testfileBig = require('raw!../100mb.random')
-}
+const testfileBig = fs.readFileSync(path.join(__dirname, '/../15mb.random'))
+const testfile = fs.readFileSync(path.join(__dirname, '/../testfile.txt'))
 
 describe('.add', () => {
   it('add file', (done) => {
@@ -73,7 +62,7 @@ describe('.add', () => {
       return done()
     }
 
-    apiClients.a.add(testfilePath, (err, res) => {
+    apiClients.a.add(path.join(__dirname, '/../testfile.txt'), (err, res) => {
       expect(err).to.not.exist
 
       const added = res[0] != null ? res[0] : res
@@ -122,8 +111,9 @@ describe('.add', () => {
   })
 
   it('add a nested dir as array', (done) => {
-    if (!isNode) return done()
-    const fs = require('fs')
+    if (!isNode) {
+      return done()
+    }
     const base = path.join(__dirname, '../test-folder')
     const content = (name) => ({
       path: `test-folder/${name}`,

test/api/cat.spec.js

@@ -5,19 +5,16 @@
 const expect = require('chai').expect
 const isNode = require('detect-node')
 const fs = require('fs')
+const streamifier = require('streamifier')
 
 const path = require('path')
 const streamEqual = require('stream-equal')
 
 let testfile
 let testfileBig
 
-if (isNode) {
-  testfile = fs.readFileSync(path.join(__dirname, '/../testfile.txt'))
-  testfileBig = fs.createReadStream(path.join(__dirname, '/../15mb.random'), { bufferSize: 128 })
-} else {
-  testfile = require('raw!../testfile.txt')
-}
+testfile = fs.readFileSync(path.join(__dirname, '/../testfile.txt'))
+testfileBig = fs.readFileSync(path.join(__dirname, '/../15mb.random'))
 
 describe('.cat', () => {
   it('cat', (done) => {
@@ -49,7 +46,8 @@ describe('.cat', () => {
       expect(err).to.not.exist
 
       // Do not blow out the memory of nodejs :)
-      streamEqual(res, testfileBig, (err, equal) => {
+      const bigStream = streamifier.createReadStream(testfileBig)
+      streamEqual(res, bigStream, (err, equal) => {
         expect(err).to.not.exist
         expect(equal).to.be.true
         done()

test/api/files.spec.js

@@ -8,11 +8,7 @@ const path = require('path')
 
 let testfile
 
-if (isNode) {
-  testfile = require('fs').readFileSync(path.join(__dirname, '/../testfile.txt'))
-} else {
-  testfile = require('raw!../testfile.txt')
-}
+testfile = require('fs').readFileSync(path.join(__dirname, '/../testfile.txt'))
 
 describe('.files', () => {
   it('files.mkdir', (done) => {