ready for the next level

Author: dignifiedquire

.travis.yml

@@ -1,9 +1,16 @@
 sudo: false
 language: node_js
-node_js:
-  - 4
-  - 6
-  - stable
+
+matrix:
+  include:
+  - node_js: 4
+    env: CXX=g++-4.8
+  - node_js: 6
+    env:
+      - SAUCE=true
+      - CXX=g++-4.8
+  - node_js: stable
+    env: CXX=g++-4.8
 
 # Make sure we have new NPM.
 before_install:
@@ -14,12 +21,17 @@ script:
   - npm test
   - npm run coverage
 
-addons:
-  firefox: 'latest'
-
 before_script:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
 
 after_success:
   - npm run coverage-publish
+
+addons:
+  firefox: 'latest'
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - g++-4.8

README.md

@@ -3,6 +3,9 @@
   "version": "0.12.0",
   "description": "JavaScript implementation of the unixfs Engine used by IPFS",
   "main": "src/index.js",
+  "browser": {
+    "fs": false
+  },
   "scripts": {
     "lint": "aegir-lint",
     "build": "aegir-build",
@@ -36,7 +39,7 @@
   },
   "homepage": "https://github.com/ipfs/js-ipfs-unixfs-engine#readme",
   "devDependencies": {
-    "aegir": "^8.1.2",
+    "aegir": "^9.0.1",
     "buffer-loader": "0.0.1",
     "chai": "^3.5.0",
     "fs-pull-blob-store": "^0.4.1",
@@ -46,23 +49,22 @@
     "ncp": "^2.0.0",
     "pre-commit": "^1.1.3",
     "pull-zip": "^2.0.1",
-    "raw-loader": "^0.5.1",
     "rimraf": "^2.5.4"
   },
   "dependencies": {
-    "async": "^2.0.1",
+    "async": "^2.1.2",
     "cids": "^0.2.0",
     "ipfs-unixfs": "^0.1.4",
     "ipld-dag-pb": "^0.1.3",
-    "ipld-resolver": "^0.1.1",
+    "ipld-resolver": "^0.1.2",
     "is-ipfs": "^0.2.1",
     "multihashes": "^0.2.2",
     "pull-block": "^1.0.2",
     "pull-paramap": "^1.2.0",
     "pull-pushable": "^2.0.1",
     "pull-stream": "^3.4.5",
     "pull-traverse": "^1.0.3",
-    "pull-write": "^1.1.1",
+    "pull-write": "^1.1.1"
   },
   "contributors": [
     "David Dias <[email protected]>",
@@ -74,4 +76,4 @@
     "jbenet <[email protected]>",
     "nginnever <[email protected]>"
   ]
-}
+}

package.json

@@ -2,11 +2,8 @@
 
 const traverse = require('pull-traverse')
 const pull = require('pull-stream')
-<<<<<<< HEAD:src/exporter/index.js
 const CID = require('cids')
-=======
 const isIPFS = require('is-ipfs')
->>>>>>> fix some more tests:src/exporter.js
 
 const util = require('./../util')
 const switchType = util.switchType

src/exporter/index.js

@@ -5,22 +5,21 @@ const expect = require('chai').expect
 const BlockService = require('ipfs-block-service')
 const IPLDResolver = require('ipld-resolver')
 const UnixFS = require('ipfs-unixfs')
-const fs = require('fs')
-const path = require('path')
 const bs58 = require('bs58')
 const pull = require('pull-stream')
 const zip = require('pull-zip')
 const CID = require('cids')
+const loadFixture = require('aegir/fixtures')
 
 const unixFSEngine = require('./../src')
 const exporter = unixFSEngine.exporter
 
+const bigFile = loadFixture(__dirname, 'fixtures/1.2MiB.txt')
+
 module.exports = (repo) => {
   describe('exporter', () => {
     let ipldResolver
 
-    const bigFile = fs.readFileSync(path.join(__dirname, '/test-data/1.2MiB.txt'))
-
     before(() => {
       const bs = new BlockService(repo)
       ipldResolver = new IPLDResolver(bs)

src/importer.js

@@ -2,14 +2,11 @@
 'use strict'
 
 const chunker = require('./../src/chunker/fixed-size')
-const fs = require('fs')
 const expect = require('chai').expect
-const path = require('path')
 const pull = require('pull-stream')
+const loadFixture = require('aegir/fixtures')
 
-const rawFile = fs.readFileSync(
-  path.join(__dirname, '/test-data/1MiB.txt')
-)
+const rawFile = loadFixture(__dirname, 'fixtures/1MiB.txt')
 
 describe('chunker: fixed size', () => {
   it('chunks non flat buffers', (done) => {

test/test-data/1.2MiB.txt renamed to test/fixtures/1.2MiB.txt

@@ -4,11 +4,10 @@
 const importer = require('./../src').importer
 const expect = require('chai').expect
 const BlockService = require('ipfs-block-service')
-const fs = require('fs')
-const path = require('path')
 const pull = require('pull-stream')
 const mh = require('multihashes')
 const IPLDResolver = require('ipld-resolver')
+const loadFixture = require('aegir/fixtures')
 
 function stringifyMh (files) {
   return files.map((file) => {
@@ -17,17 +16,13 @@ function stringifyMh (files) {
   })
 }
 
+const bigFile = loadFixture(__dirname, 'fixtures/1.2MiB.txt')
+const smallFile = loadFixture(__dirname, 'fixtures/200Bytes.txt')
+
 module.exports = function (repo) {
   describe('importer', function () {
     let ipldResolver
 
-    const bigFile = fs.readFileSync(path.join(__dirname, '/test-data/1.2MiB.txt'))
-    const smallFile = fs.readFileSync(path.join(__dirname, '/test-data/200Bytes.txt'))
-
-    // const dirSmall = path.join(__dirname, '/test-data/dir-small')
-    // const dirBig = path.join(__dirname, '/test-data/dir-big')
-    // const dirNested = path.join(__dirname, '/test-data/dir-nested')
-
     before(() => {
       const bs = new BlockService(repo)
       ipldResolver = new IPLDResolver(bs)