diff --git a/.gitignore b/.gitignore index cfa397a..7e95763 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ downloaded/*.zip node_modules -.DS_Store \ No newline at end of file +.DS_Store +test/dist \ No newline at end of file diff --git a/downloaded/readme.md b/downloaded/readme.md deleted file mode 100644 index 889a363..0000000 --- a/downloaded/readme.md +++ /dev/null @@ -1 +0,0 @@ -downloaded atom shell zips get cached here \ No newline at end of file diff --git a/linux.js b/linux.js index ef808e0..29c6f24 100644 --- a/linux.js +++ b/linux.js @@ -7,7 +7,7 @@ var common = require('./common') module.exports = { createApp: function createApp (opts, templateApp, cb) { - var finalDir = opts.out || path.join(process.cwd(), opts.name + '-linux') + var finalDir = path.join(opts.out || process.cwd(), opts.name + '-linux') var userAppDir = path.join(finalDir, 'resources', 'default_app') var originalBinary = path.join(finalDir, 'electron') var finalBinary = path.join(finalDir, opts.name) diff --git a/mac.js b/mac.js index 1d6f3e9..e541750 100644 --- a/mac.js +++ b/mac.js @@ -108,7 +108,7 @@ function buildMacApp (opts, cb, newApp) { } else { deploy() } - + function deploy (err) { if (err) return cb(err) mv(newApp, finalPath, function moved (err) { diff --git a/package.json b/package.json index 1ed291d..ebeec1e 100644 --- a/package.json +++ b/package.json @@ -29,9 +29,13 @@ "rimraf": "^2.3.2" }, "devDependencies": { - "standard": "^3.3.2" + "standard": "^3.3.2", + "tape": "^4.0.0" }, "scripts": { - "test": "standard" + "test": "standard && node test/test.js" + }, + "standard": { + "ignore": ["test/dist"] } } diff --git a/readme.md b/readme.md index c67515f..55a19b5 100644 --- a/readme.md +++ b/readme.md @@ -88,7 +88,7 @@ Allowed values: *linux, win32, darwin* Allowed values: *ia32, x64* `version` - *String* -Semver, see https://github.com/atom/electron/releases +Electron version (without the 'v'). See https://github.com/atom/electron/releases **Optional** `out` - *String* diff --git a/test/test.js b/test/test.js new file mode 100644 index 0000000..8ad1575 --- /dev/null +++ b/test/test.js @@ -0,0 +1,45 @@ +var test = require('tape') +var mkdirp = require('mkdirp') +var rimraf = require('rimraf') +var packager = require('../index.js') + +var distdir = __dirname + '/dist' +rimraf.sync(distdir) +mkdirp.sync(distdir) + +var opts = { + dir: __dirname + '/testapp', + name: 'Test', + version: '0.28.2', + out: distdir +} + +test('package for windows', function (t) { + opts.platform = 'win32' + opts.arch = 'ia32' + + packager(opts, function done (err, appPath) { + t.notOk(err, 'no err') + t.end() + }) +}) + +test('package for linux', function (t) { + opts.platform = 'linux' + opts.arch = 'x64' + + packager(opts, function done (err, appPath) { + t.notOk(err, 'no err') + t.end() + }) +}) + +test('package for darwin', function (t) { + opts.platform = 'darwin' + opts.arch = 'x64' + + packager(opts, function done (err, appPath) { + t.notOk(err, 'no err') + t.end() + }) +}) diff --git a/test/testapp/app.js b/test/testapp/app.js new file mode 100644 index 0000000..f1f8787 --- /dev/null +++ b/test/testapp/app.js @@ -0,0 +1,6 @@ +var app = require('app') + +app.on('ready', function () { + console.log('pizza') + app.exit() +})