added missing node_modules

Set VERSION to 5.1.0 (via coho)
Update JS snapshot to version 5.1.0 (via coho)
2026-05-11 00:00:05 +08:00 · 2016-01-20 17:07:33 -08:00 · 2016-01-20 16:18:52 -08:00 · 2016-01-20 16:18:52 -08:00
723 changed files with 1797 additions and 4573 deletions
@@ -40,6 +40,4 @@ Desktop.ini
 .idea
 npm-debug.log
 /framework/build
-node_modules/jshint
-node_modules/promise-matchers
-node_modules/jasmine-node
+node_modules/
@@ -20,22 +20,6 @@
 -->
 ## Release Notes for Cordova (Android) ##

-### 5.1.1 (Feb 24, 2016)
-* updated `cordova-common` dependnecy to `1.1.0`
-* CB-10628 Fix `emulate android --target`
-* CB-10618 Handle gradle frameworks on plugin installation/uninstallation
-* CB-10510: Add an optional timeout to `emu` start script
-* CB-10498: Resume event should be sticky if it has a plugin result
-* fix `HtmlNotFoundTest` so that it passes when file not found is handled correctly
-* CB-10472 `NullPointerException`: `org.apache.cordova.PluginManager.onSaveInstanceState` check if `pluginManager` is `null` before using it
-* CB-10138 Adds missing plugin metadata to `plugin_list` module.
-* CB-10443 Pass original options instead of remaining
-* CB-10443 Fix `this.root` null reference
-* CB-10421 Fixes exception when calling run script with `--help` option
-* updated `.gitignore`
-* CB-10406 Fixes an exception, thrown when building using Ant. 
-* CB-10157 Uninstall app from device/emulator only when signed apk is already installed
-
 ### 5.1.0 (Jan 19, 2016)
 * CB-10386 Add `android.useDeprecatedNdk=true` to support `NDK` in `gradle`
 * CB-8864: Fixing this to mitigate CB-8685 and CB-10104
@@ -1 +1 @@
-5.1.1
+5.1.0
@@ -126,8 +126,8 @@ function writeProjectProperties(projectPath, target_api) {
 }

 function prepBuildFiles(projectPath) {
-    var buildModule = require(path.resolve(projectPath, 'cordova/lib/builders/builders'));
-    buildModule.getBuilder('gradle').prepBuildFiles();
+    var buildModule = require(path.join(path.resolve(projectPath), 'cordova', 'lib', 'build'));
+    buildModule.prepBuildFiles();
 }

 function copyBuildRules(projectPath) {
@@ -219,11 +219,6 @@ Api.prototype.addPlugin = function (plugin, installOptions) {
            .add_plugin_changes(plugin, installOptions.variables, /*is_top_level=*/true, /*should_increment=*/true)
            .save_all();

-        if (plugin.getFrameworks(self.platform).length > 0) {
-            self.events.emit('verbose', 'Updating build files since android plugin contained <framework>');
-            require('./lib/builders/builders').getBuilder('gradle').prepBuildFiles();
-        }
-
        var targetDir = installOptions.usePlatformWww ?
            self.locations.platformWww :
            self.locations.www;
@@ -277,11 +272,6 @@ Api.prototype.removePlugin = function (plugin, uninstallOptions) {
            .remove_plugin_changes(plugin, /*is_top_level=*/true)
            .save_all();

-        if (plugin.getFrameworks(self.platform).length > 0) {
-            self.events.emit('verbose', 'Updating build files since android plugin contained <framework>');
-            require('./lib/builders/builders').getBuilder('gradle').prepBuildFiles();
-        }
-
        var targetDir = uninstallOptions.usePlatformWww ?
            self.locations.platformWww :
            self.locations.www;
@@ -441,11 +431,6 @@ Api.prototype._addModulesInfo = function(plugin, targetDir) {
    });

    this._platformJson.root.modules = installedModules.concat(modulesToInstall);
-    if (!this._platformJson.root.plugin_metadata) {
-        this._platformJson.root.plugin_metadata = {};
-    }
-    this._platformJson.root.plugin_metadata[plugin.id] = plugin.version;
-
    this._writePluginModules(targetDir);
    this._platformJson.save();
 };
@@ -472,10 +457,6 @@ Api.prototype._removeModulesInfo = function(plugin, targetDir) {
    });

    this._platformJson.root.modules = updatedModules;
-    if (this._platformJson.root.plugin_metadata) {
-        delete this._platformJson.root.plugin_metadata[plugin.id];
-    }
-
    this._writePluginModules(targetDir);
    this._platformJson.save();
 };
