fsevents 1.1.1 → 1.2.2

package/node_modules/node-pre-gyp/lib/install.js

@@ -6,12 +6,11 @@ exports.usage = 'Attempts to install pre-built binary for module';
 
 var fs = require('fs');
 var path = require('path');
-var zlib = require('zlib');
 var log = require('npmlog');
 var existsAsync = fs.exists || path.exists;
 var versioning = require('./util/versioning.js');
-var testbinary = require('./testbinary.js');
-var clean = require('./clean.js');
+var napi = require('./util/napi.js');
+var mkdirp = require('mkdirp');
 
 var npgVersion = 'unknown';
 try {
@@ -33,7 +32,8 @@ function download(uri,opts,callback) {
         uri: uri.replace('+','%2B'),
         headers: {
           'User-Agent': 'node-pre-gyp (v' + npgVersion + ', ' + envVersionInfo + ')'
-        }
+        },
+        follow_max: 10,
     };
 
     if (opts.cafile) {
@@ -59,7 +59,7 @@ function download(uri,opts,callback) {
       }
     }
     try {
-        req = require('request')(requestOpts);
+        req = require('needle').get(requestOpts.uri, requestOpts);
     } catch (e) {
         return callback(e);
     }
@@ -77,8 +77,7 @@ function place_binary(from,to,opts,callback) {
         if (!req) return callback(new Error("empty req"));
         var badDownload = false;
         var extractCount = 0;
-        var gunzip = zlib.createGunzip();
-        var extracter = require('tar').Extract({ path: to, strip: 1});
+        var tar = require('tar');
 
         function afterTarball(err) {
             if (err) return callback(err);
@@ -91,18 +90,10 @@ function place_binary(from,to,opts,callback) {
         }
 
         function filter_func(entry) {
-            // ensure directories are +x
-            // https://github.com/mapnik/node-mapnik/issues/262
-            entry.props.mode |= (entry.props.mode >>> 2) & parseInt('0111',8);
             log.info('install','unpacking ' + entry.path);
             extractCount++;
         }
 
-        gunzip.on('error', callback);
-        extracter.on('entry', filter_func);
-        extracter.on('error', callback);
-        extracter.on('end', afterTarball);
-
         req.on('error', function(err) {
             badDownload = true;
             return callback(err);
@@ -114,40 +105,63 @@ function place_binary(from,to,opts,callback) {
             }
         });
 
-        req.on('response', function(res) {
-            if (res.statusCode !== 200) {
+      req.on('response', function(res) {
+           // ignore redirects, needle handles these automatically.
+           if (res.headers.hasOwnProperty('location') && res.headers.location !== '') {
+             return;
+           }
+           if (res.statusCode !== 200) {
                 badDownload = true;
                 var err = new Error(res.statusCode + ' status code downloading tarball ' + from);
                 err.statusCode = res.statusCode;
                 return callback(err);
             }
             // start unzipping and untaring
-            req.pipe(gunzip).pipe(extracter);
+            req.pipe(tar.extract({
+              cwd: to,
+              strip: 1,
+              onentry: filter_func
+            }).on('close', afterTarball).on('error', callback));
         });
     });
 }
 
 function do_build(gyp,argv,callback) {
-  gyp.todo.push( { name: 'build', args: ['rebuild'] } );
+  var args = ['rebuild'].concat(argv);
+  gyp.todo.push( { name: 'build', args: args } );
   process.nextTick(callback);
 }
 
 function print_fallback_error(err,opts,package_json) {
     var fallback_message = ' (falling back to source compile with node-gyp)';
-    var full_message = "Pre-built binaries not found for " + package_json.name + "@" + package_json.version;
-    full_message += " and " + opts.runtime + "@" + (opts.target || process.versions.node) + " (" + opts.node_abi + " ABI)";
-    full_message += fallback_message;
-    log.error("Tried to download(" + err.statusCode + "): " + opts.hosted_tarball);
-    log.error(full_message);
-    log.http(err.message);
+    var full_message = '';
+    if (err.statusCode !== undefined) {
+        // If we got a network response it but failed to download
+        // it means remote binaries are not available, so let's try to help
+        // the user/developer with the info to debug why
+        full_message = "Pre-built binaries not found for " + package_json.name + "@" + package_json.version;
+        full_message += " and " + opts.runtime + "@" + (opts.target || process.versions.node) + " (" + opts.node_abi + " ABI, " + opts.libc + ")";
+        full_message += fallback_message;
+        log.error("Tried to download(" + err.statusCode + "): " + opts.hosted_tarball);
+        log.error(full_message);
+        log.http(err.message);
+    } else {
+        // If we do not have a statusCode that means an unexpected error
+        // happened and prevented an http response, so we output the exact error
+        full_message = "Pre-built binaries not installable for " + package_json.name + "@" + package_json.version;
+        full_message += " and " + opts.runtime + "@" + (opts.target || process.versions.node) + " (" + opts.node_abi + " ABI, " + opts.libc + ")";
+        full_message += fallback_message;
+        log.error(full_message);
+        log.error("Hit error " + err.message);
+    }
 }
 
 function install(gyp, argv, callback) {
     var package_json = JSON.parse(fs.readFileSync('./package.json'));
+	var napi_build_version = napi.get_napi_build_version_from_command_args(argv);
     var source_build = gyp.opts['build-from-source'] || gyp.opts.build_from_source;
     var update_binary = gyp.opts['update-binary'] || gyp.opts.update_binary;
     var should_do_source_build = source_build === package_json.name || (source_build === true || source_build === 'true');
-    var no_rollback = gyp.opts.hasOwnProperty('rollback') && gyp.opts.rollback === false;
     if (should_do_source_build) {
         log.info('build','requesting source compile');
         return do_build(gyp,argv,callback);
@@ -165,7 +179,7 @@ function install(gyp, argv, callback) {
         }
         var opts;
         try {
-            opts = versioning.evaluate(package_json, gyp.opts);
+            opts = versioning.evaluate(package_json, gyp.opts, napi_build_version);
         } catch (err) {
             return callback(err);
         }
@@ -176,64 +190,32 @@ function install(gyp, argv, callback) {
         var from = opts.hosted_tarball;
         var to = opts.module_path;
         var binary_module = path.join(to,opts.module_name + '.node');
-        if (existsAsync(binary_module,function(found) {
+        existsAsync(binary_module,function(found) {
             if (found && !update_binary) {
-                testbinary(gyp, argv, function(err) {
-                    if (err) {
-                        console.error('['+package_json.name+'] ' + err.message);
-                        log.error("Testing local pre-built binary failed, attempting to re-download");
-                        place_binary(from,to,opts,function(err) {
-                            if (err) {
-                                if (should_do_fallback_build) {
-                                    print_fallback_error(err,opts,package_json);
-                                    return do_build(gyp,argv,callback);
-                                } else {
-                                    return callback(err);
-                                }
-                            } else {
-                                console.log('['+package_json.name+'] Success: "' + binary_module + '" is reinstalled via remote');
-                                return callback();
-                            }
-                        });
-                    } else {
-                        console.log('['+package_json.name+'] Success: "' + binary_module + '" already installed');
-                        console.log('Pass --update-binary to reinstall or --build-from-source to recompile');
-                        return callback();
-                    }
-                });
+                console.log('['+package_json.name+'] Success: "' + binary_module + '" already installed');
+                console.log('Pass --update-binary to reinstall or --build-from-source to recompile');
+                return callback();
             } else {
                 if (!update_binary) log.info('check','checked for "' + binary_module + '" (not found)');
-                place_binary(from,to,opts,function(err) {
-                    if (err && should_do_fallback_build) {
-                        print_fallback_error(err,opts,package_json);
-                        return do_build(gyp,argv,callback);
-                    } else if (err) {
-                        return callback(err);
+                mkdirp(to,function(err) {
+                    if (err) {
+                        after_place(err);
                     } else {
-                        testbinary(gyp, argv, function(err) {
-                            if (err) {
-                                if (no_rollback) {
-                                    return callback(err);
-                                }
-                                gyp.opts.silent_clean = true;
-                                clean(gyp, argv, function(error) {
-                                    if (error) console.log(error);
-                                    if (should_do_fallback_build) {
-                                        console.error('['+package_json.name+'] ' + err.message);
-                                        log.error("Testing pre-built binary failed, attempting to source compile");
-                                        return do_build(gyp,argv,callback);
-                                    } else {
-                                        return callback(err);
-                                    }
-                                });
-                            } else {
-                                console.log('['+package_json.name+'] Success: "' + binary_module + '" is installed via remote');
-                                return callback();
-                            }
-                        });
+                        place_binary(from,to,opts,after_place);
                     }
                 });
             }
-        }));
+            function after_place(err) {
+                if (err && should_do_fallback_build) {
+                    print_fallback_error(err,opts,package_json);
+                    return do_build(gyp,argv,callback);
+                } else if (err) {
+                    return callback(err);
+                } else {
+                    console.log('['+package_json.name+'] Success: "' + binary_module + '" is installed via remote');
+                    return callback();
+                }
+            }
+        });
     }
 }

package/node_modules/node-pre-gyp/lib/node-pre-gyp.js

@@ -10,10 +10,12 @@ module.exports = exports;
  * Module dependencies.
  */
 
+var fs = require('fs');
 var path = require('path');
 var nopt = require('nopt');
 var log = require('npmlog');
 log.disableProgress();
+var napi = require('./util/napi.js');
 
 var EE = require('events').EventEmitter;
 var inherits = require('util').inherits;
@@ -128,6 +130,13 @@ proto.parseArgv = function parseOpts (argv) {
     commands[commands.length - 1].args = argv.splice(0);
   }
 
+  // expand commands entries for multiple napi builds
+  var dir = this.opts.directory;
+  if (dir == null) dir = process.cwd();
+  var package_json = JSON.parse(fs.readFileSync(path.join(dir,'package.json')));
+
+  this.todo = napi.expand_commands (package_json, commands);
+
   // support for inheriting config env variables from npm
   var npm_config_prefix = 'npm_config_';
   Object.keys(process.env).forEach(function (name) {

package/node_modules/node-pre-gyp/lib/package.js

@@ -8,14 +8,17 @@ var fs = require('fs');
 var path = require('path');
 var log = require('npmlog');
 var versioning = require('./util/versioning.js');
+var napi = require('./util/napi.js');
 var write = require('fs').createWriteStream;
 var existsAsync = fs.exists || path.exists;
 var mkdirp = require('mkdirp');
+var tar = require('tar');
 
 function _package(gyp, argv, callback) {
-    var pack = require('tar-pack').pack;
+    var packlist = require('npm-packlist');
     var package_json = JSON.parse(fs.readFileSync('./package.json'));
-    var opts = versioning.evaluate(package_json, gyp.opts);
+    var napi_build_version = napi.get_napi_build_version_from_command_args(argv);
+    var opts = versioning.evaluate(package_json, gyp.opts, napi_build_version);
     var from = opts.module_path;
     var binary_module = path.join(from,opts.module_name + '.node');
     existsAsync(binary_module,function(found) {
@@ -30,17 +33,21 @@ function _package(gyp, argv, callback) {
             return true;
         };
         mkdirp(path.dirname(tarball),function(err) {
-            if (err) throw err;
-            pack(from, { filter: filter_func })
-             .pipe(write(tarball))
-             .on('error', function(err) {
-                if (err)  console.error('['+package_json.name+'] ' + err.message);
-                return callback(err);
-             })
-             .on('close', function() {
-                log.info('package','Binary staged at "' + tarball + '"');
-                return callback();
-             });
+            from = path.dirname(from);
+            if (err) return callback(err);
+            packlist({ path: from }).then(function(files) {
+                tar.create({
+                    portable: true,
+                    gzip: true,
+                    onentry: filter_func,
+                    file: tarball,
+                    cwd: from
+                }, files, function(err) {
+                    if (err)  console.error('['+package_json.name+'] ' + err.message);
+                    else log.info('package','Binary staged at "' + tarball + '"');
+                    return callback(err);
+                });
+            }, callback);
         });
     });
 }

package/node_modules/node-pre-gyp/lib/pre-binding.js

@@ -1,6 +1,7 @@
 "use strict";
 
 var versioning = require('../lib/util/versioning.js');
+var napi = require('../lib/util/napi.js');
 var existsSync = require('fs').existsSync || require('path').existsSync;
 var path = require('path');
 
@@ -18,8 +19,12 @@ exports.find = function(package_json_path,opts) {
    }
    var package_json = require(package_json_path);
    versioning.validate_config(package_json);
+   var napi_build_version;
+   if (napi.get_napi_build_versions (package_json)) {
+       napi_build_version = napi.get_best_napi_build_version(package_json);
+   }
    opts = opts || {};
    if (!opts.module_root) opts.module_root = path.dirname(package_json_path);
-   var meta = versioning.evaluate(package_json,opts);
+   var meta = versioning.evaluate(package_json,opts,napi_build_version);
    return meta.module;
 };

package/node_modules/node-pre-gyp/lib/publish.js

@@ -8,6 +8,7 @@ var fs = require('fs');
 var path = require('path');
 var log = require('npmlog');
 var versioning = require('./util/versioning.js');
+var napi = require('./util/napi.js');
 var s3_setup = require('./util/s3_setup.js');
 var existsAsync = fs.exists || path.exists;
 var url = require('url');
@@ -16,7 +17,8 @@ var config = require('rc')("node_pre_gyp",{acl:"public-read"});
 function publish(gyp, argv, callback) {
     var AWS = require("aws-sdk");
     var package_json = JSON.parse(fs.readFileSync('./package.json'));
-    var opts = versioning.evaluate(package_json, gyp.opts);
+    var napi_build_version = napi.get_napi_build_version_from_command_args(argv);
+    var opts = versioning.evaluate(package_json, gyp.opts, napi_build_version);
     var tarball = opts.staged_tarball;
     existsAsync(tarball,function(found) {
         if (!found) {

package/node_modules/node-pre-gyp/lib/rebuild.js

@@ -4,10 +4,18 @@ module.exports = exports = rebuild;
 
 exports.usage = 'Runs "clean" and "build" at once';
 
+var fs = require('fs');
+var napi = require('./util/napi.js');
+
 function rebuild (gyp, argv, callback) {
-  gyp.todo.unshift(
-      { name: 'clean', args: [] },
-      { name: 'build', args: ['rebuild'] }
-  );
+  var package_json = JSON.parse(fs.readFileSync('./package.json'));
+  var commands = [
+    { name: 'clean', args: [] },
+    { name: 'build', args: ['rebuild'] }
+    ];
+  commands = napi.expand_commands(package_json, commands);
+  for (var i = commands.length; i !== 0; i--) {
+    gyp.todo.unshift(commands[i-1]);
+  }
   process.nextTick(callback);
 }

package/node_modules/node-pre-gyp/lib/reinstall.js

@@ -4,10 +4,17 @@ module.exports = exports = rebuild;
 
 exports.usage = 'Runs "clean" and "install" at once';
 
+var fs = require('fs');
+var napi = require('./util/napi.js');
+
 function rebuild (gyp, argv, callback) {
+  var package_json = JSON.parse(fs.readFileSync('./package.json'));
+  var installArgs = [];
+  var napi_build_version = napi.get_best_napi_version(package_json);
+  if (napi_build_version != null) installArgs = [ napi.get_command_arg (napi_build_version) ];
   gyp.todo.unshift(
       { name: 'clean', args: [] },
-      { name: 'install', args: [] }
+      { name: 'install', args: installArgs }
   );
   process.nextTick(callback);
 }

package/node_modules/node-pre-gyp/lib/reveal.js

@@ -6,6 +6,7 @@ exports.usage = 'Reveals data on the versioned binary';
 
 var fs = require('fs');
 var versioning = require('./util/versioning.js');
+var napi = require('./util/napi.js');
 
 function unix_paths(key, val) {
     return val && val.replace ? val.replace(/\\/g, '/') : val;
@@ -13,12 +14,13 @@ function unix_paths(key, val) {
 
 function reveal(gyp, argv, callback) {
     var package_json = JSON.parse(fs.readFileSync('./package.json'));
-    var opts = versioning.evaluate(package_json, gyp.opts);
+    var napi_build_version = napi.get_napi_build_version_from_command_args(argv);
+    var opts = versioning.evaluate(package_json, gyp.opts, napi_build_version);
     var hit = false;
     // if a second arg is passed look to see
     // if it is a known option
     //console.log(JSON.stringify(gyp.opts,null,1))
-    var remain = gyp.opts.argv.remain.pop();
+    var remain = gyp.opts.argv.remain[gyp.opts.argv.remain.length-1];
     if (remain && opts.hasOwnProperty(remain)) {
         console.log(opts[remain].replace(/\\/g, '/'));
         hit = true;

package/node_modules/node-pre-gyp/lib/testbinary.js

@@ -9,6 +9,7 @@ var path = require('path');
 var log = require('npmlog');
 var cp = require('child_process');
 var versioning = require('./util/versioning.js');
+var napi = require('./util/napi.js');
 var path = require('path');
 
 function testbinary(gyp, argv, callback) {
@@ -16,10 +17,17 @@ function testbinary(gyp, argv, callback) {
     var options = {};
     var shell_cmd = process.execPath;
     var package_json = JSON.parse(fs.readFileSync('./package.json'));
-    var opts = versioning.evaluate(package_json, gyp.opts);
+    var napi_build_version = napi.get_napi_build_version_from_command_args(argv);
+    var opts = versioning.evaluate(package_json, gyp.opts, napi_build_version);
+    // skip validation for runtimes we don't explicitly support (like electron)
+    if (opts.runtime &&
+        opts.runtime !== 'node-webkit' &&
+        opts.runtime !== 'node') {
+        return callback();
+    }
+    var nw = (opts.runtime && opts.runtime === 'node-webkit');
     // ensure on windows that / are used for require path
     var binary_module = opts.module.replace(/\\/g, '/');
-    var nw = (opts.runtime && opts.runtime === 'node-webkit');
     if ((process.arch != opts.target_arch) ||
         (process.platform != opts.target_platform)) {
         var msg = "skipping validation since host platform/arch (";
@@ -62,7 +70,7 @@ function testbinary(gyp, argv, callback) {
         return;
     }
     args.push('--eval');
-    args.push("'require(\\'" + binary_module.replace(/\'/g, '\\\'') +"\\')'");
+    args.push("require('" + binary_module.replace(/'/g, '\'') +"')");
     log.info("validate","Running test command: '" + shell_cmd + ' ' + args.join(' ') + "'");
     cp.execFile(shell_cmd, args, options, function(err, stdout, stderr) {
         if (err) {

package/node_modules/node-pre-gyp/lib/testpackage.js

@@ -9,32 +9,39 @@ var path = require('path');
 var log = require('npmlog');
 var existsAsync = fs.exists || path.exists;
 var versioning = require('./util/versioning.js');
+var napi = require('./util/napi.js');
 var testbinary = require('./testbinary.js');
-var read = require('fs').createReadStream;
-var zlib = require('zlib');
+var tar = require('tar');
+var mkdirp = require('mkdirp');
 
 function testpackage(gyp, argv, callback) {
     var package_json = JSON.parse(fs.readFileSync('./package.json'));
-    var opts = versioning.evaluate(package_json, gyp.opts);
+    var napi_build_version = napi.get_napi_build_version_from_command_args(argv);
+    var opts = versioning.evaluate(package_json, gyp.opts, napi_build_version);
     var tarball = opts.staged_tarball;
     existsAsync(tarball, function(found) {
         if (!found) {
             return callback(new Error("Cannot test package because " + tarball + " missing: run `node-pre-gyp package` first"));
         }
         var to = opts.module_path;
-        var gunzip = zlib.createGunzip();
-        var extracter = require('tar').Extract({ path: to, strip: 1 });
         function filter_func(entry) {
-            // ensure directories are +x
-            // https://github.com/mapnik/node-mapnik/issues/262
-            entry.props.mode |= (entry.props.mode >>> 2) & parseInt('0111',8);
-            log.info('install','unpacking ' + entry.path);
+            log.info('install','unpacking [' + entry.path + ']');
         }
-        gunzip.on('error', callback);
-        extracter.on('error', callback);
-        extracter.on('entry', filter_func);
-        extracter.on('end', function(err) {
-            if (err) return callback(err);
+
+        mkdirp(to, function(err) {
+            if (err) {
+                return callback(err);
+            } else {
+                tar.extract({
+                    file: tarball,
+                    cwd: to,
+                    strip: 1,
+                    onentry: filter_func
+                }).then(after_extract, callback);
+            }
+        });
+
+        function after_extract() {
             testbinary(gyp,argv,function(err) {
                 if (err) {
                     return callback(err);
@@ -43,7 +50,6 @@ function testpackage(gyp, argv, callback) {
                     return callback();
                 }
             });
-        });
-        read(tarball).pipe(gunzip).pipe(extracter);
+        }
     });
 }

package/node_modules/node-pre-gyp/lib/unpublish.js

@@ -7,6 +7,7 @@ exports.usage = 'Unpublishes pre-built binary (requires aws-sdk)';
 var fs = require('fs');
 var log = require('npmlog');
 var versioning = require('./util/versioning.js');
+var napi = require('./util/napi.js');
 var s3_setup = require('./util/s3_setup.js');
 var url = require('url');
 var config = require('rc')("node_pre_gyp",{acl:"public-read"});
@@ -14,7 +15,8 @@ var config = require('rc')("node_pre_gyp",{acl:"public-read"});
 function unpublish(gyp, argv, callback) {
     var AWS = require("aws-sdk");
     var package_json = JSON.parse(fs.readFileSync('./package.json'));
-    var opts = versioning.evaluate(package_json, gyp.opts);
+    var napi_build_version = napi.get_napi_build_version_from_command_args(argv);
+    var opts = versioning.evaluate(package_json, gyp.opts, napi_build_version);
     s3_setup.detect(opts.hosted_path,config);
     AWS.config.update(config);
     var key_name = url.resolve(config.prefix,opts.package_name);