Merge branch 'master' into default-version

CONTRIBUTING.md

@@ -28,6 +28,9 @@ feature. Known modules include:
 * `electron-packager` (always use this one before filing an issue)
 * `extract-zip`
 
+We use the [`debug`](https://www.npmjs.com/package/debug#usage) module for this functionality. It
+has examples on how to set environment variables if you don't know how.
+
 **If you are using `npm run` to execute `electron-packager`, run the `electron-packager` command
 without using `npm run` and make a note of the output, because `npm run` does not print out error
 messages when a script errors.**

NEWS.md

@@ -6,6 +6,17 @@
 
 * The `package.json` `version` property is the default app version if `--app-version` is unspecified (#449)
 
+## [7.6.0] - 2016-08-14
+
+### Added
+
+* [API] hook for afterCopy (#448)
+* [darwin/mas] Documentation for `protocol` and `protocol-name` options (#121, #450)
+
+### Changed
+
+* [CLI] Minimum Node version is enforced (#454)
+
 ### Fixed
 
 * [CLI] ensure --out has either a string or null value (#442)
@@ -216,6 +227,7 @@
 
 For versions prior to 5.2.0, please see `git log`.
 
+[7.6.0]: https://github.com/electron-userland/electron-packager/compare/v7.5.1...v7.6.0
 [7.5.1]: https://github.com/electron-userland/electron-packager/compare/v7.5.0...v7.5.1
 [7.5.0]: https://github.com/electron-userland/electron-packager/compare/v7.4.0...v7.5.0
 [7.4.0]: https://github.com/electron-userland/electron-packager/compare/v7.3.0...v7.4.0

cli.js

@@ -2,11 +2,19 @@
 
 'use strict'
 
-const common = require('./common')
-const fs = require('fs')
-const packager = require('./')
-const path = require('path')
-const usage = fs.readFileSync(path.join(__dirname, 'usage.txt')).toString()
+var nodeVersionInfo = process.versions.node.split('.').map(function (n) { return Number(n) })
+if (nodeVersionInfo < [4, 0, 0]) {
+  console.error('CANNOT RUN WITH NODE ' + process.versions.node)
+  console.error('Electron Packager requires Node 4.0 or above.')
+  process.exit(1)
+}
+
+// Not consts so that this file can load in Node < 4.0
+var common = require('./common')
+var fs = require('fs')
+var packager = require('./')
+var path = require('path')
+var usage = fs.readFileSync(path.join(__dirname, 'usage.txt')).toString()
 
 var args = common.parseCLIArgs(process.argv.slice(2))
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "electron-packager",
-  "version": "7.5.1",
+  "version": "7.6.0",
   "description": "Package and distribute your Electron app with OS-specific bundles (.app, .exe etc) via JS or CLI",
   "main": "index.js",
   "bin": {

readme.md

@@ -85,10 +85,10 @@ Let's assume that you have made an app based on the [electron-quick-start](https
 
 ```
 foobar
-├─package.json
-├─index.html
-├[…other files, like LICENSE…]
-└─script.js
+├── package.json
+├── index.html
+├── […other files, like LICENSE…]
+└── script.js
 ```
 
 …and that the following is true:
@@ -117,16 +117,16 @@ The file structure now looks like:
 
 ```
 foobar
-├┬Foo Bar-darwin-x64
-│├┬Foo Bar.app
-││└[…Mac app contents…]
-│├─LICENSE
-│└─version
-├[…other application bundles, like "Foo Bar-win32-x64" (sans quotes)…]
-├─package.json
-├─index.html
-├[…other files, like LICENSE…]
-└─script.js
+├── Foo Bar-darwin-x64
+│   ├── Foo Bar.app
+│   │   └── […Mac app contents…]
+│   ├── LICENSE
+│   └── version
+├── […other application bundles, like "Foo Bar-win32-x64" (sans quotes)…]
+├── package.json
+├── index.html
+├── […other files, like LICENSE…]
+└── script.js
 ```
 
 The `Foo Bar.app` folder generated can be executed by a system running OS X, which will start the packaged Electron app. This is also true of the Windows x64 build on a system running a new enough version of Windows for a 64-bit system (via `Foo Bar-win32-x64/Foo Bar.exe`), and so on.