Skip to content

Commit

Permalink
Compatibility with running inside electron
Browse files Browse the repository at this point in the history
  • Loading branch information
mehdi committed Mar 30, 2017
1 parent b0d6015 commit 6d1f0f5
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 12 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@
.DS_Store
.node-version
npm-debug.log
.idea
2 changes: 1 addition & 1 deletion lib/asar.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict'
const fs = require('fs')
const fs = process.versions.electron ? require('original-fs') : require('fs')
const path = require('path')
const minimatch = require('minimatch')
const mkdirp = require('mkdirp')
Expand Down
2 changes: 1 addition & 1 deletion lib/crawlfs.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict'
const fs = require('fs')
const fs = process.versions.electron ? require('original-fs') : require('fs')
const glob = require('glob')

module.exports = function (dir, options, callback) {
Expand Down
2 changes: 1 addition & 1 deletion lib/disk.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict'
const fs = require('fs')
const fs = process.versions.electron ? require('original-fs') : require('fs')
const path = require('path')
const mkdirp = require('mkdirp')
const pickle = require('chromium-pickle-js')
Expand Down
2 changes: 1 addition & 1 deletion lib/filesystem.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict'
const fs = require('fs')
const fs = process.versions.electron ? require('original-fs') : require('fs')
const path = require('path')
const tmp = require('tmp')
const UINT64 = require('cuint').UINT64
Expand Down
2 changes: 1 addition & 1 deletion lib/snapshot.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict'
const fs = require('fs')
const fs = process.versions.electron ? require('original-fs') : require('fs')
const path = require('path')
const mksnapshot = require('mksnapshot')
const vm = require('vm')
Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"url": "https://github.com/electron/asar/issues"
},
"scripts": {
"test": "mocha --reporter spec && npm run lint",
"test": "electron-mocha --reporter spec && mocha --reporter spec && npm run lint",
"lint": "standard"
},
"standard": {
Expand All @@ -38,6 +38,8 @@
"tmp": "0.0.28"
},
"devDependencies": {
"electron": "^1.6.2",
"electron-mocha": "^3.4.0",
"lodash": "^4.2.1",
"mocha": "^2.0.1",
"rimraf": "^2.5.1",
Expand Down
4 changes: 2 additions & 2 deletions test/api-spec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict'
const assert = require('assert')
const fs = require('fs')
const fs = process.versions.electron ? require('original-fs') : require('fs')
const os = require('os')
const path = require('path')
const rimraf = require('rimraf')
Expand All @@ -12,7 +12,7 @@ const transform = require('./util/transformStream')

describe('api', function () {
beforeEach(function () {
rimraf.sync(path.join(__dirname, '..', 'tmp'))
rimraf.sync(path.join(__dirname, '..', 'tmp'), fs)
})
it('should create archive from directory', function (done) {
asar.createPackage('test/input/packthis/', 'tmp/packthis-api.asar', function (error) {
Expand Down
4 changes: 2 additions & 2 deletions test/cli-spec.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict'
const assert = require('assert')
const exec = require('child_process').exec
const fs = require('fs')
const fs = process.versions.electron ? require('original-fs') : require('fs')
const os = require('os')
const path = require('path')
const rimraf = require('rimraf')
Expand All @@ -11,7 +11,7 @@ const compFiles = require('./util/compareFiles')

describe('command line interface', function () {
beforeEach(function () {
rimraf.sync(path.join(__dirname, '..', 'tmp'))
rimraf.sync(path.join(__dirname, '..', 'tmp'), fs)
})
it('should create archive from directory', function (done) {
exec('node bin/asar p test/input/packthis/ tmp/packthis-cli.asar', function (error, stdout, stderr) {
Expand Down
2 changes: 1 addition & 1 deletion test/util/compareDirectories.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict'
const fs = require('fs')
const fs = process.versions.electron ? require('original-fs') : require('fs')
const path = require('path')

const _ = require('lodash')
Expand Down
2 changes: 1 addition & 1 deletion test/util/compareFiles.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict'
const assert = require('assert')
const fs = require('fs')
const fs = process.versions.electron ? require('original-fs') : require('fs')

module.exports = function (filepathA, filepathB) {
const actual = fs.readFileSync(filepathA, 'utf8')
Expand Down

0 comments on commit 6d1f0f5

Please sign in to comment.