@@ -489,13 +470,20 @@ Api.prototype._removeModulesInfo = function(plugin, targetDir) {
 *   directories.
 */
 Api.prototype._writePluginModules = function (targetDir) {
+    var self = this;
    // Write out moduleObjects as JSON wrapped in a cordova module to cordova_plugins.js
    var final_contents = 'cordova.define(\'cordova/plugin_list\', function(require, exports, module) {\n';
    final_contents += 'module.exports = ' + JSON.stringify(this._platformJson.root.modules, null, '    ') + ';\n';
    final_contents += 'module.exports.metadata = \n';
    final_contents += '// TOP OF METADATA\n';

-    final_contents += JSON.stringify(this._platformJson.root.plugin_metadata, null, 4) + ';\n';
+    var pluginMetadata = Object.keys(this._platformJson.root.installed_plugins)
+    .reduce(function (metadata, plugin) {
+        metadata[plugin] = self._platformJson.root.installed_plugins[plugin].version;
+        return metadata;
+    }, {});
+
+    final_contents += JSON.stringify(pluginMetadata, null, 4) + '\n';
    final_contents += '// BOTTOM OF METADATA\n';
    final_contents += '});'; // Close cordova.define.

@@ -39,7 +39,7 @@ var buildOpts = nopt({
 }, { 'd' : '--verbose' });

 // Make buildOptions compatible with PlatformApi build method spec
-buildOpts.argv = buildOpts.argv.original;
+buildOpts.argv = buildOpts.argv.remain;

 new Api().build(buildOpts)
 .catch(function(err) {
@@ -31,7 +31,7 @@ var events = require('cordova-common').events;
 var spawn = require('cordova-common').superspawn.spawn;
 var CordovaError = require('cordova-common').CordovaError;

-function parseOpts(options, resolvedTarget, projectRoot) {
+function parseOpts(options, resolvedTarget) {
    options = options || {};
    options.argv = nopt({
        gradle: Boolean,
@@ -72,7 +72,7 @@ function parseOpts(options, resolvedTarget, projectRoot) {
    var packageArgs = {};

    if (options.argv.keystore)
-        packageArgs.keystore = path.relative(projectRoot, path.resolve(options.argv.keystore));
+        packageArgs.keystore = path.relative(this.root, path.resolve(options.argv.keystore));

    ['alias','storePassword','password','keystoreType'].forEach(function (flagName) {
        if (options.argv[flagName])
@@ -126,7 +126,7 @@ function parseOpts(options, resolvedTarget, projectRoot) {
 * Returns a promise.
 */
 module.exports.runClean = function(options) {
-    var opts = parseOpts(options, null, this.root);
+    var opts = parseOpts(options);
    var builder = builders.getBuilder(opts.buildMethod);
    return builder.prepEnv(opts)
    .then(function() {
@@ -147,7 +147,7 @@ module.exports.runClean = function(options) {
 *   information.
 */
 module.exports.run = function(options, optResolvedTarget) {
-    var opts = parseOpts(options, optResolvedTarget, this.root);
+    var opts = parseOpts(options, optResolvedTarget);
    var builder = builders.getBuilder(opts.buildMethod);
    var self = this;
    return builder.prepEnv(opts)
@@ -169,6 +169,11 @@ module.exports.run = function(options, optResolvedTarget) {
    });
 };

+// Called by plugman after installing plugins, and by create script after creating project.
+module.exports.prepBuildFiles = function() {
+    return builders.getBuilder('gradle').prepBuildFiles();
+};
+
 /*
 * Detects the architecture of a device/emulator
 * Returns "arm" or "x86".
@@ -45,7 +45,7 @@ util.inherits(AntBuilder, GenericBuilder);
 AntBuilder.prototype.getArgs = function(cmd, opts) {
    var args = [cmd, '-f', path.join(this.root, 'build.xml')];
    // custom_rules.xml is required for incremental builds.
-    if (hasCustomRules(this.root)) {
+    if (hasCustomRules()) {
        args.push('-Dout.dir=ant-build', '-Dgen.absolute.dir=ant-gen');
    }
    if(opts.packageInfo) {
@@ -99,7 +99,7 @@ AntBuilder.prototype.prepEnv = function(opts) {
 AntBuilder.prototype.build = function(opts) {
    // Without our custom_rules.xml, we need to clean before building.
    var ret = Q();
-    if (!hasCustomRules(this.root)) {
+    if (!hasCustomRules()) {
        // clean will call check_ant() for us.
        ret = this.clean(opts);
    }
@@ -89,25 +89,12 @@ module.exports.install = function(target, buildResults) {
        var pkgName = manifest.getPackageId();
        var launchName = pkgName + '/.' + manifest.getActivity().getName();
        events.emit('log', 'Using apk: ' + apk_path);
-
-        return Adb.install(resolvedTarget.target, apk_path, {replace: true})
-        .catch(function (error) {
-            // CB-9557 CB-10157 only uninstall and reinstall app if the one that
-            // is already installed on device was signed w/different certificate
-            if (!/INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES/.test(error.toString()))
-                throw error;
-
-            events.emit('warn', 'Uninstalling app from device and reinstalling it again because the ' +
-                'installed app already signed with different key');
-
-            // This promise is always resolved, even if 'adb uninstall' fails to uninstall app
-            // or the app doesn't installed at all, so no error catching needed.
-            return Adb.uninstall(resolvedTarget.target, pkgName)
-            .then(function() {
-                return Adb.install(resolvedTarget.target, apk_path, {replace: true});
-            });
-        })
+        // This promise is always resolved, even if 'adb uninstall' fails to uninstall app
+        // or the app doesn't installed at all, so no error catching needed.
+        return Adb.uninstall(resolvedTarget.target, pkgName)
        .then(function() {
+            return Adb.install(resolvedTarget.target, apk_path, {replace: true});
+        }).then(function() {
            //unlock screen
            return Adb.shell(resolvedTarget.target, 'input keyevent 82');
        }).then(function() {
@@ -23,6 +23,7 @@

 var retry      = require('./retry');
 var build      = require('./build');
+var check_reqs = require('./check_reqs');
 var path = require('path');
 var Adb = require('./Adb');
 var AndroidManifest = require('./AndroidManifest');
@@ -39,7 +40,6 @@ var ONE_SECOND              = 1000; // in milliseconds
 var ONE_MINUTE              = 60 * ONE_SECOND; // in milliseconds
 var INSTALL_COMMAND_TIMEOUT = 5 * ONE_MINUTE; // in milliseconds
 var NUM_INSTALL_RETRIES     = 3;
-var CHECK_BOOTED_INTERVAL   = 3 * ONE_SECOND; // in milliseconds
 var EXEC_KILL_SIGNAL        = 'SIGKILL';

 /**
@@ -104,8 +104,7 @@ module.exports.best_image = function() {

        var closest = 9999;
        var best = images[0];
-        // Loading check_reqs at run-time to avoid test-time vs run-time directory structure difference issue
-        var project_target = require('./check_reqs').get_target().replace('android-', '');
+        var project_target = check_reqs.get_target().replace('android-', '');
        for (var i in images) {
            var target = images[i].target;
            if(target) {
@@ -147,12 +146,10 @@ module.exports.list_targets = function() {
 * and returns the started ID of that emulator.
 * If no ID is given it will use the first image available,
 * if no image is available it will error out (maybe create one?).
- * If no boot timeout is given or the value is negative it will wait forever for
- * the emulator to boot
 *
 * Returns a promise.
 */
-module.exports.start = function(emulator_ID, boot_timeout) {
+module.exports.start = function(emulator_ID) {
    var self = this;

    return Q().then(function() {
@@ -165,8 +162,7 @@ module.exports.start = function(emulator_ID, boot_timeout) {
                return best.name;
            }

-            // Loading check_reqs at run-time to avoid test-time vs run-time directory structure difference issue
-            var androidCmd = require('./check_reqs').getAbsoluteAndroidCmd();
+            var androidCmd = check_reqs.getAbsoluteAndroidCmd();
            return Q.reject(new CordovaError('No emulator images (avds) found.\n' +
                '1. Download desired System Image by running: ' + androidCmd + ' sdk\n' +
                '2. Create an AVD by running: ' + androidCmd + ' avd\n' +
@@ -190,20 +186,14 @@ module.exports.start = function(emulator_ID, boot_timeout) {

        //wait for emulator to boot up
        process.stdout.write('Booting up emulator (this may take a while)...');
-        return self.wait_for_boot(emulatorId, boot_timeout)
-        .then(function(success) {
-            if (success) {
-                events.emit('log','BOOT COMPLETE');
-                //unlock screen
-                return Adb.shell(emulatorId, 'input keyevent 82')
-                .then(function() {
-                    //return the new emulator id for the started emulators
-                    return emulatorId;
-                });
-            } else {
-                // We timed out waiting for the boot to happen
-                return null;
-            }
+        return self.wait_for_boot(emulatorId)
+        .then(function() {
+            events.emit('log','BOOT COMPLETE');
+            //unlock screen
+            return Adb.shell(emulatorId, 'input keyevent 82');
+        }).then(function() {
+            //return the new emulator id for the started emulators
+            return emulatorId;
        });
    });
 };
@@ -237,25 +227,18 @@ module.exports.wait_for_emulator = function(uuid) {
 };

 /*
- * Waits for the core android process of the emulator to start. Returns a
- * promise that resolves to a boolean indicating success. Not specifying a
- * time_remaining or passing a negative value will cause it to wait forever
+ * Waits for the core android process of the emulator to start
 */
-module.exports.wait_for_boot = function(emulator_id, time_remaining) {
+module.exports.wait_for_boot = function(emulator_id) {
    var self = this;
    return Adb.shell(emulator_id, 'ps')
    .then(function(output) {
        if (output.match(/android\.process\.acore/)) {
-            return true;
-        } else if (time_remaining === 0) {
-            return false;
+            return;
        } else {
            process.stdout.write('.');
-
-            // Check at regular intervals
-            return Q.delay(time_remaining < CHECK_BOOTED_INTERVAL ? time_remaining : CHECK_BOOTED_INTERVAL).then(function() {
-                var updated_time = time_remaining >= 0 ? Math.max(time_remaining - CHECK_BOOTED_INTERVAL, 0) : time_remaining;
-                return self.wait_for_boot(emulator_id, updated_time);
+            return Q.delay(3000).then(function() {
+                return self.wait_for_boot(emulator_id);
            });
        }
    });
@@ -338,7 +321,7 @@ module.exports.install = function(givenTarget, buildResults) {
    }).then(function () {
        // This promise is always resolved, even if 'adb uninstall' fails to uninstall app
        // or the app doesn't installed at all, so no error catching needed.
-        return Q.when()
+        return Adb.uninstall(target.target, pkgName)
        .then(function() {

            var apk_path = build.findBestApkForArchitecture(buildResults, target.arch);
@@ -351,47 +334,28 @@ module.exports.install = function(givenTarget, buildResults) {
            events.emit('log', 'Using apk: ' + apk_path);
            events.emit('verbose', 'Installing app on emulator...');

-            // A special function to call adb install in specific environment w/ specific options.
-            // Introduced as a part of fix for http://issues.apache.org/jira/browse/CB-9119
-            // to workaround sporadic emulator hangs
-            function adbInstallWithOptions(target, apk, opts) {
-                events.emit('verbose', 'Installing apk ' + apk + ' on ' + target + '...');
-
-                var command = 'adb -s ' + target + ' install -r "' + apk + '"';
+            function exec(command, opts) {
                return Q.promise(function (resolve, reject) {
                    child_process.exec(command, opts, function(err, stdout, stderr) {
                        if (err) reject(new CordovaError('Error executing "' + command + '": ' + stderr));
-                        // adb does not return an error code even if installation fails. Instead it puts a specific
-                        // message to stdout, so we have to use RegExp matching to detect installation failure.
-                        else if (/Failure/.test(stdout)) reject(new CordovaError('Failed to install apk to emulator: ' + stdout));
                        else resolve(stdout);
                    });
                });
            }

-            function installPromise () {
-                return adbInstallWithOptions(target.target, apk_path, execOptions)
-                .catch(function (error) {
-                    // CB-9557 CB-10157 only uninstall and reinstall app if the one that
-                    // is already installed on device was signed w/different certificate
-                    if (!/INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES/.test(error.toString()))
-                        throw error;
+            var retriedInstall = retry.retryPromise(
+                NUM_INSTALL_RETRIES,
+                exec, 'adb -s ' + target.target + ' install -r "' + apk_path + '"', execOptions
+            );

-                    events.emit('warn', 'Uninstalling app from device and reinstalling it again because the ' +
-                        'installed app already signed with different key');
-
-                    // This promise is always resolved, even if 'adb uninstall' fails to uninstall app
-                    // or the app doesn't installed at all, so no error catching needed.
-                    return Adb.uninstall(target.target, pkgName)
-                    .then(function() {
-                        return adbInstallWithOptions(target.target, apk_path, execOptions);
-                    });
-                });
-            }
-
-            return retry.retryPromise(NUM_INSTALL_RETRIES, installPromise)
-            .then(function (output) {
-                events.emit('log', 'INSTALL SUCCESS');
+            return retriedInstall.then(function (output) {
+                if (output.match(/Failure/)) {
+                    return Q.reject(new CordovaError('Failed to install apk to emulator: ' + output));
+                } else {
+                    events.emit('log', 'INSTALL SUCCESS');
+                }
+            }, function (err) {
+                return Q.reject(new CordovaError('Failed to install apk to emulator: ' + err));
            });
        });
    // unlock screen
@@ -27,19 +27,6 @@ var path  = require('path'),
    device   = require('./device'),
    Q = require('q');

-function getInstallTarget(runOptions) {
-    var install_target;
-    if (runOptions.target) {
-        install_target = runOptions.target;
-    } else if (runOptions.device) {
-        install_target = '--device';
-    } else if (runOptions.emulator) {
-        install_target = '--emulator';
-    }
-
-    return install_target;
-}
-
 /**
 * Runs the application on a device if available. If no device is found, it will
 *   use a started emulator. If no started emulators are found it will attempt
@@ -53,7 +40,10 @@ function getInstallTarget(runOptions) {
 module.exports.run = function(runOptions) {

    var self = this;
-    var install_target = getInstallTarget(runOptions);
+
+    var install_target = runOptions.device ? '--device' :
+        runOptions.emulator ? '--emulator' :
+        runOptions.target;

    return Q()
    .then(function() {
@@ -126,8 +116,8 @@ function getInstallTarget(runOptions) {
    });
 };

-module.exports.help = function() {
-    console.log('Usage: ' + path.relative(process.cwd(), process.argv[1]) + ' [options]');
+module.exports.help = function(args) {
+    console.log('Usage: ' + path.relative(process.cwd(), args[1]) + ' [options]');
    console.log('Build options :');
    console.log('    --debug : Builds project in debug mode');
    console.log('    --release : Builds project in release mode');
@@ -20,7 +20,7 @@
 */

 // Coho updates this line:
-var VERSION = "5.1.1";
+var VERSION = "5.1.0";

 module.exports.version = VERSION;

@@ -1,5 +1,5 @@
 // Platform: android
-// c517ca811b4948b630e0b74dbae6c9637939da24
+// ded62dda172755defaf75378ed007dc05730ec22
 /*
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
@@ -19,7 +19,7 @@
 under the License.
 */
 ;(function() {
-var PLATFORM_VERSION_BUILD_LABEL = '5.1.1';
+var PLATFORM_VERSION_BUILD_LABEL = '5.1.0';
 // file: src/scripts/require.js

 /*jshint -W079 */
@@ -1614,9 +1614,6 @@ exports.reset();
 // file: /Users/steveng/repo/cordova/cordova-android/cordova-js-src/platform.js
 define("cordova/platform", function(require, exports, module) {

-// The last resume event that was received that had the result of a plugin call.
-var lastResumeEvent = null;
-
 module.exports = {
    id: 'android',
    bootstrap: function() {
@@ -1656,19 +1653,6 @@ module.exports = {
        bindButtonChannel('volumeup');
        bindButtonChannel('volumedown');

-        // The resume event is not "sticky", but it is possible that the event
-        // will contain the result of a plugin call. We need to ensure that the
-        // plugin result is delivered even after the event is fired (CB-10498)
-        var cordovaAddEventListener = document.addEventListener;
-
-        document.addEventListener = function(evt, handler, capture) {
-            cordovaAddEventListener(evt, handler, capture);
-
-            if (evt === 'resume' && lastResumeEvent) {
-                handler(lastResumeEvent);
-            }
-        };
-
        // Let native code know we are all done on the JS side.
        // Native code will then un-hide the WebView.
        channel.onCordovaReady.subscribe(function() {
@@ -1707,10 +1691,6 @@ function onMessageFromNative(msg) {
                    }
                    msg.pendingResult.result = res;
                }
-
-                // Save the plugin result so that it can be delivered to the js
-                // even if they miss the initial firing of the event
-                lastResumeEvent = msg;
            }
            cordova.fireDocumentEvent(action, msg);
            break;
@@ -19,9 +19,6 @@
 *
 */

-// The last resume event that was received that had the result of a plugin call.
-var lastResumeEvent = null;
-
 module.exports = {
    id: 'android',
    bootstrap: function() {
@@ -61,19 +58,6 @@ module.exports = {
        bindButtonChannel('volumeup');
        bindButtonChannel('volumedown');

-        // The resume event is not "sticky", but it is possible that the event
-        // will contain the result of a plugin call. We need to ensure that the
-        // plugin result is delivered even after the event is fired (CB-10498)
-        var cordovaAddEventListener = document.addEventListener;
-
-        document.addEventListener = function(evt, handler, capture) {
-            cordovaAddEventListener(evt, handler, capture);
-
-            if (evt === 'resume' && lastResumeEvent) {
-                handler(lastResumeEvent);
-            }
-        };
-
        // Let native code know we are all done on the JS side.
        // Native code will then un-hide the WebView.
        channel.onCordovaReady.subscribe(function() {
@@ -112,10 +96,6 @@ function onMessageFromNative(msg) {
                    }
                    msg.pendingResult.result = res;
                }
-
-                // Save the plugin result so that it can be delivered to the js
-                // even if they miss the initial firing of the event
-                lastResumeEvent = msg;
            }
            cordova.fireDocumentEvent(action, msg);
            break;
@@ -108,20 +108,17 @@ public class CordovaInterfaceImpl implements CordovaInterface {
            // If there was no Activity result, we still need to send out the resume event if the
            // Activity was destroyed by the OS
            activityWasDestroyed = false;
-            if(pluginManager != null)
-            {
-                CoreAndroid appPlugin = (CoreAndroid) pluginManager.getPlugin(CoreAndroid.PLUGIN_NAME);
-                if(appPlugin != null) {
-                    JSONObject obj = new JSONObject();
-                    try {
-                        obj.put("action", "resume");
-                    } catch (JSONException e) {
-                        LOG.e(TAG, "Failed to create event message", e);
-                    }
-                    appPlugin.sendResumeEvent(new PluginResult(PluginResult.Status.OK, obj));
-                }
-            }

+            CoreAndroid appPlugin = (CoreAndroid) pluginManager.getPlugin(CoreAndroid.PLUGIN_NAME);
+            if(appPlugin != null) {
+                JSONObject obj = new JSONObject();
+                try {
+                    obj.put("action", "resume");
+                } catch (JSONException e) {
+                    LOG.e(TAG, "Failed to create event message", e);
+                }
+                appPlugin.sendResumeEvent(new PluginResult(PluginResult.Status.OK, obj));
+            }
        }
    }

@@ -172,10 +169,8 @@ public class CordovaInterfaceImpl implements CordovaInterface {
            String serviceName = activityResultCallback.getServiceName();
            outState.putString("callbackService", serviceName);
        }
-        if(pluginManager != null){
-            outState.putBundle("plugin", pluginManager.onSaveInstanceState());
-        }

+        outState.putBundle("plugin", pluginManager.onSaveInstanceState());
    }

    /**
@@ -31,7 +31,7 @@ import android.webkit.WebChromeClient.CustomViewCallback;
 * are not expected to implement it.
 */
 public interface CordovaWebView {
-    public static final String CORDOVA_VERSION = "5.1.1";
+    public static final String CORDOVA_VERSION = "5.1.0";

    void init(CordovaInterface cordova, List<PluginEntry> pluginEntries, CordovaPreferences preferences);

@@ -1 +0,0 @@
-../nopt/bin/nopt.js
@@ -1 +0,0 @@
-../semver/bin/semver
@@ -1 +0,0 @@
-../shelljs/bin/shjs
@@ -1,4 +0,0 @@
-{
-  "laxcomma": true,
-  "asi": true
-}
@@ -1,23 +0,0 @@
-
-0.3.1 / 2016-01-14
-==================
-
-  * add MIT LICENSE file (#23, @kasicka)
-  * preserve chaining after redundant style-method calls (#19, @drewblaisdell)
-  * package: add "license" field (#16, @BenjaminTsai)
-
-0.3.0 / 2014-05-09
-==================
-
-  * package: remove "test" script and "devDependencies"
-  * package: remove "engines" section
-  * pacakge: remove "bin" section
-  * package: beautify
-  * examples: remove `starwars` example (#15)
-  * Documented goto, horizontalAbsolute, and eraseLine methods in README.md (#12, @Jammerwoch)
-  * add `.jshintrc` file
-
-< 0.3.0
-=======
-
-  * Prehistoric
@@ -1,24 +0,0 @@
-(The MIT License)
-
-Copyright (c) 2012 Nathan Rajlich <nathan@tootallnate.net>
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
@@ -1,98 +0,0 @@
-ansi.js
-=========
-### Advanced ANSI formatting tool for Node.js
-
-`ansi.js` is a module for Node.js that provides an easy-to-use API for
-writing ANSI escape codes to `Stream` instances. ANSI escape codes are used to do
-fancy things in a terminal window, like render text in colors, delete characters,
-lines, the entire window, or hide and show the cursor, and lots more!
-
-#### Features:
-
- * 256 color support for the terminal!
- * Make a beep sound from your terminal!
- * Works with *any* writable `Stream` instance.
- * Allows you to move the cursor anywhere on the terminal window.
- * Allows you to delete existing contents from the terminal window.
- * Allows you to hide and show the cursor.
- * Converts CSS color codes and RGB values into ANSI escape codes.
- * Low-level; you are in control of when escape codes are used, it's not abstracted.
-
-
-Installation
------------
-
-Install with `npm`:
-
-``` bash
-$ npm install ansi
-```
-
-
-Example
-------
-
-``` js
-var ansi = require('ansi')
-  , cursor = ansi(process.stdout)
-
-// You can chain your calls forever:
-cursor
-  .red()                 // Set font color to red
-  .bg.grey()             // Set background color to grey
-  .write('Hello World!') // Write 'Hello World!' to stdout
-  .bg.reset()            // Reset the bgcolor before writing the trailing \n,
-                         //      to avoid Terminal glitches
-  .write('\n')           // And a final \n to wrap things up
-
-// Rendering modes are persistent:
-cursor.hex('#660000').bold().underline()
-
-// You can use the regular logging functions, text will be green:
-console.log('This is blood red, bold text')
-
-// To reset just the foreground color:
-cursor.fg.reset()
-
-console.log('This will still be bold')
-
-// to go to a location (x,y) on the console
-// note: 1-indexed, not 0-indexed:
-cursor.goto(10, 5).write('Five down, ten over')
-
-// to clear the current line:
-cursor.horizontalAbsolute(0).eraseLine().write('Starting again')
-
-// to go to a different column on the current line:
-cursor.horizontalAbsolute(5).write('column five')
-
-// Clean up after yourself!
-cursor.reset()
-```
-
-
-License
-------
-
-(The MIT License)
-
-Copyright (c) 2012 Nathan Rajlich &lt;nathan@tootallnate.net&gt;
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -1,16 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * Invokes the terminal "beep" sound once per second on every exact second.
- */
-
-process.title = 'beep'
-
-var cursor = require('../../')(process.stdout)
-
-function beep () {
-  cursor.beep()
-  setTimeout(beep, 1000 - (new Date()).getMilliseconds())
-}
-
-setTimeout(beep, 1000 - (new Date()).getMilliseconds())
@@ -1,15 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * Like GNU ncurses "clear" command.
- * https://github.com/mscdex/node-ncurses/blob/master/deps/ncurses/progs/clear.c
- */
-
-process.title = 'clear'
-
-function lf () { return '\n' }
-
-require('../../')(process.stdout)
-  .write(Array.apply(null, Array(process.stdout.getWindowSize()[1])).map(lf).join(''))
-  .eraseData(2)
-  .goto(1, 1)
@@ -1,32 +0,0 @@
-#!/usr/bin/env node
-
-var tty = require('tty')
-var cursor = require('../')(process.stdout)
-
-// listen for the queryPosition report on stdin
-process.stdin.resume()
-raw(true)
-
-process.stdin.once('data', function (b) {
-  var match = /\[(\d+)\;(\d+)R$/.exec(b.toString())
-  if (match) {
-    var xy = match.slice(1, 3).reverse().map(Number)
-    console.error(xy)
-  }
-
-  // cleanup and close stdin
-  raw(false)
-  process.stdin.pause()
-})
-
-
-// send the query position request code to stdout
-cursor.queryPosition()
-
-function raw (mode) {
-  if (process.stdin.setRawMode) {
-    process.stdin.setRawMode(mode)
-  } else {
-    tty.setRawMode(mode)
-  }
-}
@@ -1,87 +0,0 @@
-#!/usr/bin/env node
-
-var assert = require('assert')
-  , ansi = require('../../')
-
-function Progress (stream, width) {
-  this.cursor = ansi(stream)
-  this.delta = this.cursor.newlines
-  this.width = width | 0 || 10
-  this.open = '['
-  this.close = ']'
-  this.complete = '█'
-  this.incomplete = '_'
-
-  // initial render
-  this.progress = 0
-}
-
-Object.defineProperty(Progress.prototype, 'progress', {
-    get: get
-  , set: set
-  , configurable: true
-  , enumerable: true
-})
-
-function get () {
-  return this._progress
-}
-
-function set (v) {
-  this._progress = Math.max(0, Math.min(v, 100))
-
-  var w = this.width - this.complete.length - this.incomplete.length
-    , n = w * (this._progress / 100) | 0
-    , i = w - n
-    , com = c(this.complete, n)
-    , inc = c(this.incomplete, i)
-    , delta = this.cursor.newlines - this.delta
-
-  assert.equal(com.length + inc.length, w)
-
-  if (delta > 0) {
-    this.cursor.up(delta)
-    this.delta = this.cursor.newlines
-  }
-
-  this.cursor
-    .horizontalAbsolute(0)
-    .eraseLine(2)
-    .fg.white()
-    .write(this.open)
-    .fg.grey()
-    .bold()
-    .write(com)
-    .resetBold()
-    .write(inc)
-    .fg.white()
-    .write(this.close)
-    .fg.reset()
-    .write('\n')
-}
-
-function c (char, length) {
-  return Array.apply(null, Array(length)).map(function () {
-    return char
-  }).join('')
-}
-
-
-
-
-// Usage
-var width = parseInt(process.argv[2], 10) || process.stdout.getWindowSize()[0] / 2
-  , p = new Progress(process.stdout, width)
-
-;(function tick () {
-  p.progress += Math.random() * 5
-  p.cursor
-    .eraseLine(2)
-    .write('Progress: ')
-    .bold().write(p.progress.toFixed(2))
-    .write('%')
-    .resetBold()
-    .write('\n')
-  if (p.progress < 100)
-    setTimeout(tick, 100)
-})()
@@ -1,405 +0,0 @@
-
-/**
- * References:
- *
- *   - http://en.wikipedia.org/wiki/ANSI_escape_code
- *   - http://www.termsys.demon.co.uk/vtansi.htm
- *
- */
-
-/**
- * Module dependencies.
- */
-
-var emitNewlineEvents = require('./newlines')
-  , prefix = '\x1b[' // For all escape codes
-  , suffix = 'm'     // Only for color codes
-
-/**
- * The ANSI escape sequences.
- */
-
-var codes = {
-    up: 'A'
-  , down: 'B'
-  , forward: 'C'
-  , back: 'D'
-  , nextLine: 'E'
-  , previousLine: 'F'
-  , horizontalAbsolute: 'G'
-  , eraseData: 'J'
-  , eraseLine: 'K'
-  , scrollUp: 'S'
-  , scrollDown: 'T'
-  , savePosition: 's'
-  , restorePosition: 'u'
-  , queryPosition: '6n'
-  , hide: '?25l'
-  , show: '?25h'
-}
-
-/**
- * Rendering ANSI codes.
- */
-
-var styles = {
-    bold: 1
-  , italic: 3
-  , underline: 4
-  , inverse: 7
-}
-
-/**
- * The negating ANSI code for the rendering modes.
- */
-
-var reset = {
-    bold: 22
-  , italic: 23
-  , underline: 24
-  , inverse: 27
-}
-
-/**
- * The standard, styleable ANSI colors.
- */
-
-var colors = {
-    white: 37
-  , black: 30
-  , blue: 34
-  , cyan: 36
-  , green: 32
-  , magenta: 35
-  , red: 31
-  , yellow: 33
-  , grey: 90
-  , brightBlack: 90
-  , brightRed: 91
-  , brightGreen: 92
-  , brightYellow: 93
-  , brightBlue: 94
-  , brightMagenta: 95
-  , brightCyan: 96
-  , brightWhite: 97
-}
-
-
-/**
- * Creates a Cursor instance based off the given `writable stream` instance.
- */
-
-function ansi (stream, options) {
-  if (stream._ansicursor) {
-    return stream._ansicursor
-  } else {
-    return stream._ansicursor = new Cursor(stream, options)
-  }
-}
-module.exports = exports = ansi
-
-/**
- * The `Cursor` class.
- */
-
-function Cursor (stream, options) {
-  if (!(this instanceof Cursor)) {
-    return new Cursor(stream, options)
-  }
-  if (typeof stream != 'object' || typeof stream.write != 'function') {
-    throw new Error('a valid Stream instance must be passed in')
-  }
-
-  // the stream to use
-  this.stream = stream
-
-  // when 'enabled' is false then all the functions are no-ops except for write()
-  this.enabled = options && options.enabled
-  if (typeof this.enabled === 'undefined') {
-    this.enabled = stream.isTTY
-  }
-  this.enabled = !!this.enabled
-
-  // then `buffering` is true, then `write()` calls are buffered in
-  // memory until `flush()` is invoked
-  this.buffering = !!(options && options.buffering)
-  this._buffer = []
-
-  // controls the foreground and background colors
-  this.fg = this.foreground = new Colorer(this, 0)
-  this.bg = this.background = new Colorer(this, 10)
-
-  // defaults
-  this.Bold = false
-  this.Italic = false
-  this.Underline = false
-  this.Inverse = false
-
-  // keep track of the number of "newlines" that get encountered
-  this.newlines = 0
-  emitNewlineEvents(stream)
-  stream.on('newline', function () {
-    this.newlines++
-  }.bind(this))
-}
-exports.Cursor = Cursor
-
-/**
- * Helper function that calls `write()` on the underlying Stream.
- * Returns `this` instead of the write() return value to keep
- * the chaining going.
- */
-
-Cursor.prototype.write = function (data) {
-  if (this.buffering) {
-    this._buffer.push(arguments)
-  } else {
-    this.stream.write.apply(this.stream, arguments)
-  }
-  return this
-}
-
-/**
- * Buffer `write()` calls into memory.
- *
- * @api public
- */
-
-Cursor.prototype.buffer = function () {
-  this.buffering = true
-  return this
-}
-
-/**
- * Write out the in-memory buffer.
- *
- * @api public
- */
-
-Cursor.prototype.flush = function () {
-  this.buffering = false
-  var str = this._buffer.map(function (args) {
-    if (args.length != 1) throw new Error('unexpected args length! ' + args.length);
-    return args[0];
-  }).join('');
-  this._buffer.splice(0); // empty
-  this.write(str);
-  return this
-}
-
-
-/**
- * The `Colorer` class manages both the background and foreground colors.
- */
-
-function Colorer (cursor, base) {
-  this.current = null
-  this.cursor = cursor
-  this.base = base
-}
-exports.Colorer = Colorer
-
-/**
- * Write an ANSI color code, ensuring that the same code doesn't get rewritten.
- */
-
-Colorer.prototype._setColorCode = function setColorCode (code) {
-  var c = String(code)
-  if (this.current === c) return
-  this.cursor.enabled && this.cursor.write(prefix + c + suffix)
-  this.current = c
-  return this
-}
-
-
-/**
- * Set up the positional ANSI codes.
- */
-
-Object.keys(codes).forEach(function (name) {
-  var code = String(codes[name])
-  Cursor.prototype[name] = function () {
-    var c = code
-    if (arguments.length > 0) {
-      c = toArray(arguments).map(Math.round).join(';') + code
-    }
-    this.enabled && this.write(prefix + c)
-    return this
-  }
-})
-
-/**
- * Set up the functions for the rendering ANSI codes.
- */
-
-Object.keys(styles).forEach(function (style) {
-  var name = style[0].toUpperCase() + style.substring(1)
-    , c = styles[style]
-    , r = reset[style]
-
-  Cursor.prototype[style] = function () {
-    if (this[name]) return this
-    this.enabled && this.write(prefix + c + suffix)
-    this[name] = true
-    return this
-  }
-
-  Cursor.prototype['reset' + name] = function () {
-    if (!this[name]) return this
-    this.enabled && this.write(prefix + r + suffix)
-    this[name] = false
-    return this
-  }
-})
-
-/**
- * Setup the functions for the standard colors.
- */
-
-Object.keys(colors).forEach(function (color) {
-  var code = colors[color]
-
-  Colorer.prototype[color] = function () {
-    this._setColorCode(this.base + code)
-    return this.cursor
-  }
-
-  Cursor.prototype[color] = function () {
-    return this.foreground[color]()
-  }
-})
-
-/**
- * Makes a beep sound!
- */
-
-Cursor.prototype.beep = function () {
-  this.enabled && this.write('\x07')
-  return this
-}
-
-/**
- * Moves cursor to specific position
- */
-
-Cursor.prototype.goto = function (x, y) {
-  x = x | 0
-  y = y | 0
-  this.enabled && this.write(prefix + y + ';' + x + 'H')
-  return this
-}
-
-/**
- * Resets the color.
- */
-
-Colorer.prototype.reset = function () {
-  this._setColorCode(this.base + 39)
-  return this.cursor
-}
-
-/**
- * Resets all ANSI formatting on the stream.
- */
-
-Cursor.prototype.reset = function () {
-  this.enabled && this.write(prefix + '0' + suffix)
-  this.Bold = false
-  this.Italic = false
-  this.Underline = false
-  this.Inverse = false
-  this.foreground.current = null
-  this.background.current = null
-  return this
-}
-
-/**
- * Sets the foreground color with the given RGB values.
- * The closest match out of the 216 colors is picked.
- */
-
-Colorer.prototype.rgb = function (r, g, b) {
-  var base = this.base + 38
-    , code = rgb(r, g, b)
-  this._setColorCode(base + ';5;' + code)
-  return this.cursor
-}
-
-/**
- * Same as `cursor.fg.rgb(r, g, b)`.
- */
-
-Cursor.prototype.rgb = function (r, g, b) {
-  return this.foreground.rgb(r, g, b)
-}
-
-/**
- * Accepts CSS color codes for use with ANSI escape codes.
- * For example: `#FF000` would be bright red.
- */
-
-Colorer.prototype.hex = function (color) {
-  return this.rgb.apply(this, hex(color))
-}
-
-/**
- * Same as `cursor.fg.hex(color)`.
- */
-
-Cursor.prototype.hex = function (color) {
-  return this.foreground.hex(color)
-}
-
-
-// UTIL FUNCTIONS //
-
-/**
- * Translates a 255 RGB value to a 0-5 ANSI RGV value,
- * then returns the single ANSI color code to use.
- */
-
-function rgb (r, g, b) {
-  var red = r / 255 * 5
-    , green = g / 255 * 5
-    , blue = b / 255 * 5
-  return rgb5(red, green, blue)
-}
-
-/**
- * Turns rgb 0-5 values into a single ANSI color code to use.
- */
-
-function rgb5 (r, g, b) {
-  var red = Math.round(r)
-    , green = Math.round(g)
-    , blue = Math.round(b)
-  return 16 + (red*36) + (green*6) + blue
-}
-
-/**
- * Accepts a hex CSS color code string (# is optional) and
- * translates it into an Array of 3 RGB 0-255 values, which
- * can then be used with rgb().
- */
-
-function hex (color) {
-  var c = color[0] === '#' ? color.substring(1) : color
-    , r = c.substring(0, 2)
-    , g = c.substring(2, 4)
-    , b = c.substring(4, 6)
-  return [parseInt(r, 16), parseInt(g, 16), parseInt(b, 16)]
-}
-
-/**
- * Turns an array-like object into a real array.
- */
-
-function toArray (a) {
-  var i = 0
-    , l = a.length
-    , rtn = []
-  for (; i<l; i++) {
-    rtn.push(a[i])
-  }
-  return rtn
-}
@@ -1,71 +0,0 @@
-
-/**
- * Accepts any node Stream instance and hijacks its "write()" function,
- * so that it can count any newlines that get written to the output.
- *
- * When a '\n' byte is encountered, then a "newline" event will be emitted
- * on the stream, with no arguments. It is up to the listeners to determine
- * any necessary deltas required for their use-case.
- *
- * Ex:
- *
- *   var cursor = ansi(process.stdout)
- *     , ln = 0
- *   process.stdout.on('newline', function () {
- *    ln++
- *   })
- */
-
-/**
- * Module dependencies.
- */
-
-var assert = require('assert')
-var NEWLINE = '\n'.charCodeAt(0)
-
-function emitNewlineEvents (stream) {
-  if (stream._emittingNewlines) {
-    // already emitting newline events
-    return
-  }
-
-  var write = stream.write
-
-  stream.write = function (data) {
-    // first write the data
-    var rtn = write.apply(stream, arguments)
-
-    if (stream.listeners('newline').length > 0) {
-      var len = data.length
-        , i = 0
-      // now try to calculate any deltas
-      if (typeof data == 'string') {
-        for (; i<len; i++) {
-          processByte(stream, data.charCodeAt(i))
-        }
-      } else {
-        // buffer
-        for (; i<len; i++) {
-          processByte(stream, data[i])
-        }
-      }
-    }
-
-    return rtn
-  }
-
-  stream._emittingNewlines = true
-}
-module.exports = emitNewlineEvents
-
-
-/**
- * Processes an individual byte being written to a stream
- */
-
-function processByte (stream, b) {
-  assert.equal(typeof b, 'number')
-  if (b === NEWLINE) {
-    stream.emit('newline')
-  }
-}
@@ -1,85 +0,0 @@
-{
-  "_args": [
-    [
-      "ansi@^0.3.1",
-      "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common"
-    ]
-  ],
-  "_from": "ansi@>=0.3.1 <0.4.0",
-  "_id": "ansi@0.3.1",
-  "_inCache": true,
-  "_installable": true,
-  "_location": "/ansi",
-  "_nodeVersion": "5.3.0",
-  "_npmUser": {
-    "email": "nathan@tootallnate.net",
-    "name": "tootallnate"
-  },
-  "_npmVersion": "3.3.12",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "ansi",
-    "raw": "ansi@^0.3.1",
-    "rawSpec": "^0.3.1",
-    "scope": null,
-    "spec": ">=0.3.1 <0.4.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/cordova-common"
-  ],
-  "_resolved": "http://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz",
-  "_shasum": "0c42d4fb17160d5a9af1e484bace1c66922c1b21",
-  "_shrinkwrap": null,
-  "_spec": "ansi@^0.3.1",
-  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common",
-  "author": {
-    "email": "nathan@tootallnate.net",
-    "name": "Nathan Rajlich",
-    "url": "http://tootallnate.net"
-  },
-  "bugs": {
-    "url": "https://github.com/TooTallNate/ansi.js/issues"
-  },
-  "dependencies": {},
-  "description": "Advanced ANSI formatting tool for Node.js",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "0c42d4fb17160d5a9af1e484bace1c66922c1b21",
-    "tarball": "http://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz"
-  },
-  "gitHead": "4d0d4af94e0bdaa648bd7262acd3bde4b98d5246",
-  "homepage": "https://github.com/TooTallNate/ansi.js#readme",
-  "keywords": [
-    "256",
-    "ansi",
-    "color",
-    "cursor",
-    "formatting",
-    "rgb",
-    "stream",
-    "terminal"
-  ],
-  "license": "MIT",
-  "main": "./lib/ansi.js",
-  "maintainers": [
-    {
-      "name": "TooTallNate",
-      "email": "nathan@tootallnate.net"
-    },
-    {
-      "name": "tootallnate",
-      "email": "nathan@tootallnate.net"
-    }
-  ],
-  "name": "ansi",
-  "optionalDependencies": {},
-  "readme": "ERROR: No README data found!",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/TooTallNate/ansi.js.git"
-  },
-  "scripts": {},
-  "version": "0.3.1"
-}
@@ -1,104 +0,0 @@
-{
-  "_args": [
-    [
-      "brace-expansion@^1.0.0",
-      "/Users/steveng/repo/cordova/cordova-android/node_modules/minimatch"
-    ]
-  ],
-  "_from": "brace-expansion@>=1.0.0 <2.0.0",
-  "_id": "brace-expansion@1.1.3",
-  "_inCache": true,
-  "_installable": true,
-  "_location": "/brace-expansion",
-  "_nodeVersion": "5.5.0",
-  "_npmOperationalInternal": {
-    "host": "packages-6-west.internal.npmjs.com",
-    "tmp": "tmp/brace-expansion-1.1.3.tgz_1455216688668_0.948847763473168"
-  },
-  "_npmUser": {
-    "email": "julian@juliangruber.com",
-    "name": "juliangruber"
-  },
-  "_npmVersion": "3.3.12",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "brace-expansion",
-    "raw": "brace-expansion@^1.0.0",
-    "rawSpec": "^1.0.0",
-    "scope": null,
-    "spec": ">=1.0.0 <2.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/minimatch"
-  ],
-  "_resolved": "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.3.tgz",
-  "_shasum": "46bff50115d47fc9ab89854abb87d98078a10991",
-  "_shrinkwrap": null,
-  "_spec": "brace-expansion@^1.0.0",
-  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/minimatch",
-  "author": {
-    "email": "mail@juliangruber.com",
-    "name": "Julian Gruber",
-    "url": "http://juliangruber.com"
-  },
-  "bugs": {
-    "url": "https://github.com/juliangruber/brace-expansion/issues"
-  },
-  "dependencies": {
-    "balanced-match": "^0.3.0",
-    "concat-map": "0.0.1"
-  },
-  "description": "Brace expansion as known from sh/bash",
-  "devDependencies": {
-    "tape": "4.4.0"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "46bff50115d47fc9ab89854abb87d98078a10991",
-    "tarball": "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.3.tgz"
-  },
-  "gitHead": "f0da1bb668e655f67b6b2d660c6e1c19e2a6f231",
-  "homepage": "https://github.com/juliangruber/brace-expansion",
-  "keywords": [],
-  "license": "MIT",
-  "main": "index.js",
-  "maintainers": [
-    {
-      "name": "juliangruber",
-      "email": "julian@juliangruber.com"
-    },
-    {
-      "name": "isaacs",
-      "email": "isaacs@npmjs.com"
-    }
-  ],
-  "name": "brace-expansion",
-  "optionalDependencies": {},
-  "readme": "ERROR: No README data found!",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/juliangruber/brace-expansion.git"
-  },
-  "scripts": {
-    "gentest": "bash test/generate.sh",
-    "test": "tape test/*.js"
-  },
-  "testling": {
-    "browsers": [
-      "android-browser/4.2..latest",
-      "chrome/25..latest",
-      "chrome/canary",
-      "firefox/20..latest",
-      "firefox/nightly",
-      "ie/8..latest",
-      "ipad/6.0..latest",
-      "iphone/6.0..latest",
-      "opera/12..latest",
-      "opera/next",
-      "safari/5.1..latest"
-    ],
-    "files": "test/*.js"
-  },
-  "version": "1.1.3"
-}
@@ -107,10 +107,6 @@ Usage:
 ```
 var superspawn = require('cordova-common').superspawn;
 superspawn.spawn('adb', ['devices'])
-.progress(function(data){
-    if (data.stderr)
-        console.error('"adb devices" raised an error: ' + data.stderr);
-})
 .then(function(devices){
    // Do something...
 })
@@ -20,14 +20,6 @@
 -->
 # Cordova-common Release Notes

-### 1.1.0 (Feb 16, 2016)
-* CB-10482 Remove references to windows8 from cordova-lib/cli
-* CB-10430 Adds forwardEvents method to easily connect two EventEmitters
-* CB-10176 Adds CordovaLogger class, based on logger module from cordova-cli
-* CB-10052 Expose child process' io streams via promise progress notification
-* CB-10497 Prefer .bat over .cmd on windows platform
-* CB-9984 Bumps plist version and fixes failing cordova-common test
-
 ### 1.0.0 (Oct 29, 2015)

 * CB-9890 Documents cordova-common
@@ -26,7 +26,6 @@ exports = module.exports = {

    ActionStack: require('./src/ActionStack'),
    CordovaError: require('./src/CordovaError/CordovaError'),
-    CordovaLogger: require('./src/CordovaLogger'),
    CordovaExternalToolErrorContext: require('./src/CordovaError/CordovaExternalToolErrorContext'),
    PlatformJson: require('./src/PlatformJson'),
    ConfigParser: require('./src/ConfigParser/ConfigParser.js'),
@@ -0,0 +1,3 @@
+[remote "github"]
+	push = +refs/heads/master:refs/heads/gh-pages
+	push = +refs/heads/master:refs/heads/master
@@ -0,0 +1,8 @@
+ui: jasmine2
+browsers:
+  - name: chrome
+    version: 27
+  - name: ie
+    version: latest
+  - name: iphone
+    version: 6.1
@@ -0,0 +1,2 @@
+sauce_username: peterolson
+sauce_key: 3553a315-10c0-4661-9d8e-7150d87064c7
@@ -294,7 +294,7 @@ var bigInt = (function (undefined) {
    function multiplyKaratsuba(x, y) {
        var n = Math.max(x.length, y.length);
        
-        if (n <= 30) return multiplyLong(x, y);
+        if (n <= 400) return multiplyLong(x, y);
        n = Math.ceil(n / 2);

        var b = x.slice(n),
@@ -306,15 +306,7 @@ var bigInt = (function (undefined) {
            bd = multiplyKaratsuba(b, d),
            abcd = multiplyKaratsuba(addAny(a, b), addAny(c, d));

-        var product = addAny(addAny(ac, shiftLeft(subtract(subtract(abcd, ac), bd), n)), shiftLeft(bd, 2 * n));
-        trim(product);
-        return product;
-    }
-
-    // The following function is derived from a surface fit of a graph plotting the performance difference
-    // between long multiplication and karatsuba multiplication versus the lengths of the two arrays.
-    function useKaratsuba(l1, l2) {
-        return -0.012 * l1 - 0.012 * l2 + 0.000015 * l1 * l2 > 0;
+        return addAny(addAny(ac, shiftLeft(subtract(subtract(abcd, ac), bd), n)), shiftLeft(bd, 2 * n));
    }

    BigInteger.prototype.multiply = function (v) {
@@ -332,7 +324,7 @@ var bigInt = (function (undefined) {
            }
            b = smallToArray(abs);
        }
-        if (useKaratsuba(a.length, b.length)) // Karatsuba is only faster for certain array sizes
+        if (a.length + b.length > 4000) // Karatsuba is only faster for sufficiently large inputs
            return new BigInteger(multiplyKaratsuba(a, b), sign);
        return new BigInteger(multiplyLong(a, b), sign);
    };
@@ -0,0 +1,24 @@
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to <http://unlicense.org>
@@ -1,53 +1,32 @@
 {
-  "_args": [
-    [
-      "big-integer@^1.6.7",
-      "/Users/steveng/repo/cordova/cordova-android/node_modules/bplist-parser"
-    ]
-  ],
-  "_from": "big-integer@>=1.6.7 <2.0.0",
-  "_id": "big-integer@1.6.12",
-  "_inCache": true,
-  "_installable": true,
-  "_location": "/big-integer",
-  "_nodeVersion": "0.12.3",
-  "_npmOperationalInternal": {
-    "host": "packages-6-west.internal.npmjs.com",
-    "tmp": "tmp/big-integer-1.6.12.tgz_1455702804335_0.11810904298909009"
-  },
-  "_npmUser": {
-    "email": "peter.e.c.olson+npm@gmail.com",
-    "name": "peterolson"
-  },
-  "_npmVersion": "2.9.1",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "big-integer",
-    "raw": "big-integer@^1.6.7",
-    "rawSpec": "^1.6.7",
-    "scope": null,
-    "spec": ">=1.6.7 <2.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/bplist-parser"
-  ],
-  "_resolved": "http://registry.npmjs.org/big-integer/-/big-integer-1.6.12.tgz",
-  "_shasum": "39afcddafcd5c4480864efb757337d508938bb26",
-  "_shrinkwrap": null,
-  "_spec": "big-integer@^1.6.7",
-  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/bplist-parser",
+  "name": "big-integer",
+  "version": "1.6.10",
  "author": {
-    "email": "peter.e.c.olson+npm@gmail.com",
-    "name": "Peter Olson"
+    "name": "Peter Olson",
+    "email": "peter.e.c.olson+npm@gmail.com"
  },
-  "bin": {},
-  "bugs": {
-    "url": "https://github.com/peterolson/BigInteger.js/issues"
-  },
-  "contributors": [],
-  "dependencies": {},
  "description": "An arbitrary length integer library for Javascript",
+  "contributors": [],
+  "bin": {},
+  "scripts": {
+    "test": "karma start my.conf.js"
+  },
+  "main": "./BigInteger",
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/peterolson/BigInteger.js.git"
+  },
+  "keywords": [
+    "math",
+    "big",
+    "bignum",
+    "bigint",
+    "biginteger",
+    "integer",
+    "arbitrary",
+    "precision",
+    "arithmetic"
+  ],
  "devDependencies": {
    "coveralls": "^2.11.4",
    "jasmine": "2.1.x",
@@ -57,44 +36,35 @@
    "karma-jasmine": "^0.3.6",
    "karma-phantomjs-launcher": "~0.1"
  },
-  "directories": {},
-  "dist": {
-    "shasum": "39afcddafcd5c4480864efb757337d508938bb26",
-    "tarball": "http://registry.npmjs.org/big-integer/-/big-integer-1.6.12.tgz"
-  },
+  "license": "Unlicense",
  "engines": {
    "node": ">=0.6"
  },
-  "gitHead": "56f449108e31542f939e701f1fe562a46e6c1fab",
+  "gitHead": "e9a739fa1a15fe3da4eb302ea7072112ec91e318",
+  "bugs": {
+    "url": "https://github.com/peterolson/BigInteger.js/issues"
+  },
  "homepage": "https://github.com/peterolson/BigInteger.js#readme",
-  "keywords": [
-    "arbitrary",
-    "arithmetic",
-    "big",
-    "bigint",
-    "biginteger",
-    "bignum",
-    "integer",
-    "math",
-    "precision"
-  ],
-  "license": "Unlicense",
-  "main": "./BigInteger",
+  "_id": "big-integer@1.6.10",
+  "_shasum": "0f05dcce24278bc33bd8eb9297f4858acacb1fea",
+  "_from": "big-integer@>=1.6.7 <2.0.0",
+  "_npmVersion": "2.9.1",
+  "_nodeVersion": "0.12.3",
+  "_npmUser": {
+    "name": "peterolson",
+    "email": "peter.e.c.olson+npm@gmail.com"
+  },
  "maintainers": [
    {
      "name": "peterolson",
      "email": "peter.e.c.olson+npm@gmail.com"
    }
  ],
-  "name": "big-integer",
-  "optionalDependencies": {},
-  "readme": "ERROR: No README data found!",
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@github.com/peterolson/BigInteger.js.git"
+  "dist": {
+    "shasum": "0f05dcce24278bc33bd8eb9297f4858acacb1fea",
+    "tarball": "http://registry.npmjs.org/big-integer/-/big-integer-1.6.10.tgz"
  },
-  "scripts": {
-    "test": "karma start my.conf.js"
-  },
-  "version": "1.6.12"
+  "directories": {},
+  "_resolved": "http://registry.npmjs.org/big-integer/-/big-integer-1.6.10.tgz",
+  "readme": "ERROR: No README data found!"
 }
@@ -1,81 +1,56 @@
 {
-  "_args": [
-    [
-      "bplist-parser@^0.1.0",
-      "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common"
-    ]
-  ],
-  "_from": "bplist-parser@>=0.1.0 <0.2.0",
-  "_id": "bplist-parser@0.1.1",
-  "_inCache": true,
-  "_installable": true,
-  "_location": "/bplist-parser",
-  "_nodeVersion": "5.1.0",
-  "_npmUser": {
-    "email": "joe@fernsroth.com",
-    "name": "joeferner"
+  "name": "bplist-parser",
+  "version": "0.1.1",
+  "description": "Binary plist parser.",
+  "main": "bplistParser.js",
+  "scripts": {
+    "test": "./node_modules/nodeunit/bin/nodeunit test"
  },
-  "_npmVersion": "3.4.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "bplist-parser",
-    "raw": "bplist-parser@^0.1.0",
-    "rawSpec": "^0.1.0",
-    "scope": null,
-    "spec": ">=0.1.0 <0.2.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/cordova-common"
+  "keywords": [
+    "bplist",
+    "plist",
+    "parser"
  ],
-  "_resolved": "http://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz",
-  "_shasum": "d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6",
-  "_shrinkwrap": null,
-  "_spec": "bplist-parser@^0.1.0",
-  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common",
  "author": {
-    "email": "joe.ferner@nearinfinity.com",
-    "name": "Joe Ferner"
+    "name": "Joe Ferner",
+    "email": "joe.ferner@nearinfinity.com"
  },
-  "bugs": {
-    "url": "https://github.com/nearinfinity/node-bplist-parser/issues"
+  "license": "MIT",
+  "devDependencies": {
+    "nodeunit": "~0.9.1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/nearinfinity/node-bplist-parser.git"
  },
  "dependencies": {
    "big-integer": "^1.6.7"
  },
-  "description": "Binary plist parser.",
-  "devDependencies": {
-    "nodeunit": "~0.9.1"
+  "gitHead": "c4f22650de2cc95edd21a6e609ff0654a2b951bd",
+  "bugs": {
+    "url": "https://github.com/nearinfinity/node-bplist-parser/issues"
+  },
+  "homepage": "https://github.com/nearinfinity/node-bplist-parser#readme",
+  "_id": "bplist-parser@0.1.1",
+  "_shasum": "d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6",
+  "_from": "bplist-parser@>=0.1.0 <0.2.0",
+  "_npmVersion": "3.4.0",
+  "_nodeVersion": "5.1.0",
+  "_npmUser": {
+    "name": "joeferner",
+    "email": "joe@fernsroth.com"
  },
-  "directories": {},
  "dist": {
    "shasum": "d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6",
    "tarball": "http://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz"
  },
-  "gitHead": "c4f22650de2cc95edd21a6e609ff0654a2b951bd",
-  "homepage": "https://github.com/nearinfinity/node-bplist-parser#readme",
-  "keywords": [
-    "bplist",
-    "parser",
-    "plist"
-  ],
-  "license": "MIT",
-  "main": "bplistParser.js",
  "maintainers": [
    {
      "name": "joeferner",
      "email": "joe@fernsroth.com"
    }
  ],
-  "name": "bplist-parser",
-  "optionalDependencies": {},
-  "readme": "ERROR: No README data found!",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/nearinfinity/node-bplist-parser.git"
-  },
-  "scripts": {
-    "test": "./node_modules/nodeunit/bin/nodeunit test"
-  },
-  "version": "0.1.1"
+  "directories": {},
+  "_resolved": "http://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz",
+  "readme": "ERROR: No README data found!"
 }
@@ -159,7 +159,7 @@ var map = {
    'de.fastr.phonegap.plugins.downloader' : 'cordova-plugin-fastrde-downloader',
    'de.fastr.phonegap.plugins.injectView' : 'cordova-plugin-fastrde-injectview',
    'de.fastr.phonegap.plugins.CheckGPS' : 'cordova-plugin-fastrde-checkgps',
-    'de.fastr.phonegap.plugins.md5chksum' : 'cordova-plugin-fastrde-md5',
+    'de.fastr.phonegap.plugins.md5chksum' : ' cordova-plugin-fastrde-md5',
    'io.repro.cordova' : 'cordova-plugin-repro',
    're.notifica.cordova': 'cordova-plugin-notificare-push',
    'com.megster.cordova.ble': 'cordova-plugin-ble-central',
@@ -188,10 +188,7 @@ var map = {
    'com.chariotsolutions.nfc.plugin': 'phonegap-nfc',
    'com.samz.mixpanel': 'cordova-plugin-mixpanel',
    'de.appplant.cordova.common.RegisterUserNotificationSettings': 'cordova-plugin-registerusernotificationsettings',
-    'plugin.google.maps': 'cordova-plugin-googlemaps',
-    'xu.li.cordova.wechat': 'cordova-plugin-wechat',
-    'es.keensoft.fullscreenimage': 'cordova-plugin-fullscreenimage',
-    'com.arcoirislabs.plugin.mqtt' : 'cordova-plugin-mqtt'
+    'plugin.google.maps': 'cordova-plugin-googlemaps'
 };

 module.exports.oldToNew = map;
@@ -0,0 +1,51 @@
+{
+  "name": "cordova-registry-mapper",
+  "version": "1.1.14",
+  "description": "Maps old plugin ids to new plugin names for fetching from npm",
+  "main": "index.js",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/stevengill/cordova-registry-mapper.git"
+  },
+  "scripts": {
+    "test": "node tests/test.js"
+  },
+  "keywords": [
+    "cordova",
+    "plugins"
+  ],
+  "author": {
+    "name": "Steve Gill"
+  },
+  "license": "Apache version 2.0",
+  "devDependencies": {
+    "tape": "^3.5.0"
+  },
+  "gitHead": "0ad8505f61afaac3c7ab112e6e79bd61cb953762",
+  "bugs": {
+    "url": "https://github.com/stevengill/cordova-registry-mapper/issues"
+  },
+  "homepage": "https://github.com/stevengill/cordova-registry-mapper#readme",
+  "_id": "cordova-registry-mapper@1.1.14",
+  "_shasum": "cca1084e1e3a1b4737405123989251d4a6a5ca07",
+  "_from": "cordova-registry-mapper@>=1.1.8 <2.0.0",
+  "_npmVersion": "3.5.1",
+  "_nodeVersion": "5.0.0",
+  "_npmUser": {
+    "name": "stevegill",
+    "email": "stevengill97@gmail.com"
+  },
+  "dist": {
+    "shasum": "cca1084e1e3a1b4737405123989251d4a6a5ca07",
+    "tarball": "http://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.14.tgz"
+  },
+  "maintainers": [
+    {
+      "name": "stevegill",
+      "email": "stevengill97@gmail.com"
+    }
+  ],
+  "directories": {},
+  "_resolved": "http://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.14.tgz",
+  "readme": "ERROR: No README data found!"
+}
@@ -1,78 +1,52 @@
 {
-  "_args": [
-    [
-      "wrappy@1",
-      "/Users/steveng/repo/cordova/cordova-android/node_modules/inflight"
-    ]
-  ],
-  "_from": "wrappy@>=1.0.0 <2.0.0",
-  "_id": "wrappy@1.0.1",
-  "_inCache": true,
-  "_installable": true,
-  "_location": "/wrappy",
-  "_nodeVersion": "0.10.31",
-  "_npmUser": {
-    "email": "i@izs.me",
-    "name": "isaacs"
-  },
-  "_npmVersion": "2.0.0",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "wrappy",
-    "raw": "wrappy@1",
-    "rawSpec": "1",
-    "scope": null,
-    "spec": ">=1.0.0 <2.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/inflight",
-    "/once"
-  ],
-  "_resolved": "http://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
-  "_shasum": "1e65969965ccbc2db4548c6b84a6f2c5aedd4739",
-  "_shrinkwrap": null,
-  "_spec": "wrappy@1",
-  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/inflight",
-  "author": {
-    "email": "i@izs.me",
-    "name": "Isaac Z. Schlueter",
-    "url": "http://blog.izs.me/"
-  },
-  "bugs": {
-    "url": "https://github.com/npm/wrappy/issues"
-  },
-  "dependencies": {},
+  "name": "wrappy",
+  "version": "1.0.1",
  "description": "Callback wrapping utility",
-  "devDependencies": {
-    "tap": "^0.4.12"
-  },
+  "main": "wrappy.js",
  "directories": {
    "test": "test"
  },
-  "dist": {
-    "shasum": "1e65969965ccbc2db4548c6b84a6f2c5aedd4739",
-    "tarball": "http://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+  "dependencies": {},
+  "devDependencies": {
+    "tap": "^0.4.12"
+  },
+  "scripts": {
+    "test": "tap test/*.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/npm/wrappy.git"
+  },
+  "author": {
+    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
+    "url": "http://blog.izs.me/"
  },
-  "gitHead": "006a8cbac6b99988315834c207896eed71fd069a",
-  "homepage": "https://github.com/npm/wrappy",
  "license": "ISC",
-  "main": "wrappy.js",
+  "bugs": {
+    "url": "https://github.com/npm/wrappy/issues"
+  },
+  "homepage": "https://github.com/npm/wrappy",
+  "gitHead": "006a8cbac6b99988315834c207896eed71fd069a",
+  "_id": "wrappy@1.0.1",
+  "_shasum": "1e65969965ccbc2db4548c6b84a6f2c5aedd4739",
+  "_from": "wrappy@>=1.0.0 <2.0.0",
+  "_npmVersion": "2.0.0",
+  "_nodeVersion": "0.10.31",
+  "_npmUser": {
+    "name": "isaacs",
+    "email": "i@izs.me"
+  },
  "maintainers": [
    {
      "name": "isaacs",
      "email": "i@izs.me"
    }
  ],
-  "name": "wrappy",
-  "optionalDependencies": {},
-  "readme": "ERROR: No README data found!",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/npm/wrappy.git"
+  "dist": {
+    "shasum": "1e65969965ccbc2db4548c6b84a6f2c5aedd4739",
+    "tarball": "http://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
  },
-  "scripts": {
-    "test": "tap test/*.js"
-  },
-  "version": "1.0.1"
+  "_resolved": "http://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+  "readme": "ERROR: No README data found!"
 }
@@ -1,63 +1,42 @@
 {
-  "_args": [
-    [
-      "inflight@^1.0.4",
-      "/Users/steveng/repo/cordova/cordova-android/node_modules/glob"
-    ]
-  ],
-  "_from": "inflight@>=1.0.4 <2.0.0",
-  "_id": "inflight@1.0.4",
-  "_inCache": true,
-  "_installable": true,
-  "_location": "/inflight",
-  "_nodeVersion": "0.10.32",
-  "_npmUser": {
-    "email": "ogd@aoaioxxysz.net",
-    "name": "othiym23"
+  "name": "inflight",
+  "version": "1.0.4",
+  "description": "Add callbacks to requests in flight to avoid async duplication",
+  "main": "inflight.js",
+  "dependencies": {
+    "once": "^1.3.0",
+    "wrappy": "1"
  },
-  "_npmVersion": "2.1.3",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "inflight",
-    "raw": "inflight@^1.0.4",
-    "rawSpec": "^1.0.4",
-    "scope": null,
-    "spec": ">=1.0.4 <2.0.0",
-    "type": "range"
+  "devDependencies": {
+    "tap": "^0.4.10"
+  },
+  "scripts": {
+    "test": "tap test.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/inflight.git"
  },
-  "_requiredBy": [
-    "/glob"
-  ],
-  "_resolved": "http://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
-  "_shasum": "6cbb4521ebd51ce0ec0a936bfd7657ef7e9b172a",
-  "_shrinkwrap": null,
-  "_spec": "inflight@^1.0.4",
-  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/glob",
  "author": {
-    "email": "i@izs.me",
    "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
    "url": "http://blog.izs.me/"
  },
  "bugs": {
    "url": "https://github.com/isaacs/inflight/issues"
  },
-  "dependencies": {
-    "once": "^1.3.0",
-    "wrappy": "1"
-  },
-  "description": "Add callbacks to requests in flight to avoid async duplication",
-  "devDependencies": {
-    "tap": "^0.4.10"
-  },
-  "directories": {},
-  "dist": {
-    "shasum": "6cbb4521ebd51ce0ec0a936bfd7657ef7e9b172a",
-    "tarball": "http://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz"
-  },
-  "gitHead": "c7b5531d572a867064d4a1da9e013e8910b7d1ba",
  "homepage": "https://github.com/isaacs/inflight",
  "license": "ISC",
-  "main": "inflight.js",
+  "gitHead": "c7b5531d572a867064d4a1da9e013e8910b7d1ba",
+  "_id": "inflight@1.0.4",
+  "_shasum": "6cbb4521ebd51ce0ec0a936bfd7657ef7e9b172a",
+  "_from": "inflight@>=1.0.4 <2.0.0",
+  "_npmVersion": "2.1.3",
+  "_nodeVersion": "0.10.32",
+  "_npmUser": {
+    "name": "othiym23",
+    "email": "ogd@aoaioxxysz.net"
+  },
  "maintainers": [
    {
      "name": "isaacs",
@@ -72,15 +51,11 @@
      "email": "me@re-becca.org"
    }
  ],
-  "name": "inflight",
-  "optionalDependencies": {},
-  "readme": "ERROR: No README data found!",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/inflight.git"
+  "dist": {
+    "shasum": "6cbb4521ebd51ce0ec0a936bfd7657ef7e9b172a",
+    "tarball": "http://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz"
  },
-  "scripts": {
-    "test": "tap test.js"
-  },
-  "version": "1.0.4"
+  "directories": {},
+  "_resolved": "http://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+  "readme": "ERROR: No README data found!"
 }
@@ -1,77 +1,50 @@
 {
-  "_args": [
-    [
-      "inherits@2",
-      "/Users/steveng/repo/cordova/cordova-android/node_modules/glob"
-    ]
+  "name": "inherits",
+  "description": "Browser-friendly inheritance fully compatible with standard node.js inherits()",
+  "version": "2.0.1",
+  "keywords": [
+    "inheritance",
+    "class",
+    "klass",
+    "oop",
+    "object-oriented",
+    "inherits",
+    "browser",
+    "browserify"
  ],
-  "_from": "inherits@>=2.0.0 <3.0.0",
-  "_id": "inherits@2.0.1",
-  "_inCache": true,
-  "_installable": true,
-  "_location": "/inherits",
-  "_npmUser": {
-    "email": "i@izs.me",
-    "name": "isaacs"
-  },
-  "_npmVersion": "1.3.8",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "inherits",
-    "raw": "inherits@2",
-    "rawSpec": "2",
-    "scope": null,
-    "spec": ">=2.0.0 <3.0.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/glob"
-  ],
-  "_resolved": "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-  "_shasum": "b17d08d326b4423e568eff719f91b0b1cbdf69f1",
-  "_shrinkwrap": null,
-  "_spec": "inherits@2",
-  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/glob",
+  "main": "./inherits.js",
  "browser": "./inherits_browser.js",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/inherits.git"
+  },
+  "license": "ISC",
+  "scripts": {
+    "test": "node test"
+  },
  "bugs": {
    "url": "https://github.com/isaacs/inherits/issues"
  },
-  "dependencies": {},
-  "description": "Browser-friendly inheritance fully compatible with standard node.js inherits()",
-  "devDependencies": {},
-  "directories": {},
+  "_id": "inherits@2.0.1",
  "dist": {
    "shasum": "b17d08d326b4423e568eff719f91b0b1cbdf69f1",
    "tarball": "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
  },
-  "homepage": "https://github.com/isaacs/inherits#readme",
-  "keywords": [
-    "browser",
-    "browserify",
-    "class",
-    "inheritance",
-    "inherits",
-    "klass",
-    "object-oriented",
-    "oop"
-  ],
-  "license": "ISC",
-  "main": "./inherits.js",
+  "_from": "inherits@>=2.0.0 <3.0.0",
+  "_npmVersion": "1.3.8",
+  "_npmUser": {
+    "name": "isaacs",
+    "email": "i@izs.me"
+  },
  "maintainers": [
    {
      "name": "isaacs",
      "email": "i@izs.me"
    }
  ],
-  "name": "inherits",
-  "optionalDependencies": {},
+  "directories": {},
+  "_shasum": "b17d08d326b4423e568eff719f91b0b1cbdf69f1",
+  "_resolved": "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
  "readme": "ERROR: No README data found!",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/inherits.git"
-  },
-  "scripts": {
-    "test": "node test"
-  },
-  "version": "2.0.1"
+  "homepage": "https://github.com/isaacs/inherits#readme"
 }
@@ -99,7 +99,7 @@ function expand(str, isTop) {
  var isOptions = /^(.*,)+(.+)?$/.test(m.body);
  if (!isSequence && !isOptions) {
    // {a},b}
-    if (m.post.match(/,.*\}/)) {
+    if (m.post.match(/,.*}/)) {
      str = m.pre + '{' + m.body + escClose + m.post;
      return expand(str);
    }
@@ -1,98 +1,73 @@
 {
-  "_args": [
-    [
-      "balanced-match@^0.3.0",
-      "/Users/steveng/repo/cordova/cordova-android/node_modules/brace-expansion"
-    ]
-  ],
-  "_from": "balanced-match@>=0.3.0 <0.4.0",
-  "_id": "balanced-match@0.3.0",
-  "_inCache": true,
-  "_installable": true,
-  "_location": "/balanced-match",
-  "_nodeVersion": "4.2.1",
-  "_npmUser": {
-    "email": "julian@juliangruber.com",
-    "name": "juliangruber"
+  "name": "balanced-match",
+  "description": "Match balanced character pairs, like \"{\" and \"}\"",
+  "version": "0.3.0",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/juliangruber/balanced-match.git"
  },
-  "_npmVersion": "2.14.7",
-  "_phantomChildren": {},
-  "_requested": {
-    "name": "balanced-match",
-    "raw": "balanced-match@^0.3.0",
-    "rawSpec": "^0.3.0",
-    "scope": null,
-    "spec": ">=0.3.0 <0.4.0",
-    "type": "range"
-  },
-  "_requiredBy": [
-    "/brace-expansion"
-  ],
-  "_resolved": "http://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz",
-  "_shasum": "a91cdd1ebef1a86659e70ff4def01625fc2d6756",
-  "_shrinkwrap": null,
-  "_spec": "balanced-match@^0.3.0",
-  "_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/brace-expansion",
-  "author": {
-    "email": "mail@juliangruber.com",
-    "name": "Julian Gruber",
-    "url": "http://juliangruber.com"
-  },
-  "bugs": {
-    "url": "https://github.com/juliangruber/balanced-match/issues"
+  "homepage": "https://github.com/juliangruber/balanced-match",
+  "main": "index.js",
+  "scripts": {
+    "test": "make test"
  },
  "dependencies": {},
-  "description": "Match balanced character pairs, like \"{\" and \"}\"",
  "devDependencies": {
    "tape": "~4.2.2"
  },
-  "directories": {},
+  "keywords": [
+    "match",
+    "regexp",
+    "test",
+    "balanced",
+    "parse"
+  ],
+  "author": {
+    "name": "Julian Gruber",
+    "email": "mail@juliangruber.com",
+    "url": "http://juliangruber.com"
+  },
+  "license": "MIT",
+  "testling": {
+    "files": "test/*.js",
+    "browsers": [
+      "ie/8..latest",
+      "firefox/20..latest",
+      "firefox/nightly",
+      "chrome/25..latest",
+      "chrome/canary",
+      "opera/12..latest",
+      "opera/next",
+      "safari/5.1..latest",
+      "ipad/6.0..latest",
+      "iphone/6.0..latest",
+      "android-browser/4.2..latest"
+    ]
+  },
+  "gitHead": "a7114b0986554787e90b7ac595a043ca75ea77e5",
+  "bugs": {
+    "url": "https://github.com/juliangruber/balanced-match/issues"
+  },
+  "_id": "balanced-match@0.3.0",
+  "_shasum": "a91cdd1ebef1a86659e70ff4def01625fc2d6756",
+  "_from": "balanced-match@>=0.3.0 <0.4.0",
+  "_npmVersion": "2.14.7",
+  "_nodeVersion": "4.2.1",
+  "_npmUser": {
+    "name": "juliangruber",
+    "email": "julian@juliangruber.com"
+  },
  "dist": {
    "shasum": "a91cdd1ebef1a86659e70ff4def01625fc2d6756",
    "tarball": "http://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
  },
-  "gitHead": "a7114b0986554787e90b7ac595a043ca75ea77e5",
-  "homepage": "https://github.com/juliangruber/balanced-match",
-  "keywords": [
-    "balanced",
-    "match",
-    "parse",
-    "regexp",
-    "test"
-  ],
-  "license": "MIT",
-  "main": "index.js",
  "maintainers": [
    {
      "name": "juliangruber",
      "email": "julian@juliangruber.com"
    }
  ],
-  "name": "balanced-match",
-  "optionalDependencies": {},
-  "readme": "ERROR: No README data found!",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/juliangruber/balanced-match.git"
-  },
-  "scripts": {
-    "test": "make test"
-  },
-  "testling": {
-    "browsers": [
-      "android-browser/4.2..latest",
-      "chrome/25..latest",
-      "chrome/canary",
-      "firefox/20..latest",
-      "firefox/nightly",
-      "ie/8..latest",
-      "ipad/6.0..latest",
-      "iphone/6.0..latest",
-      "opera/12..latest",
-      "opera/next",
-      "safari/5.1..latest"
-    ],
-    "files": "test/*.js"
-  },
-  "version": "0.3.0"
+  "directories": {},
+  "_resolved": "http://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz",
+  "readme": "ERROR: No README data found!"
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Steve Gill	b8815c24fa	added missing node_modules	2016-01-20 17:07:33 -08:00
Steve Gill	4b74367e61	Set VERSION to 5.1.0 (via coho)	2016-01-20 16:18:52 -08:00
Steve Gill	fe5ef2bfef	Update JS snapshot to version 5.1.0 (via coho)	2016-01-20 16:18:52 -08:00
@@ -1 +1 @@
 .1.1
 .1.0