Introduced host configuration with object.

- added a standarize_config function. function is called by validate_config and mutates the object holding the parsed package.json, so that hosts are defined as objects with endpoint key, rather than strings.
- modified versioning.evaluate to work with object format of hosts.

Author: ronilan

lib/util/versioning.js

@@ -186,7 +186,51 @@ function get_runtime_abi(runtime, target_version) {
 }
 module.exports.get_runtime_abi = get_runtime_abi;
 
+function standarize_config(package_json) {
+  // backwards compatibility via mutation of user supplied configuration
+  if (package_json.binary) {
+    // the option of setting  production_host was introduced in
+    // https://github.com/mapbox/node-pre-gyp/pull/533
+    // spec said that host should be falsey and production_host not empty.
+    // legacy config will thus have production_host (and staging_host) defined
+    // and will not have host defined.
+    // to support legacy configuration with new spec:
+
+    // ** transfer the value of production_host to host
+    if (package_json.binary.production_host && !package_json.binary.host) {
+      package_json.binary.host = package_json.binary.production_host;
+    }
+
+    if (package_json.binary.host) {
+      // hosts used to be specified as string (and user may still do so)
+      // to support legacy configuration with new spec:
+
+      // map string format of host to object key
+      ['host', 'staging_host', 'development_host'].filter((item) => package_json.binary[item]).forEach((item) => {
+        if (typeof package_json.binary[item] === 'string') {
+          package_json.binary[item] = { endpoint: package_json.binary[item] };
+        }
+      });
+
+      // the option to explicitly set buckt host properties was introduced in
+      // https://github.com/mapbox/node-pre-gyp/pull/576
+      // spec defined options as keys of binary relating to the string value of host.
+      // legacy config will thus have bucket, region, s3ForcePathStyle defined under binary.
+      // to support legacy configuration with new spec:
+
+      // map keys defined on binary to keys defined on host
+      ['bucket', 'region', 's3ForcePathStyle'].filter((item) => package_json.binary[item]).forEach((item) => {
+        if (typeof package_json.binary[item] !== 'object') {
+          package_json.binary.host[item] = package_json.binary[item];
+        }
+      });
+    }
+  }
+}
+
 function validate_config(package_json, opts) {
+  standarize_config(package_json); // the way hosts are defined changed overtime. make it standard.
+
   const msg = package_json.name + ' package.json is not node-pre-gyp ready:\n';
   const missing = [];
   if (!package_json.main) {
@@ -209,9 +253,16 @@ function validate_config(package_json, opts) {
     if (!package_json.binary.module_path) {
       missing.push('binary.module_path');
     }
-    if (!package_json.binary.host && !package_json.binary.production_host) {
+
+    if (!package_json.binary.host) {
       missing.push('binary.host');
     }
+
+    if (package_json.binary.host) {
+      if (!package_json.binary.host.endpoint) {
+        missing.push('binary.host.endpoint');
+      }
+    }
   }
 
   if (missing.length >= 1) {
@@ -220,8 +271,8 @@ function validate_config(package_json, opts) {
 
   if (package_json.binary) {
     // for all possible host definitions - verify https usage
-    ['host', 'production_host', 'staging_host', 'development_host'].filter((item) => package_json.binary[item]).forEach((item) => {
-      const protocol = url.parse(package_json.binary[item]).protocol;
+    ['host', 'staging_host', 'development_host'].filter((item) => package_json.binary[item]).forEach((item) => {
+      const protocol = url.parse(package_json.binary[item].endpoint).protocol;
       if (protocol === 'http:') {
         throw new Error(msg + "'" + item + "' protocol (" + protocol + ") is invalid - only 'https:' is accepted");
       }
@@ -278,7 +329,8 @@ const default_remote_path = '';
 
 module.exports.evaluate = function(package_json, options, napi_build_version) {
   options = options || {};
-  validate_config(package_json, options); // options is a suitable substitute for opts in this case
+  standarize_config(package_json); // note: package_json is mutated
+  validate_config(package_json, options);
   const v = package_json.version;
   const module_version = semver.parse(v);
   const runtime = options.runtime || get_process_runtime(process.versions);
@@ -306,10 +358,7 @@ module.exports.evaluate = function(package_json, options, napi_build_version) {
     target_arch: options.target_arch || process.arch,
     libc: options.target_libc || detect_libc.familySync() || 'unknown',
     module_main: package_json.main,
-    toolset: options.toolset || '', // address https://github.com/mapbox/node-pre-gyp/issues/119
-    bucket: package_json.binary.bucket,
-    region: package_json.binary.region,
-    s3ForcePathStyle: package_json.binary.s3ForcePathStyle || false
+    toolset: options.toolset || '' // address https://github.com/mapbox/node-pre-gyp/issues/119
   };
 
   // user can define a target host key to use (development_host, staging_host, production_host)
@@ -327,20 +376,24 @@ module.exports.evaluate = function(package_json, options, napi_build_version) {
   // the production host is as specified in 'host' key (default)
   // unless there is none and alias production_host is specified (backwards compatibility)
   // note: package.json is verified in validate_config to include at least one of the two.
-  let host = package_json.binary.host ||  package_json.binary.production_host;
+  let hostData = package_json.binary.host;
 
   // when a valid target is specified by user, the host is from that target (or 'host')
   if (targetHost === 'staging') {
-    host = package_json.binary.staging_host;
+    hostData = package_json.binary.staging_host;
   } else if (targetHost === 'development') {
-    host = package_json.binary.development_host;
+    hostData = package_json.binary.development_host;
   } else if (!targetHost && (package_json.binary.development_host || package_json.binary.staging_host)) {
     // when host not specifically set via command line or environment variable
     // but staging and/or development host are present in package.json
     // for any command (or command chain) that includes publish or unpublish
     // default to lower host (development, and if not preset, staging).
     if (options.argv && options.argv.remain.some((item) => (item === 'publish' || item === 'unpublish'))) {
-      host = package_json.binary.development_host || package_json.binary.staging_host;
+      if (package_json.binary.development_host) {
+        hostData = package_json.binary.development_host;
+      } else if (package_json.binary.staging_host) {
+        hostData = package_json.binary.staging_host;
+      }
     }
   }
 
@@ -349,9 +402,13 @@ module.exports.evaluate = function(package_json, options, napi_build_version) {
   // > npm install v8-profiler --profiler_binary_host_mirror=https://registry.npmmirror.com/node-inspector/
   const validModuleName = opts.module_name.replace('-', '_');
   // explicitly set mirror overrides everything set above
-  host = process.env['npm_config_' + validModuleName + '_binary_host_mirror'] || host;
+  hostData.endpoint = process.env['npm_config_' + validModuleName + '_binary_host_mirror'] || hostData.endpoint;
+
+  opts.host = fix_slashes(eval_template(hostData.endpoint, opts));
+  opts.bucket = hostData.bucket;
+  opts.region = hostData.region;
+  opts.s3ForcePathStyle = hostData.s3ForcePathStyle || false;
 
-  opts.host = fix_slashes(eval_template(host, opts));
   opts.module_path = eval_template(package_json.binary.module_path, opts);
   // now we resolve the module_path to ensure it is absolute so that binding.gyp variables work predictably
   if (options.module_root) {
@@ -366,6 +423,7 @@ module.exports.evaluate = function(package_json, options, napi_build_version) {
   const package_name = package_json.binary.package_name ? package_json.binary.package_name : default_package_name;
   opts.package_name = eval_template(package_name, opts);
   opts.staged_tarball = path.join('build/stage', opts.remote_path, opts.package_name);
+
   // when using s3ForcePathStyle the bucket is part of the http object path
   // add it
   if (opts.s3ForcePathStyle) {