Expanded testing to cover host configuration with an object.

- added app1.3 - identical to app1 but using host, staging_host and development_host configuration with an object.
- expanded and refactored versioning testing.
- modified bucket switching script to work with new package.json format.

Author: ronilan

scripts/set-bucket.js

@@ -18,19 +18,32 @@ dirs.forEach((dir) => {
   const pkg = require(`${root}/${dir}/package.json`); // relative path
 
   // bucket specified as part of s3 virtual host format (auto detected by node-pre-gyp)
-  const keys = ['host', 'staging_host', 'production_host'];
+  const keys = ['host', 'development_host', 'staging_host', 'production_host'];
   keys.forEach((item) => {
-    if (pkg.binary[item]) {
-
+    // hosts may be specified as strings (old format)
+    if (pkg.binary[item] && typeof pkg.binary[item] === 'string') {
       // match the bucket part of the url
       const match = pkg.binary[item].match(/^https:\/\/(.+)(?:\.s3[-.].*)$/i);
       if (match) {
         pkg.binary[item] = pkg.binary[item].replace(match[1], bucket);
         console.log(`Success: set ${dir} ${item} to ${pkg.binary[item]}`);
       }
     }
+
+    if (pkg.binary[item] && typeof pkg.binary[item] === 'object') {
+      // match the bucket part of the url
+      const match = pkg.binary[item].endpoint.match(/^https:\/\/(.+)(?:\.s3[-.].*)$/i);
+      if (match) {
+        pkg.binary[item].endpoint = pkg.binary[item].endpoint.replace(match[1], bucket);
+        console.log(`Success: set ${dir} ${item} to ${pkg.binary[item]}`);
+      }
+      if (pkg.binary[item].bucket) {
+        pkg.binary[item].bucket = bucket;
+        console.log(`Set ${dir} bucket to ${pkg.binary[item].bucket}`);
+      }
+    }
   });
-  // bucket is specified explicitly
+  // bucket may be specified explicitly on binary ()old format
   if (pkg.binary.bucket) {
     pkg.binary.bucket = bucket;
     console.log(`Set ${dir} bucket to ${pkg.binary.bucket}`);

test/app1.1/README.md

@@ -1,4 +1,4 @@
 # Test app
 
 Demonstrates a simple configuration that uses node-pre-gyp.
-Identical to app1 but using production and staging binary host option.
+Identical to app1 but using production and staging binary host option as string (legacy)

test/app1.2/README.md

@@ -1,4 +1,4 @@
 # Test app
 
 Demonstrates a simple configuration that uses node-pre-gyp.
-Identical to app1 but using explicit host, region, bucket options.
+Identical to app1 but using explicit host, region, bucket options defined on the binary (legacy).

test/app1.3/.gitignore

@@ -0,0 +1,5 @@
+.DS_Store
+build/
+lib/binding/
+node_modules
+npm-debug.log

test/app1.3/README.md

@@ -0,0 +1,4 @@
+# Test app
+
+Demonstrates a simple configuration that uses node-pre-gyp.
+Identical to app1 but using host, staging_host and development_host configuration with an object.

test/app1.3/app1.3.cc

@@ -0,0 +1,14 @@
+#include <napi.h>
+
+Napi::Value get_hello(Napi::CallbackInfo const& info) {
+  Napi::Env env = info.Env();
+  Napi::EscapableHandleScope scope(env);
+  return scope.Escape(Napi::String::New(env, "hello"));
+}
+
+Napi::Object start(Napi::Env env, Napi::Object exports) {
+    exports.Set("hello", Napi::Function::New(env, get_hello));
+    return exports;
+}
+
+NODE_API_MODULE(app1, start)

test/app1.3/binding.gyp

@@ -0,0 +1,19 @@
+{
+  "targets": [
+    {
+      "target_name": "<(module_name)",
+      "sources": [ "<(module_name).cc" ],
+      'product_dir': '<(module_path)',
+      'include_dirs': ["../../node_modules/node-addon-api/"],
+      'cflags!': [ '-fno-exceptions' ],
+      'cflags_cc!': [ '-fno-exceptions' ],
+      "xcode_settings": {
+        'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
+        "CLANG_CXX_LIBRARY": "libc++"
+      },
+      'msvs_settings': {
+        'VCCLCompilerTool': { 'ExceptionHandling': 1 },
+      }
+     }
+  ]
+}

test/app1.3/index.js

@@ -0,0 +1,6 @@
+var binary = require('node-pre-gyp');
+var path = require('path')
+var binding_path = binary.find(path.resolve(path.join(__dirname,'./package.json')));
+var binding = require(binding_path);
+
+require('assert').equal(binding.hello(),"hello");

test/app1.3/package.json

@@ -0,0 +1,40 @@
+{
+    "name": "node-pre-gyp-test-app1.3",
+    "author": "Dane Springmeyer <springmeyer>",
+    "description": "node-pre-gyp test",
+    "repository": {
+        "type": "git",
+        "url": "git://github.com/mapbox/node-pre-gyp.git"
+    },
+    "license": "BSD-3-Clause",
+    "version": "0.1.0",
+    "main": "./index.js",
+    "binary": {
+        "module_name": "app1.3",
+        "module_path": "./lib/binding/",
+        "host": {
+            "endpoint": "https://s3.us-east-1.amazonaws.com",
+            "bucket": "npg-mock-bucket",
+            "region": "us-east-1",
+            "s3ForcePathStyle": true
+        },
+        "staging_host": {
+            "endpoint": "https://s3.us-east-1.amazonaws.com",
+            "bucket": "npg-mock-bucket",
+            "region": "us-east-1",
+            "s3ForcePathStyle": true
+        },
+        "development_host": {
+            "endpoint": "https://s3.us-east-1.amazonaws.com",
+            "bucket": "npg-mock-bucket",
+            "region": "us-east-1",
+            "s3ForcePathStyle": true
+        },
+        "remote_path": "./node-pre-gyp/{name}/v{version}/{configuration}/{toolset}/",
+        "package_name": "{node_abi}-{platform}-{arch}.tar.gz"
+    },
+    "scripts": {
+        "install": "node-pre-gyp install --fallback-to-build",
+        "test": "node index.js"
+    }
+}

test/s3.test.js

@@ -36,6 +36,13 @@ const apps = [
       'base': ['binding/app1.2.node']
     }
   },
+  {
+    'name': 'app1.3',
+    'args': '',
+    'files': {
+      'base': ['binding/app1.3.node']
+    }
+  },
   {
     'name': 'app2',
     'args': '--custom_include_path=../include --debug',