You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by fi...@apache.org on 2013/05/16 17:57:17 UTC
[18/20] git commit: tweaks for prepare specs
tweaks for prepare specs
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/f025a2a9
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/f025a2a9
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/f025a2a9
Branch: refs/heads/master
Commit: f025a2a98a4bec04d825d0ac1bd55e4fce61b37a
Parents: bf56f3e
Author: Fil Maj <ma...@gmail.com>
Authored: Wed May 15 15:03:37 2013 -0700
Committer: Fil Maj <ma...@gmail.com>
Committed: Thu May 16 08:55:43 2013 -0700
----------------------------------------------------------------------
spec/prepare.spec.js | 11 ++++-------
src/prepare.js | 30 +-----------------------------
src/util/config-changes.js | 5 ++---
3 files changed, 7 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/f025a2a9/spec/prepare.spec.js
----------------------------------------------------------------------
diff --git a/spec/prepare.spec.js b/spec/prepare.spec.js
index b3bce26..7fa49c0 100644
--- a/spec/prepare.spec.js
+++ b/spec/prepare.spec.js
@@ -1,4 +1,5 @@
-var prepare = require('../src/prepare'),
+var platforms = require('../src/platforms'),
+ prepare = require('../src/prepare'),
fs = require('fs'),
os = require('osenv'),
path = require('path'),
@@ -15,8 +16,8 @@ describe('prepare', function() {
beforeEach(function() {
shell.mkdir('-p', temp);
shell.mkdir('-p', plugins_dir);
- shell.cp('-rf', android_one_project, temp);
shell.cp('-rf', childbrowser, plugins_dir);
+ shell.cp('-rf', android_one_project, temp);
});
afterEach(function() {
shell.rm('-rf', temp);
@@ -28,12 +29,8 @@ describe('prepare', function() {
prepare(temp, 'android', plugins_dir);
expect(fs.existsSync(path.join(www, 'cordova_plugins.json'))).toBe(true);
});
-// it('should copy over assets defined in <asset> elements', function() {
-// prepare(temp, 'android', plugins_dir);
-// expect(fs.existsSync(path.join(www, 'childbrowser_file.html'))).toBe(true);
-// expect(fs.statSync(path.join(www, 'childbrowser')).isDirectory()).toBe(true);
-// });
it('should create a plugins directory in an application\'s www directory', function() {
+ shell.cp('-rf', dummyplugin, plugins_dir);
prepare(temp, 'android', plugins_dir);
expect(fs.existsSync(path.join(www, 'plugins'))).toBe(true);
});
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/f025a2a9/src/prepare.js
----------------------------------------------------------------------
diff --git a/src/prepare.js b/src/prepare.js
index 49412b1..7f3df91 100644
--- a/src/prepare.js
+++ b/src/prepare.js
@@ -58,35 +58,7 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir) {
var plugin_id = xml.getroot().attrib.id;
- // Copy all the <asset>s into the platform's www/
- // var assets = xml.findall('./asset');
- // assets && assets.forEach(function(asset) {
- // var target = asset.attrib.target;
- //
- // var lastSlash = target.lastIndexOf('/');
- // var dirname = lastSlash < 0 ? '' : target.substring(0, lastSlash);
- // var basename = lastSlash < 0 ? target : target.substring(lastSlash + 1);
-
- // var targetDir = path.join(wwwDir, dirname);
- //
- // shell.mkdir('-p', targetDir);
-
- // var srcFile = path.join(pluginDir, asset.attrib.src);
- // var targetFile = path.join(targetDir, basename);
-
- // var cpOptions = '-f';
- //
- // if(fs.statSync(srcFile).isDirectory()){
- // shell.mkdir('-p',targetFile);
- // srcFile = srcFile+'/*';
- // cpOptions = '-Rf';
- // }
-
- // shell.cp(cpOptions, [srcFile], targetFile);
- //
- // });
-
- // And then add the plugins dir to the platform's www.
+ // add the plugins dir to the platform's www.
var platformPluginsDir = path.join(wwwDir, 'plugins');
// XXX this should not be here if there are no js-module. It leaves an empty plugins/ directory
shell.mkdir('-p', platformPluginsDir);
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/f025a2a9/src/util/config-changes.js
----------------------------------------------------------------------
diff --git a/src/util/config-changes.js b/src/util/config-changes.js
index 83eefb8..5276184 100644
--- a/src/util/config-changes.js
+++ b/src/util/config-changes.js
@@ -23,12 +23,11 @@ var fs = require('fs'),
plist = require('plist'),
bplist = require('bplist-parser'),
et = require('elementtree'),
- platforms = require('./../platforms'),
xml_helpers = require('./../util/xml-helpers'),
plist_helpers = require('./../util/plist-helpers');
function checkPlatform(platform) {
- if (!(platform in platforms)) throw new Error('platform "' + platform + '" not recognized.');
+ if (!(platform in require('./../platforms'))) throw new Error('platform "' + platform + '" not recognized.');
}
module.exports = {
@@ -74,7 +73,7 @@ module.exports = {
checkPlatform(platform);
vars = vars || {};
- var platform_handler = platforms[platform];
+ var platform_handler = require('./../platforms')[platform];
// Add PACKAGE_NAME variable into vars
if (!vars['PACKAGE_NAME']) {
vars['PACKAGE_NAME'] = platform_handler.package_name(project_dir);