git commit: CB-5579 Add support for --www param for install, uninstall, prepare commands.

[ag...@apache.org]

Updated Branches:
  refs/heads/master 4a0d0be1a -> fb603eaed


CB-5579 Add support for --www param for install, uninstall, prepare commands.

>From pull request: https://github.com/apache/cordova-plugman/pull/37


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

Branch: refs/heads/master
Commit: fb603eaed52ecd69c771c1d07e586e82360526fb
Parents: 4a0d0be
Author: Liyong Wang <le...@gmail.com>
Authored: Fri Dec 6 11:07:53 2013 +0800
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Dec 10 09:29:09 2013 -0500

----------------------------------------------------------------------
 spec/prepare.spec.js | 6 ++++++
 src/install.js       | 2 +-
 src/prepare.js       | 4 ++--
 src/uninstall.js     | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/fb603eae/spec/prepare.spec.js
----------------------------------------------------------------------
diff --git a/spec/prepare.spec.js b/spec/prepare.spec.js
index b255a3b..1531885 100644
--- a/spec/prepare.spec.js
+++ b/spec/prepare.spec.js
@@ -41,6 +41,12 @@ describe('prepare', function() {
         prepare(temp, 'android', plugins_dir);
         expect(write).toHaveBeenCalledWith(js, jasmine.any(String), 'utf-8');
     });
+    it('should create cordova_plugins.js file in a custom www directory', function() {
+        var custom_www = path.join(temp, 'assets', 'custom_www'),
+            js = path.join(temp, 'assets', 'custom_www', 'cordova_plugins.js');
+        prepare(temp, 'android', plugins_dir, custom_www);
+        expect(write).toHaveBeenCalledWith(js, jasmine.any(String), 'utf-8');
+    });
     describe('handling of js-modules', function() {
         var read, child_one;
         beforeEach(function() {

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/fb603eae/src/install.js
----------------------------------------------------------------------
diff --git a/src/install.js b/src/install.js
index f23aa93..5d931e4 100644
--- a/src/install.js
+++ b/src/install.js
@@ -382,7 +382,7 @@ function handleInstall(actions, plugin_id, plugin_et, platform, project_dir, plu
         // queue up the plugin so prepare knows what to do.
         config_changes.add_installed_plugin_to_prepare_queue(plugins_dir, plugin_basename, platform, filtered_variables, is_top_level);
         // call prepare after a successful install
-        require('./../plugman').prepare(project_dir, platform, plugins_dir);
+        require('./../plugman').prepare(project_dir, platform, plugins_dir, www_dir);
 
         require('../plugman').emit('log', plugin_id + ' installed on ' + platform + '.');
         // WIN!

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/fb603eae/src/prepare.js
----------------------------------------------------------------------
diff --git a/src/prepare.js b/src/prepare.js
index e8795f2..3543499 100644
--- a/src/prepare.js
+++ b/src/prepare.js
@@ -34,7 +34,7 @@ var platform_modules = require('./platforms'),
 // Sets up each plugin's Javascript code to be loaded properly.
 // Expects a path to the project (platforms/android in CLI, . in plugman-only),
 // a path to where the plugins are downloaded, the www dir, and the platform ('android', 'ios', etc.).
-module.exports = function handlePrepare(project_dir, platform, plugins_dir) {
+module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_dir) {
     // Process:
     // - Do config munging by calling into config-changes module
     // - List all plugins in plugins_dir
@@ -46,7 +46,7 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir) {
     // - Cordova.js contains code to load them at runtime from that file.
     require('../plugman').emit('log', 'Preparing ' + platform + ' project');
     var platform_json = config_changes.get_platform_json(plugins_dir, platform);
-    var wwwDir = platform_modules[platform].www_dir(project_dir);
+    var wwwDir = www_dir || platform_modules[platform].www_dir(project_dir);
 
     // Check if there are any plugins queued for uninstallation, and if so, remove any of their plugin web assets loaded in
     // via <js-module> elements

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/fb603eae/src/uninstall.js
----------------------------------------------------------------------
diff --git a/src/uninstall.js b/src/uninstall.js
index 8f5f0c8..085923e 100644
--- a/src/uninstall.js
+++ b/src/uninstall.js
@@ -190,7 +190,7 @@ function handleUninstall(actions, platform, plugin_id, plugin_et, project_dir, w
         // queue up the plugin so prepare can remove the config changes
         config_changes.add_uninstalled_plugin_to_prepare_queue(plugins_dir, path.basename(plugin_dir), platform, is_top_level);
         // call prepare after a successful uninstall
-        require('./../plugman').prepare(project_dir, platform, plugins_dir);
+        require('./../plugman').prepare(project_dir, platform, plugins_dir, www_dir);
     });
 }