Update get-package-info

index.js

@@ -23,50 +23,77 @@ function getMetadata (opts, dir, cb) {
   var props = []
   if (!opts.name) props.push(['productName', 'name'])
   if (!opts['app-version']) props.push('version')
-  if (!opts.version) props.push(['dependencies.electron', 'devDependencies.electron'])
+  if (!opts.version) {
+    props.push([
+      'dependencies.electron',
+      'devDependencies.electron',
+      'dependencies.electron-prebuilt',
+      'devDependencies.electron-prebuilt'
+    ])
+  }
 
   // Name and version provided, no need to infer
   if (props.length === 0) return cb(null)
 
   // Search package.json files to infer name and version from
-  getPackageInfo(props, dir, function (err, result) {
-    if (err) {
-      // `get-package-info` exploded looking for `electron`. Try `electron-prebuilt` instead
-      props.pop()
-      props.push(['dependencies.electron-prebuilt', 'devDependencies.electron-prebuilt'])
-      getPackageInfo(props, dir, function (err, result) {
-        if (err) return cb(err)
-        return inferNameAndVersionFromInstalled('electron-prebuilt', opts, result, cb)
+  getPackageInfo(props, dir, (err, result) => {
+    if (err && err.missingProps) {
+      var requiredProps = ['productName', 'dependencies.electron']
+      var missingProps = err.missingProps.map(prop => {
+        return Array.isArray(prop) ? prop[0] : prop
       })
-    } else {
-      return inferNameAndVersionFromInstalled('electron', opts, result, cb)
+
+      // Callback w/ error if there are required props that are missing
+      if (missingProps.filter(prop => requiredProps.find(reqProp => prop === reqProp)).length !== 0) {
+        var messages = missingProps.map(function (missingProp) {
+          missingProp = Array.isArray(missingProp) ? missingProp[0] : missingProp
+          if (missingProp === 'productName') {
+            return 'Unable to determine application name. Please specify an application name\n\n' +
+              'For more information, please see\n' +
+              'https://github.com/electron-userland/electron-packager/blob/master/docs/api.md#name\n'
+          }
+
+          if (missingProp === 'dependencies.electron') {
+            return 'Unable to determine Electron version. Please specify an Electron version\n\n' +
+              'For more information, please see\n' +
+              'https://github.com/electron-userland/electron-packager/blob/master/docs/api.md#version\n'
+          }
+        })
+
+        err.message = messages.join('\n') + '\n' + err.message
+        return cb(err)
+      } else {
+        // Missing props not required, can continue w/ partial result
+        result = err.result
+      }
+    } else if (err) {
+      return cb(err)
     }
-  })
-}
 
-function inferNameAndVersionFromInstalled (packageName, opts, result, cb) {
-  if (result.values.productName) {
-    debug('Inferring application name from productName or name in package.json')
-    opts.name = result.values.productName
-  }
+    if (result.values.productName) {
+      debug('Inferring application name from productName or name in package.json')
+      opts.name = result.values.productName
+    }
 
-  if (result.values.version) {
-    debug('Inferring app-version from version in package.json')
-    opts['app-version'] = result.values.version
-  }
+    if (result.values.version) {
+      debug('Inferring app-version from version in package.json')
+      opts['app-version'] = result.values.version
+    }
 
-  if (result.values[`dependencies.${packageName}`]) {
-    resolve(packageName, {
-      basedir: path.dirname(result.source[`dependencies.${packageName}`].src)
-    }, function (err, res, pkg) {
-      if (err) return cb(err)
-      debug(`Inferring target Electron version from ${packageName} dependency or devDependency in package.json`)
-      opts.version = pkg.version
+    if (result.values[`dependencies.electron`]) {
+      var packageName = result.source[`dependencies.electron`].prop.split('.')[1]
+      resolve(packageName, {
+        basedir: path.dirname(result.source[`dependencies.electron`].src)
+      }, function (err, res, pkg) {
+        if (err) return cb(err)
+        debug(`Inferring target Electron version from ${packageName} dependency or devDependency in package.json`)
+        opts.version = pkg.version
+        return cb(null)
+      })
+    } else {
       return cb(null)
-    })
-  } else {
-    return cb(null)
-  }
+    }
+  })
 }
 
 function createSeries (opts, archs, platforms) {
@@ -198,15 +225,7 @@ module.exports = function packager (opts, cb) {
   debug(`Target Architectures: ${archs.join(', ')}`)
 
   getMetadata(opts, path.resolve(process.cwd(), opts.dir) || process.cwd(), function (err) {
-    if (err) {
-      err.message = 'Unable to determine application name or Electron version. ' +
-        'Please specify an application name and Electron version.\n\n' +
-        'For more infomation, please see \n' +
-        'https://github.com/electron-userland/electron-packager/blob/master/docs/api.md#name or \n' +
-        'https://github.com/electron-userland/electron-packager/blob/master/docs/api.md#version\n\n' +
-        err.message
-      return cb(err)
-    }
+    if (err) return cb(err)
 
     debug(`Application name: ${opts.name}`)
     debug(`Target Electron version: ${opts.version}`)

package.json

@@ -23,7 +23,7 @@
     "electron-osx-sign": "^0.3.0",
     "extract-zip": "^1.0.3",
     "fs-extra": "^0.30.0",
-    "get-package-info": "^0.1.0",
+    "get-package-info": "^1.0.0",
     "minimist": "^1.1.1",
     "plist": "^2.0.0",
     "rcedit": "^0.7.0",