cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kam...@apache.org
Subject [52/53] [abbrv] Updte require paths, add cordova-lib.js
Date Thu, 01 May 2014 18:32:37 GMT
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b27e5139/cordova-lib/src/cordova/metadata/wp8_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/wp8_parser.js b/cordova-lib/src/cordova/metadata/wp8_parser.js
index b5f0326..2eaf1b9 100644
--- a/cordova-lib/src/cordova/metadata/wp8_parser.js
+++ b/cordova-lib/src/cordova/metadata/wp8_parser.js
@@ -25,7 +25,7 @@ var fs            = require('fs'),
     child_process = require('child_process'),
     Q             = require('q'),
     ConfigParser  = require('../ConfigParser'),
-    CordovaError  = require('../CordovaError'),
+    CordovaError  = require('../../CordovaError'),
     xml           = require('../xml-helpers'),
     config        = require('../config'),
     hooker        = require('../hooker');
@@ -47,7 +47,7 @@ module.exports = function wp8_parser(project) {
 // Returns a promise.
 module.exports.check_requirements = function(project_root) {
     events.emit('log', 'Checking wp8 requirements...');
-    var lib_path = path.join(util.libDirectory, 'wp', 'cordova', require('../../platforms').wp8.version, 'wp8');
+    var lib_path = path.join(util.libDirectory, 'wp', 'cordova', require('../platforms').wp8.version, 'wp8');
     var custom_path = config.has_custom_path(project_root, 'wp8');
     if (custom_path) {
         lib_path = path.join(custom_path, 'wp8');

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b27e5139/cordova-lib/src/cordova/platform.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/platform.js b/cordova-lib/src/cordova/platform.js
index bd20780..dcba97e 100644
--- a/cordova-lib/src/cordova/platform.js
+++ b/cordova-lib/src/cordova/platform.js
@@ -17,9 +17,9 @@
     under the License.
 */
 var config            = require('./config'),
-    cordova           = require('../cordova'),
+    cordova           = require('./cordova'),
     cordova_util      = require('./util'),
-    ConfigParser     = require('./ConfigParser'),
+    ConfigParser      = require('./ConfigParser'),
     util              = require('util'),
     fs                = require('fs'),
     os                = require('os'),
@@ -27,9 +27,9 @@ var config            = require('./config'),
     hooker            = require('./hooker'),
     events            = require('./events'),
     lazy_load         = require('./lazy_load'),
-    CordovaError      = require('./CordovaError'),
+    CordovaError      = require('../CordovaError'),
     Q                 = require('q'),
-    platforms         = require('../platforms'),
+    platforms         = require('./platforms'),
     superspawn        = require('./superspawn'),
     semver            = require('semver'),
     shell             = require('shelljs');
@@ -368,7 +368,7 @@ function call_into_create(target, projectRoot, cfg, libDir, template_dir, opts)
             }
             return superspawn.spawn(bin, args, opts || { stdio: 'inherit' })
             .then(function() {
-                return require('../cordova').raw.prepare(target);
+                return require('./cordova').raw.prepare(target);
             })
             .then(function() {
                 createOverrides(projectRoot, target);
@@ -378,7 +378,7 @@ function call_into_create(target, projectRoot, cfg, libDir, template_dir, opts)
                 var parser = new platforms[target].parser(output);
                 if (!plugins) return Q();
 
-                var plugman = require('plugman');
+                var plugman = require('../plugman/plugman');
                 // Install them serially.
                 return plugins.reduce(function(soFar, plugin) {
                     return soFar.then(function() {

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b27e5139/cordova-lib/src/cordova/platforms.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/platforms.js b/cordova-lib/src/cordova/platforms.js
index 5bb82f1..16e2def 100644
--- a/cordova-lib/src/cordova/platforms.js
+++ b/cordova-lib/src/cordova/platforms.js
@@ -20,42 +20,42 @@
 module.exports = {
     'ios' : {
         hostos : ['darwin'],
-        parser : './src/metadata/ios_parser',
+        parser : './metadata/ios_parser',
         url    : 'https://git-wip-us.apache.org/repos/asf?p=cordova-ios.git',
         version: '3.4.1'
-    }, 
+    },
     'android' : {
-        parser : './src/metadata/android_parser',
+        parser : './metadata/android_parser',
         url    : 'https://git-wip-us.apache.org/repos/asf?p=cordova-android.git',
         version: '3.4.0'
-    }, 
+    },
     'ubuntu' : {
         hostos : ['linux'],
-        parser : './src/metadata/ubuntu_parser',
+        parser : './metadata/ubuntu_parser',
         url    : 'https://git-wip-us.apache.org/repos/asf?p=cordova-ubuntu.git',
         version: '3.4.0'
-    }, 
+    },
      'amazon-fireos' : {
-        parser : './src/metadata/amazon_fireos_parser',
+        parser : './metadata/amazon_fireos_parser',
         url    : 'https://git-wip-us.apache.org/repos/asf?p=cordova-amazon-fireos.git',
         version: '3.4.0'
     },
     'wp7' : {
         hostos : ['win32'],
-        parser : './src/metadata/wp7_parser',
+        parser : './metadata/wp7_parser',
         url    : 'https://git-wip-us.apache.org/repos/asf?p=cordova-wp8.git',
         version: '3.4.0',
         subdirectory: 'wp7'
     },
     'wp8' : {
         hostos : ['win32'],
-        parser : './src/metadata/wp8_parser',
+        parser : './metadata/wp8_parser',
         url    : 'https://git-wip-us.apache.org/repos/asf?p=cordova-wp8.git',
         version: '3.4.0',
         subdirectory: 'wp8'
     },
     'blackberry10' : {
-        parser : './src/metadata/blackberry10_parser',
+        parser : './metadata/blackberry10_parser',
         url    : 'https://git-wip-us.apache.org/repos/asf?p=cordova-blackberry.git',
         version: '3.4.0',
         subdirectory: 'blackberry10'
@@ -66,20 +66,20 @@ module.exports = {
         version: '3.4.0'
     },
     'firefoxos':{
-        parser: './src/metadata/firefoxos_parser',
+        parser: './metadata/firefoxos_parser',
         url    : 'https://git-wip-us.apache.org/repos/asf?p=cordova-firefoxos.git',
         version: '3.4.0'
     },
     'windows8':{
         hostos : ['win32'],
-        parser: './src/metadata/windows8_parser',
+        parser: './metadata/windows8_parser',
         url    : 'https://git-wip-us.apache.org/repos/asf?p=cordova-windows.git',
         version: '3.4.0',
         subdirectory: 'windows8'
     }
 };
 
-var addModuleProperty = require('./src/util').addModuleProperty;
+var addModuleProperty = require('./util').addModuleProperty;
 Object.keys(module.exports).forEach(function(key) {
     var obj = module.exports[key];
     if (obj.parser) {

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b27e5139/cordova-lib/src/cordova/plugin.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/plugin.js b/cordova-lib/src/cordova/plugin.js
index f0e01f7..1ed35e7 100644
--- a/cordova-lib/src/cordova/plugin.js
+++ b/cordova-lib/src/cordova/plugin.js
@@ -24,7 +24,7 @@ module.exports = function plugin(command, targets, opts) {
         hooker        = require('./hooker'),
         config        = require('./config'),
         Q             = require('q'),
-        CordovaError  = require('./CordovaError'),
+        CordovaError  = require('../CordovaError'),
         events        = require('./events');
 
     var projectRoot = cordova_util.cdProjectRoot(),
@@ -107,14 +107,14 @@ module.exports = function plugin(command, targets, opts) {
 
                         // Fetch the plugin first.
                         events.emit('verbose', 'Calling plugman.fetch on plugin "' + target + '"');
-                        var plugman = require('plugman');
+                        var plugman = require('../plugman/plugman');
                         return plugman.raw.fetch(target, pluginsDir, { searchpath: searchPath});
                     })
                     .then(function(dir) {
                         // Iterate (in serial!) over all platforms in the project and install the plugin.
                         return platformList.reduce(function(soFar, platform) {
                             return soFar.then(function() {
-                                var platforms = require('../platforms');
+                                var platforms = require('./platforms');
                                 var platformRoot = path.join(projectRoot, 'platforms', platform),
                                     parser = new platforms[platform].parser(platformRoot),
                                     options = {
@@ -163,11 +163,11 @@ module.exports = function plugin(command, targets, opts) {
                     // If this is a web-only or dependency-only plugin, then
                     // there may be nothing to do here except remove the
                     // reference from the platform's plugin config JSON.
-                    var plugman = require('plugman');
+                    var plugman = require('../plugman/plugman');
                     return platformList.reduce(function(soFar, platform) {
                         return soFar.then(function() {
                             var platformRoot = path.join(projectRoot, 'platforms', platform);
-                            var platforms = require('../platforms');
+                            var platforms = require('./platforms');
                             var parser = new platforms[platform].parser(platformRoot);
                             events.emit('verbose', 'Calling plugman.uninstall on plugin "' + target + '" for platform "' + platform + '"');
                             return plugman.raw.uninstall.uninstallPlatform(platform, platformRoot, target, path.join(projectRoot, 'plugins'));
@@ -184,7 +184,7 @@ module.exports = function plugin(command, targets, opts) {
         case 'search':
             return hooks.fire('before_plugin_search')
             .then(function() {
-                var plugman = require('plugman');
+                var plugman = require('../plugman/plugman');
                 return plugman.raw.search(opts.plugins);
             }).then(function(plugins) {
                 for(var plugin in plugins) {

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b27e5139/cordova-lib/src/cordova/prepare.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/prepare.js b/cordova-lib/src/cordova/prepare.js
index eef0123..fbdaa37 100644
--- a/cordova-lib/src/cordova/prepare.js
+++ b/cordova-lib/src/cordova/prepare.js
@@ -19,7 +19,7 @@
 var cordova_util      = require('./util'),
     ConfigParser = require('./ConfigParser'),
     path              = require('path'),
-    platforms         = require('../platforms'),
+    platforms         = require('./platforms'),
     platform          = require('./platform'),
     fs                = require('fs'),
     shell             = require('shelljs'),
@@ -28,7 +28,7 @@ var cordova_util      = require('./util'),
     lazy_load         = require('./lazy_load'),
     events            = require('./events'),
     Q                 = require('q'),
-    plugman           = require('plugman'),
+    plugman           = require('../plugman/plugman'),
     util              = require('util');
 
 // Returns a promise.

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b27e5139/cordova-lib/src/cordova/run.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/run.js b/cordova-lib/src/cordova/run.js
index 5de3031..424fa58 100644
--- a/cordova-lib/src/cordova/run.js
+++ b/cordova-lib/src/cordova/run.js
@@ -35,7 +35,7 @@ module.exports = function run(options) {
     return hooks.fire('before_run', options)
     .then(function() {
         // Run a prepare first, then shell out to run
-        return require('../cordova').raw.prepare(options.platforms)
+        return require('./cordova').raw.prepare(options.platforms)
     }).then(function() {
         // Deploy in parallel (output gets intermixed though...)
         return Q.all(options.platforms.map(function(platform) {

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b27e5139/cordova-lib/src/cordova/serve.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/serve.js b/cordova-lib/src/cordova/serve.js
index bd17fa3..4915529 100644
--- a/cordova-lib/src/cordova/serve.js
+++ b/cordova-lib/src/cordova/serve.js
@@ -20,7 +20,7 @@ var cordova_util = require('./util'),
     crypto = require('crypto'),
     path = require('path'),
     shell = require('shelljs'),
-    platforms     = require('../platforms'),
+    platforms     = require('./platforms'),
     ConfigParser = require('./ConfigParser'),
     hooker        = require('./hooker'),
     fs = require('fs'),
@@ -215,7 +215,7 @@ module.exports = function server(port) {
     return hooks.fire('before_serve')
     .then(function() {
         // Run a prepare first!
-        return require('../cordova').raw.prepare([]);
+        return require('./cordova').raw.prepare([]);
     }).then(function() {
         launchServer(projectRoot, port);
         return hooks.fire('after_serve');

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b27e5139/cordova-lib/src/cordova/util.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/util.js b/cordova-lib/src/cordova/util.js
index 2d3b12a..6b1751b 100644
--- a/cordova-lib/src/cordova/util.js
+++ b/cordova-lib/src/cordova/util.js
@@ -18,7 +18,7 @@
 */
 var fs            = require('fs'),
     path          = require('path'),
-    CordovaError  = require('./CordovaError'),
+    CordovaError  = require('../CordovaError'),
     shell         = require('shelljs');
 
 // Global configuration paths
@@ -102,7 +102,7 @@ exports = module.exports = {
         });
     },
     listPlatforms:function(project_dir) {
-        var core_platforms = require('../platforms');
+        var core_platforms = require('./platforms');
         var platforms_dir = path.join(project_dir, 'platforms');
         if ( !fs.existsSync(platforms_dir)) {
             return [];

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b27e5139/cordova-lib/src/plugman/create.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/create.js b/cordova-lib/src/plugman/create.js
index 7db67b7..b8493b2 100644
--- a/cordova-lib/src/plugman/create.js
+++ b/cordova-lib/src/plugman/create.js
@@ -24,7 +24,7 @@ var Q = require('q'),
 
 module.exports = function create( name, id, version, pluginPath, options ) {
     var cwd = pluginPath + "/" + name + "/",
-        docDir = path.join(__dirname, '..', 'doc/'),
+        templatesDir = path.join(__dirname, '..', '..', 'templates/'),
         baseJS,
         root,
         pluginName,
@@ -61,7 +61,7 @@ module.exports = function create( name, id, version, pluginPath, options ) {
     shell.mkdir( '-p', cwd + "src" );
 
     //create a base plugin.js file
-    baseJS = fs.readFileSync( docDir + 'base.js', 'utf-8').replace( /%pluginName%/g, name );
+    baseJS = fs.readFileSync( templatesDir + 'base.js', 'utf-8').replace( /%pluginName%/g, name );
     fs.writeFileSync( cwd + 'www/' + name + '.js', baseJS, 'utf-8' );
     //Add it to the xml as a js module
     jsMod = et.Element( 'js-module' );

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b27e5139/cordova-lib/src/plugman/fetch.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/fetch.js b/cordova-lib/src/plugman/fetch.js
index 9948b7f..8878808 100644
--- a/cordova-lib/src/plugman/fetch.js
+++ b/cordova-lib/src/plugman/fetch.js
@@ -8,7 +8,7 @@ var shell   = require('shelljs'),
     path    = require('path'),
     Q       = require('q'),
     registry = require('./registry/registry');
-// XXX: leave the require('../plugman') because jasmine shits itself if you declare it up top
+// XXX: leave the require('./plugman') because jasmine shits itself if you declare it up top
 // possible options: link, subdir, git_ref, client, expected_id
 // Returns a promise.
 module.exports = function fetchPlugin(plugin_src, plugins_dir, options) {

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b27e5139/cordova-lib/src/plugman/install.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/install.js b/cordova-lib/src/plugman/install.js
index cce145d..3ce1929 100644
--- a/cordova-lib/src/plugman/install.js
+++ b/cordova-lib/src/plugman/install.js
@@ -13,7 +13,7 @@ var path = require('path'),
     underscore = require('underscore'),
     shell   = require('shelljs'),
     events = require('./events'),
-    plugman = require('../plugman'),
+    plugman = require('./plugman'),
     isWindows = (os.platform().substr(0,3) === 'win');
 
 /* INSTALL FLOW

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b27e5139/cordova-lib/src/plugman/platform.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/platform.js b/cordova-lib/src/plugman/platform.js
index c80ac75..5188577 100644
--- a/cordova-lib/src/plugman/platform.js
+++ b/cordova-lib/src/plugman/platform.js
@@ -63,8 +63,8 @@ module.exports = {
 };
 
 function doPlatform( platformName, pluginName, pluginID, pluginVersion ) {
-    var docDir = path.join(__dirname, '..', 'doc/platforms/' + platformName + "/"),
-        platformFile = docDir + platformName + ".xml",
+    var templatesDir = path.join(__dirname, '..', '..', 'templates/platforms/' + platformName + "/"),
+        platformFile = templatesDir + platformName + ".xml",
         platform;
 
     if( !fs.existsSync( platformFile ) ) {
@@ -77,12 +77,12 @@ function doPlatform( platformName, pluginName, pluginID, pluginVersion ) {
                 .replace( /%packageName%/g, pluginID.replace( /[.]/g, '/' ) );
     platform = new et.ElementTree( et.XML( platform ) );
 
-    doPlatformBase( docDir, platformName, pluginName, pluginID, pluginVersion );
+    doPlatformBase( templatesDir, platformName, pluginName, pluginID, pluginVersion );
 
     return platform;
 }
 
-function doPlatformBase( docDir, platformName, pluginName, pluginID, pluginVersion ) {
+function doPlatformBase( templatesDir, platformName, pluginName, pluginID, pluginVersion ) {
     //Create the default plugin file
     var baseFiles = [],
         i = 0;
@@ -91,7 +91,7 @@ function doPlatformBase( docDir, platformName, pluginName, pluginID, pluginVersi
     case 'android':
         baseFiles.push (
             {
-                file: fs.readFileSync( docDir + "base.java", "utf-8" )
+                file: fs.readFileSync( templatesDir + "base.java", "utf-8" )
                     .replace( /%pluginName%/g, pluginName )
                     .replace( /%pluginID%/g, pluginID ),
                 extension: "java"
@@ -102,7 +102,7 @@ function doPlatformBase( docDir, platformName, pluginName, pluginID, pluginVersi
     case 'ios':
         baseFiles.push(
             {
-                file: fs.readFileSync( docDir + "base.m", "utf-8" )
+                file: fs.readFileSync( templatesDir + "base.m", "utf-8" )
                     .replace( /%pluginName%/g, pluginName ),
                 extension: "m"
             }

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b27e5139/cordova-lib/src/plugman/plugman.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/plugman.js b/cordova-lib/src/plugman/plugman.js
index 4aa1843..6a54ff5 100644
--- a/cordova-lib/src/plugman/plugman.js
+++ b/cordova-lib/src/plugman/plugman.js
@@ -19,7 +19,7 @@
 
 // copyright (c) 2013 Andrew Lunny, Adobe Systems
 
-var events = require('./src/events');
+var events = require('./events');
 var Q = require('q');
 
 function addProperty(o, symbol, modulePath, doWrap) {
@@ -60,21 +60,20 @@ plugman = {
     raw:                {}
 };
 
-addProperty(plugman, 'help', './src/help');
-addProperty(plugman, 'install', './src/install', true);
-addProperty(plugman, 'uninstall', './src/uninstall', true);
-addProperty(plugman, 'fetch', './src/fetch', true);
-addProperty(plugman, 'prepare', './src/prepare');
-addProperty(plugman, 'config', './src/config', true);
-addProperty(plugman, 'owner', './src/owner', true);
-addProperty(plugman, 'adduser', './src/adduser', true);
-addProperty(plugman, 'publish', './src/publish', true);
-addProperty(plugman, 'unpublish', './src/unpublish', true);
-addProperty(plugman, 'search', './src/search', true);
-addProperty(plugman, 'info', './src/info', true);
-addProperty(plugman, 'create', './src/create', true);
-addProperty(plugman, 'platform', './src/platform_operation', true);
-addProperty(plugman, 'config_changes', './src/util/config-changes');
+addProperty(plugman, 'install', './install', true);
+addProperty(plugman, 'uninstall', './uninstall', true);
+addProperty(plugman, 'fetch', './fetch', true);
+addProperty(plugman, 'prepare', './prepare');
+addProperty(plugman, 'config', './config', true);
+addProperty(plugman, 'owner', './owner', true);
+addProperty(plugman, 'adduser', './adduser', true);
+addProperty(plugman, 'publish', './publish', true);
+addProperty(plugman, 'unpublish', './unpublish', true);
+addProperty(plugman, 'search', './search', true);
+addProperty(plugman, 'info', './info', true);
+addProperty(plugman, 'create', './create', true);
+addProperty(plugman, 'platform', './platform_operation', true);
+addProperty(plugman, 'config_changes', './util/config-changes');
 
 plugman.commands =  {
     'config'   : function(cli_opts) {
@@ -111,7 +110,7 @@ plugman.commands =  {
                 return plugman.raw.install(cli_opts.platform, cli_opts.project, pluginSrc, cli_opts.plugins_dir, opts);
             })
         });
-        
+
         return p;
     },
     'uninstall': function(cli_opts) {

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b27e5139/cordova-lib/src/plugman/prepare.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/prepare.js b/cordova-lib/src/plugman/prepare.js
index c650306..504a710 100644
--- a/cordova-lib/src/plugman/prepare.js
+++ b/cordova-lib/src/plugman/prepare.js
@@ -31,7 +31,7 @@ var platform_modules = require('./platforms'),
     shell           = require('shelljs'),
     util            = require('util'),
     events          = require('./events'),
-    plugman         = require('../plugman'),
+    plugman         = require('./plugman'),
     et              = require('elementtree');
 
 // Called on --prepare.

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b27e5139/cordova-lib/src/plugman/uninstall.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/uninstall.js b/cordova-lib/src/plugman/uninstall.js
index 04ecb1a..49f1b16 100644
--- a/cordova-lib/src/plugman/uninstall.js
+++ b/cordova-lib/src/plugman/uninstall.js
@@ -13,7 +13,7 @@ var path = require('path'),
     underscore = require('underscore'),
     events = require('./events'),
     platform_modules = require('./platforms'),
-    plugman = require('../plugman');
+    plugman = require('./plugman');
 
 // possible options: cli_variables, www_dir
 // Returns a promise.

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b27e5139/cordova-lib/src/plugman/util/default-engines.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/util/default-engines.js b/cordova-lib/src/plugman/util/default-engines.js
index 5e4f151..5921608 100644
--- a/cordova-lib/src/plugman/util/default-engines.js
+++ b/cordova-lib/src/plugman/util/default-engines.js
@@ -5,7 +5,7 @@ module.exports = function(project_dir){
         'cordova':
             { 'platform':'*', 'scriptSrc': path.join(project_dir,'cordova','version') },
         'cordova-plugman':
-            { 'platform':'*', 'currentVersion': require('../../package.json').version },
+            { 'platform':'*', 'currentVersion': require('../../../package.json').version },
         'cordova-android':
             { 'platform':'android', 'scriptSrc': path.join(project_dir,'cordova','version') },
         'cordova-ios':

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b27e5139/cordova-lib/src/plugman/util/dependencies.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/util/dependencies.js b/cordova-lib/src/plugman/util/dependencies.js
index a297372..4ef7fc9 100644
--- a/cordova-lib/src/plugman/util/dependencies.js
+++ b/cordova-lib/src/plugman/util/dependencies.js
@@ -1,7 +1,7 @@
 var dep_graph = require('dep-graph'),
     path = require('path'),
     fs = require('fs'),
-    plugman = require('../../plugman'),
+    plugman = require('../plugman'),
     config_changes = require('./config-changes'),
     underscore = require('underscore'),
     xml_helpers = require('./xml-helpers'),

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b27e5139/npm-shrinkwrap.json
----------------------------------------------------------------------
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
deleted file mode 100644
index 3547b50..0000000
--- a/npm-shrinkwrap.json
+++ /dev/null
@@ -1,812 +0,0 @@
-{
-  "name": "cordova",
-  "version": "3.4.1-0.1.0",
-  "dependencies": {
-    "elementtree": {
-      "version": "0.1.5",
-      "from": "elementtree@0.1.5",
-      "dependencies": {
-        "sax": {
-          "version": "0.3.5",
-          "from": "sax@0.3.5"
-        }
-      }
-    },
-    "mime": {
-      "version": "1.2.11",
-      "from": "mime@1.2.11"
-    },
-    "npmconf": {
-      "version": "0.1.13",
-      "from": "npmconf@0.1.13",
-      "dependencies": {
-        "config-chain": {
-          "version": "1.1.8",
-          "from": "config-chain@1.1.8",
-          "dependencies": {
-            "proto-list": {
-              "version": "1.2.2",
-              "from": "proto-list@1.2.2"
-            }
-          }
-        },
-        "inherits": {
-          "version": "2.0.1",
-          "from": "inherits@2.0.1"
-        },
-        "once": {
-          "version": "1.3.0",
-          "from": "once@1.3.0"
-        },
-        "mkdirp": {
-          "version": "0.3.5",
-          "from": "mkdirp@0.3.5"
-        },
-        "osenv": {
-          "version": "0.0.3",
-          "from": "osenv@0.0.3"
-        },
-        "nopt": {
-          "version": "2.2.0",
-          "from": "nopt@2.2.0",
-          "dependencies": {
-            "abbrev": {
-              "version": "1.0.4",
-              "from": "abbrev@1.0.4"
-            }
-          }
-        },
-        "ini": {
-          "version": "1.1.0",
-          "from": "ini@1.1.0"
-        }
-      }
-    },
-    "optimist": {
-      "version": "0.6.0",
-      "from": "optimist@0.6.0",
-      "dependencies": {
-        "wordwrap": {
-          "version": "0.0.2",
-          "from": "wordwrap@0.0.2"
-        },
-        "minimist": {
-          "version": "0.0.8",
-          "from": "minimist@0.0.8"
-        }
-      }
-    },
-    "plist-with-patches": {
-      "version": "0.5.1",
-      "from": "plist-with-patches@0.5.1",
-      "dependencies": {
-        "xmlbuilder": {
-          "version": "0.4.3",
-          "from": "xmlbuilder@0.4.3"
-        },
-        "xmldom": {
-          "version": "0.1.19",
-          "from": "xmldom@0.1.19"
-        }
-      }
-    },
-    "plugman": {
-      "version": "0.21.0",
-      "from": "plugman@0.21.0",
-      "resolved": "https://registry.npmjs.org/plugman/-/plugman-0.21.0.tgz",
-      "dependencies": {
-        "nopt": {
-          "version": "1.0.10",
-          "from": "nopt@1.0.10",
-          "dependencies": {
-            "abbrev": {
-              "version": "1.0.4",
-              "from": "abbrev@1.0.4"
-            }
-          }
-        },
-        "glob": {
-          "version": "3.2.9",
-          "from": "glob@3.2.9",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.9.tgz",
-          "dependencies": {
-            "minimatch": {
-              "version": "0.2.14",
-              "from": "minimatch@0.2.14",
-              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
-              "dependencies": {
-                "lru-cache": {
-                  "version": "2.5.0",
-                  "from": "lru-cache@2.5.0"
-                },
-                "sigmund": {
-                  "version": "1.0.0",
-                  "from": "sigmund@1.0.0"
-                }
-              }
-            },
-            "inherits": {
-              "version": "2.0.1",
-              "from": "inherits@2.0.1"
-            }
-          }
-        },
-        "bplist-parser": {
-          "version": "0.0.5",
-          "from": "bplist-parser@0.0.5"
-        },
-        "dep-graph": {
-          "version": "1.1.0",
-          "from": "dep-graph@1.1.0",
-          "dependencies": {
-            "underscore": {
-              "version": "1.2.1",
-              "from": "underscore@1.2.1",
-              "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.2.1.tgz"
-            }
-          }
-        },
-        "npm": {
-          "version": "1.3.4",
-          "from": "npm@1.3.4",
-          "dependencies": {
-            "semver": {
-              "version": "2.0.8",
-              "from": "semver@latest"
-            },
-            "ini": {
-              "version": "1.1.0",
-              "from": "ini@latest"
-            },
-            "slide": {
-              "version": "1.1.4",
-              "from": "slide@latest"
-            },
-            "abbrev": {
-              "version": "1.0.4",
-              "from": "abbrev@latest"
-            },
-            "graceful-fs": {
-              "version": "2.0.0",
-              "from": "graceful-fs@2"
-            },
-            "minimatch": {
-              "version": "0.2.12",
-              "from": "minimatch@latest",
-              "dependencies": {
-                "sigmund": {
-                  "version": "1.0.0",
-                  "from": "sigmund@~1.0.0",
-                  "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
-                }
-              }
-            },
-            "nopt": {
-              "version": "2.1.1",
-              "from": "nopt@latest"
-            },
-            "rimraf": {
-              "version": "2.2.0",
-              "from": "rimraf@2.2"
-            },
-            "request": {
-              "version": "2.21.0",
-              "from": "request@latest",
-              "dependencies": {
-                "qs": {
-                  "version": "0.6.5",
-                  "from": "qs@~0.6.0"
-                },
-                "json-stringify-safe": {
-                  "version": "4.0.0",
-                  "from": "json-stringify-safe@~4.0.0"
-                },
-                "forever-agent": {
-                  "version": "0.5.0",
-                  "from": "forever-agent@~0.5.0"
-                },
-                "tunnel-agent": {
-                  "version": "0.3.0",
-                  "from": "tunnel-agent@~0.3.0"
-                },
-                "http-signature": {
-                  "version": "0.9.11",
-                  "from": "http-signature@~0.9.11",
-                  "dependencies": {
-                    "assert-plus": {
-                      "version": "0.1.2",
-                      "from": "assert-plus@0.1.2"
-                    },
-                    "asn1": {
-                      "version": "0.1.11",
-                      "from": "asn1@0.1.11"
-                    },
-                    "ctype": {
-                      "version": "0.5.2",
-                      "from": "ctype@0.5.2"
-                    }
-                  }
-                },
-                "hawk": {
-                  "version": "0.13.1",
-                  "from": "hawk@~0.13.0",
-                  "dependencies": {
-                    "hoek": {
-                      "version": "0.8.5",
-                      "from": "hoek@0.8.x"
-                    },
-                    "boom": {
-                      "version": "0.4.2",
-                      "from": "boom@0.4.x",
-                      "dependencies": {
-                        "hoek": {
-                          "version": "0.9.1",
-                          "from": "hoek@0.9.x",
-                          "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
-                        }
-                      }
-                    },
-                    "cryptiles": {
-                      "version": "0.2.1",
-                      "from": "cryptiles@0.2.x"
-                    },
-                    "sntp": {
-                      "version": "0.2.4",
-                      "from": "sntp@0.2.x",
-                      "dependencies": {
-                        "hoek": {
-                          "version": "0.9.1",
-                          "from": "hoek@0.9.x",
-                          "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
-                        }
-                      }
-                    }
-                  }
-                },
-                "aws-sign": {
-                  "version": "0.3.0",
-                  "from": "aws-sign@~0.3.0"
-                },
-                "oauth-sign": {
-                  "version": "0.3.0",
-                  "from": "oauth-sign@~0.3.0"
-                },
-                "cookie-jar": {
-                  "version": "0.3.0",
-                  "from": "cookie-jar@~0.3.0"
-                },
-                "node-uuid": {
-                  "version": "1.4.0",
-                  "from": "node-uuid@~1.4.0"
-                },
-                "mime": {
-                  "version": "1.2.9",
-                  "from": "mime@~1.2.9"
-                },
-                "form-data": {
-                  "version": "0.0.8",
-                  "from": "form-data@0.0.8",
-                  "dependencies": {
-                    "combined-stream": {
-                      "version": "0.0.4",
-                      "from": "combined-stream@~0.0.4",
-                      "dependencies": {
-                        "delayed-stream": {
-                          "version": "0.0.5",
-                          "from": "delayed-stream@0.0.5"
-                        }
-                      }
-                    },
-                    "async": {
-                      "version": "0.2.9",
-                      "from": "async@~0.2.7"
-                    }
-                  }
-                }
-              }
-            },
-            "which": {
-              "version": "1.0.5",
-              "from": "which@1"
-            },
-            "tar": {
-              "version": "0.1.17",
-              "from": "tar@0.1.17",
-              "resolved": "https://registry.npmjs.org/tar/-/tar-0.1.17.tgz"
-            },
-            "fstream": {
-              "version": "0.1.23",
-              "from": "fstream@latest"
-            },
-            "block-stream": {
-              "version": "0.0.6",
-              "from": "block-stream@*"
-            },
-            "inherits": {
-              "version": "1.0.0",
-              "from": "git://github.com/isaacs/inherits"
-            },
-            "mkdirp": {
-              "version": "0.3.5",
-              "from": "mkdirp@0.3.5",
-              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"
-            },
-            "read": {
-              "version": "1.0.4",
-              "from": "read@~1.0.3",
-              "dependencies": {
-                "mute-stream": {
-                  "version": "0.0.3",
-                  "from": "mute-stream@~0.0.2"
-                }
-              }
-            },
-            "lru-cache": {
-              "version": "2.3.0",
-              "from": "lru-cache@latest"
-            },
-            "node-gyp": {
-              "version": "0.10.6",
-              "from": "node-gyp@latest"
-            },
-            "fstream-npm": {
-              "version": "0.1.4",
-              "from": "fstream-npm@latest",
-              "dependencies": {
-                "fstream-ignore": {
-                  "version": "0.0.6",
-                  "from": "fstream-ignore@~0.0.5"
-                }
-              }
-            },
-            "uid-number": {
-              "version": "0.0.3",
-              "from": "../uid-number"
-            },
-            "archy": {
-              "version": "0.0.2",
-              "from": "archy@0.0.2"
-            },
-            "chownr": {
-              "version": "0.0.1",
-              "from": "../chownr"
-            },
-            "npmlog": {
-              "version": "0.0.4",
-              "from": "npmlog@latest"
-            },
-            "ansi": {
-              "version": "0.1.2",
-              "from": "ansi@~0.1.2"
-            },
-            "npm-registry-client": {
-              "version": "0.2.27",
-              "from": "npm-registry-client@latest",
-              "dependencies": {
-                "couch-login": {
-                  "version": "0.1.17",
-                  "from": "couch-login@~0.1.15"
-                }
-              }
-            },
-            "read-package-json": {
-              "version": "1.1.0",
-              "from": "read-package-json@1",
-              "dependencies": {
-                "normalize-package-data": {
-                  "version": "0.2.0",
-                  "from": "normalize-package-data@~0.2",
-                  "dependencies": {
-                    "github-url-from-git": {
-                      "version": "1.1.1",
-                      "from": "github-url-from-git@~1.1.1"
-                    }
-                  }
-                }
-              }
-            },
-            "read-installed": {
-              "version": "0.2.2",
-              "from": "read-installed@latest"
-            },
-            "glob": {
-              "version": "3.2.3",
-              "from": "glob@latest",
-              "dependencies": {
-                "inherits": {
-                  "version": "2.0.0",
-                  "from": "inherits@2"
-                }
-              }
-            },
-            "init-package-json": {
-              "version": "0.0.10",
-              "from": "init-package-json@latest",
-              "dependencies": {
-                "promzard": {
-                  "version": "0.2.0",
-                  "from": "promzard@~0.2.0"
-                }
-              }
-            },
-            "osenv": {
-              "version": "0.0.3",
-              "from": "osenv@latest"
-            },
-            "lockfile": {
-              "version": "0.4.0",
-              "from": "lockfile@latest"
-            },
-            "retry": {
-              "version": "0.6.0",
-              "from": "retry"
-            },
-            "once": {
-              "version": "1.1.1",
-              "from": "once"
-            },
-            "npmconf": {
-              "version": "0.1.1",
-              "from": "npmconf@latest",
-              "dependencies": {
-                "config-chain": {
-                  "version": "1.1.7",
-                  "from": "config-chain@~1.1.1",
-                  "dependencies": {
-                    "proto-list": {
-                      "version": "1.2.2",
-                      "from": "proto-list@~1.2.1"
-                    }
-                  }
-                }
-              }
-            },
-            "opener": {
-              "version": "1.3.0",
-              "from": "opener@latest"
-            },
-            "chmodr": {
-              "version": "0.1.0",
-              "from": "chmodr@latest"
-            },
-            "cmd-shim": {
-              "version": "1.1.0",
-              "from": "cmd-shim@"
-            },
-            "sha": {
-              "version": "1.0.1",
-              "from": "sha@~1.0.1"
-            },
-            "editor": {
-              "version": "0.0.4",
-              "from": "editor@"
-            },
-            "child-process-close": {
-              "version": "0.1.1",
-              "from": "child-process-close@",
-              "resolved": "https://registry.npmjs.org/child-process-close/-/child-process-close-0.1.1.tgz"
-            },
-            "npm-user-validate": {
-              "version": "0.0.3",
-              "from": "npm-user-validate@0.0.3",
-              "resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.0.3.tgz"
-            }
-          }
-        },
-        "rc": {
-          "version": "0.3.0",
-          "from": "rc@0.3.0",
-          "dependencies": {
-            "optimist": {
-              "version": "0.3.7",
-              "from": "optimist@0.3.7",
-              "dependencies": {
-                "wordwrap": {
-                  "version": "0.0.2",
-                  "from": "wordwrap@0.0.2"
-                }
-              }
-            },
-            "deep-extend": {
-              "version": "0.2.8",
-              "from": "deep-extend@0.2.8"
-            },
-            "ini": {
-              "version": "1.1.0",
-              "from": "ini@1.1.0"
-            }
-          }
-        },
-        "request": {
-          "version": "2.22.0",
-          "from": "request@2.22.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.22.0.tgz",
-          "dependencies": {
-            "qs": {
-              "version": "0.6.6",
-              "from": "qs@0.6.6"
-            },
-            "json-stringify-safe": {
-              "version": "4.0.0",
-              "from": "json-stringify-safe@4.0.0"
-            },
-            "forever-agent": {
-              "version": "0.5.2",
-              "from": "forever-agent@0.5.2"
-            },
-            "tunnel-agent": {
-              "version": "0.3.0",
-              "from": "tunnel-agent@0.3.0"
-            },
-            "http-signature": {
-              "version": "0.10.0",
-              "from": "http-signature@0.10.0",
-              "dependencies": {
-                "assert-plus": {
-                  "version": "0.1.2",
-                  "from": "assert-plus@0.1.2"
-                },
-                "asn1": {
-                  "version": "0.1.11",
-                  "from": "asn1@0.1.11"
-                },
-                "ctype": {
-                  "version": "0.5.2",
-                  "from": "ctype@0.5.2",
-                  "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"
-                }
-              }
-            },
-            "hawk": {
-              "version": "0.13.1",
-              "from": "hawk@0.13.1",
-              "dependencies": {
-                "hoek": {
-                  "version": "0.8.5",
-                  "from": "hoek@0.8.5"
-                },
-                "boom": {
-                  "version": "0.4.2",
-                  "from": "boom@0.4.2",
-                  "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
-                  "dependencies": {
-                    "hoek": {
-                      "version": "0.9.1",
-                      "from": "hoek@0.9.1",
-                      "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
-                    }
-                  }
-                },
-                "cryptiles": {
-                  "version": "0.2.2",
-                  "from": "cryptiles@0.2.2"
-                },
-                "sntp": {
-                  "version": "0.2.4",
-                  "from": "sntp@0.2.4",
-                  "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz",
-                  "dependencies": {
-                    "hoek": {
-                      "version": "0.9.1",
-                      "from": "hoek@0.9.1",
-                      "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
-                    }
-                  }
-                }
-              }
-            },
-            "aws-sign": {
-              "version": "0.3.0",
-              "from": "aws-sign@0.3.0"
-            },
-            "oauth-sign": {
-              "version": "0.3.0",
-              "from": "oauth-sign@0.3.0"
-            },
-            "cookie-jar": {
-              "version": "0.3.0",
-              "from": "cookie-jar@0.3.0"
-            },
-            "node-uuid": {
-              "version": "1.4.1",
-              "from": "node-uuid@1.4.1"
-            },
-            "form-data": {
-              "version": "0.0.8",
-              "from": "form-data@0.0.8",
-              "dependencies": {
-                "combined-stream": {
-                  "version": "0.0.4",
-                  "from": "combined-stream@0.0.4",
-                  "dependencies": {
-                    "delayed-stream": {
-                      "version": "0.0.5",
-                      "from": "delayed-stream@0.0.5"
-                    }
-                  }
-                },
-                "async": {
-                  "version": "0.2.10",
-                  "from": "async@0.2.10",
-                  "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "q": {
-      "version": "0.9.7",
-      "from": "q@0.9.7"
-    },
-    "request": {
-      "version": "2.21.0",
-      "from": "request@2.21.0",
-      "dependencies": {
-        "qs": {
-          "version": "0.6.6",
-          "from": "qs@0.6.6"
-        },
-        "json-stringify-safe": {
-          "version": "4.0.0",
-          "from": "json-stringify-safe@4.0.0"
-        },
-        "forever-agent": {
-          "version": "0.5.2",
-          "from": "forever-agent@0.5.2"
-        },
-        "tunnel-agent": {
-          "version": "0.3.0",
-          "from": "tunnel-agent@0.3.0"
-        },
-        "http-signature": {
-          "version": "0.9.11",
-          "from": "http-signature@0.9.11",
-          "dependencies": {
-            "assert-plus": {
-              "version": "0.1.2",
-              "from": "assert-plus@0.1.2"
-            },
-            "asn1": {
-              "version": "0.1.11",
-              "from": "asn1@0.1.11"
-            },
-            "ctype": {
-              "version": "0.5.2",
-              "from": "ctype@0.5.2"
-            }
-          }
-        },
-        "hawk": {
-          "version": "0.13.1",
-          "from": "hawk@0.13.1",
-          "dependencies": {
-            "hoek": {
-              "version": "0.8.5",
-              "from": "hoek@0.8.5"
-            },
-            "boom": {
-              "version": "0.4.2",
-              "from": "boom@0.4.2",
-              "dependencies": {
-                "hoek": {
-                  "version": "0.9.1",
-                  "from": "hoek@0.9.1"
-                }
-              }
-            },
-            "cryptiles": {
-              "version": "0.2.2",
-              "from": "cryptiles@0.2.2"
-            },
-            "sntp": {
-              "version": "0.2.4",
-              "from": "sntp@0.2.4",
-              "dependencies": {
-                "hoek": {
-                  "version": "0.9.1",
-                  "from": "hoek@0.9.1"
-                }
-              }
-            }
-          }
-        },
-        "aws-sign": {
-          "version": "0.3.0",
-          "from": "aws-sign@0.3.0"
-        },
-        "oauth-sign": {
-          "version": "0.3.0",
-          "from": "oauth-sign@0.3.0"
-        },
-        "cookie-jar": {
-          "version": "0.3.0",
-          "from": "cookie-jar@0.3.0"
-        },
-        "node-uuid": {
-          "version": "1.4.1",
-          "from": "node-uuid@1.4.1"
-        },
-        "form-data": {
-          "version": "0.0.8",
-          "from": "form-data@0.0.8",
-          "dependencies": {
-            "combined-stream": {
-              "version": "0.0.4",
-              "from": "combined-stream@0.0.4",
-              "dependencies": {
-                "delayed-stream": {
-                  "version": "0.0.5",
-                  "from": "delayed-stream@0.0.5"
-                }
-              }
-            },
-            "async": {
-              "version": "0.2.10",
-              "from": "async@0.2.10"
-            }
-          }
-        }
-      }
-    },
-    "semver": {
-      "version": "2.0.11",
-      "from": "semver@2.0.11"
-    },
-    "shelljs": {
-      "version": "0.1.4",
-      "from": "shelljs@0.1.4"
-    },
-    "tar": {
-      "version": "0.1.19",
-      "from": "tar@0.1.19",
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.1",
-          "from": "inherits@2.0.1"
-        },
-        "block-stream": {
-          "version": "0.0.7",
-          "from": "block-stream@0.0.7"
-        },
-        "fstream": {
-          "version": "0.1.25",
-          "from": "fstream@0.1.25",
-          "dependencies": {
-            "rimraf": {
-              "version": "2.2.6",
-              "from": "rimraf@2.2.6"
-            },
-            "mkdirp": {
-              "version": "0.3.5",
-              "from": "mkdirp@0.3.5"
-            },
-            "graceful-fs": {
-              "version": "2.0.2",
-              "from": "graceful-fs@2.0.2"
-            }
-          }
-        }
-      }
-    },
-    "underscore": {
-      "version": "1.4.4",
-      "from": "underscore@1.4.4"
-    },
-    "xcode": {
-      "version": "0.6.6",
-      "from": "xcode@0.6.6",
-      "dependencies": {
-        "pegjs": {
-          "version": "0.6.2",
-          "from": "pegjs@0.6.2"
-        },
-        "node-uuid": {
-          "version": "1.3.3",
-          "from": "node-uuid@1.3.3"
-        }
-      }
-    }
-  }
-}


Mime
View raw message