git commit: CB-5006 Fix searchpath not being passed to dependent plugins.

[ag...@apache.org]

Updated Branches:
  refs/heads/master ece3a3dae -> 865ad7c71


CB-5006 Fix searchpath not being passed to dependent plugins.


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/865ad7c7
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/865ad7c7
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/865ad7c7

Branch: refs/heads/master
Commit: 865ad7c71fc560f74d29af4af14c710affdfc0a0
Parents: ece3a3d
Author: Andrew Grieve <ag...@chromium.org>
Authored: Wed Jan 15 10:31:05 2014 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Wed Jan 15 10:31:05 2014 -0500

----------------------------------------------------------------------
 src/fetch.js   | 6 ++++--
 src/install.js | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/865ad7c7/src/fetch.js
----------------------------------------------------------------------
diff --git a/src/fetch.js b/src/fetch.js
index 71df720..2518917 100644
--- a/src/fetch.js
+++ b/src/fetch.js
@@ -11,7 +11,6 @@ var shell   = require('shelljs'),
 // possible options: link, subdir, git_ref, client, expected_id
 // Returns a promise.
 module.exports = function fetchPlugin(plugin_src, plugins_dir, options) {
-    require('../plugman').emit('log', 'Fetching plugin from "' + plugin_src + '"...');
     // Ensure the containing directory exists.
     shell.mkdir('-p', plugins_dir);
 
@@ -43,6 +42,7 @@ module.exports = function fetchPlugin(plugin_src, plugins_dir, options) {
 
     // If it looks like a network URL, git clone it.
     if ( uri.protocol && uri.protocol != 'file:' && !plugin_src.match(/^\w+:\\/)) {
+        require('../plugman').emit('log', 'Fetching plugin "' + plugin_src + '" via git clone');
         if (options.link) {
             return Q.reject(new Error('--link is not supported for git URLs'));
         } else {
@@ -80,11 +80,13 @@ module.exports = function fetchPlugin(plugin_src, plugins_dir, options) {
             // If there is no such local path, it's a plugin id.
             // First look for it in the local search path (if provided).
             var local_dir = findLocalPlugin(plugin_src, options.searchpath);
-            if(local_dir) {
+            if (local_dir) {
                 p = Q(local_dir);
+                require('../plugman').emit('log', 'Found plugin "' + plugin_src + '" at: ' + local_dir);
             } else {
                 // If not found in local search path, fetch from the registry.
                 linkable = false;
+                require('../plugman').emit('log', 'Fetching plugin "' + plugin_src + '" via plugin registry');
                 p = registry.fetch([plugin_src], options.client);
             }
         }

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/865ad7c7/src/install.js
----------------------------------------------------------------------
diff --git a/src/install.js b/src/install.js
index 28c030f..520fb7d 100644
--- a/src/install.js
+++ b/src/install.js
@@ -309,7 +309,8 @@ var runInstall = module.exports.runInstall = function runInstall(actions, platfo
                             is_top_level: false,
                             subdir: dep_subdir,
                             git_ref: dep_git_ref,
-                            expected_id: dep_plugin_id
+                            expected_id: dep_plugin_id,
+                            searchpath: options.searchpath
                         };
 
                         // CB-4770: registry fetching