replaces path to .asar.unpacked if cmd includes .asar/node_modules

.appveyor.yml

@@ -0,0 +1,23 @@
+environment:
+  matrix:
+    - nodejs_version: "6"
+    - nodejs_version: "8"
+
+# cache:
+#  - node_modules
+
+platform:
+  - x64
+
+install:
+  - ps: Install-Product node $env:nodejs_version $env:platform
+  - npm install
+
+test_script:
+  - node --version
+  - npm --version
+  - npm test
+
+build: off
+
+version: "{build}"

src/node.js

@@ -19,7 +19,15 @@ const GRACE_PERIOD = 7500 // amount of ms to wait before sigkill
 function findIpfsExecutable () {
   const rootPath = process.env.testpath ? process.env.testpath : __dirname
 
-  const appRoot = path.join(rootPath, '..')
+  let appRoot = path.join(rootPath, '..')
+  // If inside <appname>.asar try to load from .asar.unpacked
+  // this only works if asar was built with
+  // asar --unpack-dir=node_modules/go-ipfs-dep/* (not tested)
+  // or
+  // electron-packager ./ --asar.unpackDir=node_modules/go-ipfs-dep
+  if (appRoot.includes(`.asar${path.sep}`)) {
+    appRoot = appRoot.replace(`.asar${path.sep}`, `.asar.unpacked${path.sep}`)
+  }
   const depPath = path.join('go-ipfs-dep', 'go-ipfs', 'ipfs')
   const npm3Path = path.join(appRoot, '../', depPath)
   const npm2Path = path.join(appRoot, 'node_modules', depPath)

test/index.spec.js

@@ -37,7 +37,7 @@ describe('ipfs executable path', () => {
       Node = require('../src/node.js')
       var node = new Node()
       expect(node.exec)
-        .to.eql('/tmp/ipfsd-ctl-test/node_modules/go-ipfs-dep/go-ipfs/ipfs')
+        .to.eql(path.normalize('/tmp/ipfsd-ctl-test/node_modules/go-ipfs-dep/go-ipfs/ipfs'))
       rimraf('/tmp/ipfsd-ctl-test', done)
     })
   })
@@ -58,7 +58,7 @@ describe('ipfs executable path', () => {
       expect(
         node.exec
       ).to.be.eql(
-        '/tmp/ipfsd-ctl-test/node_modules/ipfsd-ctl/node_modules/go-ipfs-dep/go-ipfs/ipfs'
+        path.normalize('/tmp/ipfsd-ctl-test/node_modules/ipfsd-ctl/node_modules/go-ipfs-dep/go-ipfs/ipfs')
       )
       rimraf('/tmp/ipfsd-ctl-test', done)
     })
@@ -390,10 +390,17 @@ describe('daemons', () => {
         if (err) throw err
 
         const added = res[res.length - 1]
+        expect(res.length).to.equal(2)
+        expect(added).to.have.property('path', 'fixtures')
         expect(added).to.have.property(
           'hash',
           'QmXkiTdnfRJjiQREtF5dWf2X4V9awNHQSn9YGofwVY4qUU'
         )
+        expect(res[0]).to.have.property('path', 'fixtures/test.txt')
+        expect(res[0]).to.have.property(
+          'hash',
+          'Qmf412jQZiuVUtdgnB36FXFX7xg5V6KEbSJ4dpQuhkLyfD'
+        )
         done()
       })
     })