You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2014/04/16 22:57:40 UTC
[1/3] git commit: Use events.emit instead of re-importing plugman
each time
Repository: cordova-plugman
Updated Branches:
refs/heads/browserify 2551a5798 -> 7e05089d0
Use events.emit instead of re-importing plugman each time
Looks like the re-import is no longer needed after this change
github.com/apache/cordova-plugman/commit/ae2ce7ac6325d1c6558365b4be82e5a8ff0983b9
the problem was probably due to
plugman.emit = emitter.emit
without binding the "this" for emit to the emitter.
Got no clue why the re-import is hiding that problem.
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/961ccd7c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/961ccd7c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/961ccd7c
Branch: refs/heads/browserify
Commit: 961ccd7cd22d43f4b75145d916afec395dd0db56
Parents: 28318d8
Author: Mark Koudritsky <ka...@gmail.com>
Authored: Mon Apr 14 19:45:57 2014 -0400
Committer: Mark Koudritsky <ka...@gmail.com>
Committed: Mon Apr 14 19:45:57 2014 -0400
----------------------------------------------------------------------
src/platforms/amazon-fireos.js | 11 ++++++-----
src/platforms/android.js | 11 ++++++-----
src/platforms/blackberry10.js | 13 +++++++------
src/platforms/firefoxos.js | 19 ++++++++++---------
src/platforms/ios.js | 5 +++--
src/platforms/tizen.js | 19 ++++++++++---------
src/platforms/ubuntu.js | 9 +++++----
src/platforms/windows8.js | 13 +++++++------
src/platforms/wp7.js | 17 +++++++++--------
src/platforms/wp8.js | 17 +++++++++--------
10 files changed, 72 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/961ccd7c/src/platforms/amazon-fireos.js
----------------------------------------------------------------------
diff --git a/src/platforms/amazon-fireos.js b/src/platforms/amazon-fireos.js
index 0ec67dd..adfc847 100644
--- a/src/platforms/amazon-fireos.js
+++ b/src/platforms/amazon-fireos.js
@@ -20,6 +20,7 @@
var fs = require('fs') // use existsSync in 0.6.x
, path = require('path')
, common = require('./common')
+ , events = require('../events')
, xml_helpers = require(path.join(__dirname, '..', 'util', 'xml-helpers'));
module.exports = {
@@ -46,10 +47,10 @@ module.exports = {
},
"header-file": {
install:function(source_el, plugin_dir, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'header-fileinstall is not supported for amazon-fireos');
+ events.emit('verbose', 'header-fileinstall is not supported for amazon-fireos');
},
uninstall:function(source_el, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'header-file.uninstall is not supported for amazon-fireos');
+ events.emit('verbose', 'header-file.uninstall is not supported for amazon-fireos');
}
},
"lib-file":{
@@ -68,7 +69,7 @@ module.exports = {
install:function(el, plugin_dir, project_dir, plugin_id) {
var src = el.attrib.src;
var target = el.attrib.target;
- require('../../plugman').emit('verbose', 'Copying resource file ' + src + ' to ' + target);
+ events.emit('verbose', 'Copying resource file ' + src + ' to ' + target);
common.copyFile(plugin_dir, src, project_dir, target);
},
uninstall:function(el, project_dir, plugin_id) {
@@ -78,10 +79,10 @@ module.exports = {
},
"framework": {
install:function(source_el, plugin_dir, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'framework.install is not supported for amazon-fireos');
+ events.emit('verbose', 'framework.install is not supported for amazon-fireos');
},
uninstall:function(source_el, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'framework.uninstall is not supported for amazon-fireos');
+ events.emit('verbose', 'framework.uninstall is not supported for amazon-fireos');
}
}
};
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/961ccd7c/src/platforms/android.js
----------------------------------------------------------------------
diff --git a/src/platforms/android.js b/src/platforms/android.js
index e396680..c323790 100644
--- a/src/platforms/android.js
+++ b/src/platforms/android.js
@@ -20,6 +20,7 @@
var fs = require('fs') // use existsSync in 0.6.x
, path = require('path')
, common = require('./common')
+ , events = require('../events')
, xml_helpers = require(path.join(__dirname, '..', 'util', 'xml-helpers'));
module.exports = {
@@ -47,10 +48,10 @@ module.exports = {
},
"header-file": {
install:function(source_el, plugin_dir, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'header-file.install is not supported for android');
+ events.emit('verbose', 'header-file.install is not supported for android');
},
uninstall:function(source_el, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'header-file.uninstall is not supported for android');
+ events.emit('verbose', 'header-file.uninstall is not supported for android');
}
},
"lib-file":{
@@ -69,7 +70,7 @@ module.exports = {
install:function(el, plugin_dir, project_dir, plugin_id) {
var src = el.attrib.src;
var target = el.attrib.target;
- require('../../plugman').emit('verbose', 'Copying resource file ' + src + ' to ' + target);
+ events.emit('verbose', 'Copying resource file ' + src + ' to ' + target);
common.copyFile(plugin_dir, src, project_dir, path.normalize(target));
},
uninstall:function(el, project_dir, plugin_id) {
@@ -79,10 +80,10 @@ module.exports = {
},
"framework": {
install:function(source_el, plugin_dir, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'framework.install is not supported for android');
+ events.emit('verbose', 'framework.install is not supported for android');
},
uninstall:function(source_el, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'framework.uninstall is not supported for android');
+ events.emit('verbose', 'framework.uninstall is not supported for android');
}
}
};
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/961ccd7c/src/platforms/blackberry10.js
----------------------------------------------------------------------
diff --git a/src/platforms/blackberry10.js b/src/platforms/blackberry10.js
index d9e93ad..9e370b6 100644
--- a/src/platforms/blackberry10.js
+++ b/src/platforms/blackberry10.js
@@ -20,6 +20,7 @@
var fs = require('fs') // use existsSync in 0.6.x
, path = require('path')
, common = require('./common')
+ , events = require('../events')
, xml_helpers = require(path.join(__dirname, '..', 'util', 'xml-helpers'));
var TARGETS = ["device", "simulator"];
@@ -54,10 +55,10 @@ module.exports = {
},
"header-file": {
install:function(source_el, plugin_dir, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'header-file.install is not supported for blackberry');
+ events.emit('verbose', 'header-file.install is not supported for blackberry');
},
uninstall:function(source_el, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'header-file.uninstall is not supported for blackberry');
+ events.emit('verbose', 'header-file.uninstall is not supported for blackberry');
}
},
"lib-file":{
@@ -76,18 +77,18 @@ module.exports = {
},
"resource-file":{
install:function(el, plugin_dir, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'resource-file.install is not supported for blackberry');
+ events.emit('verbose', 'resource-file.install is not supported for blackberry');
},
uninstall:function(el, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'resource-file.uninstall is not supported for blackberry');
+ events.emit('verbose', 'resource-file.uninstall is not supported for blackberry');
}
},
"framework": {
install:function(source_el, plugin_dir, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'framework.install is not supported for blackberry');
+ events.emit('verbose', 'framework.install is not supported for blackberry');
},
uninstall:function(source_el, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'framework.uninstall is not supported for blackberry');
+ events.emit('verbose', 'framework.uninstall is not supported for blackberry');
}
}
};
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/961ccd7c/src/platforms/firefoxos.js
----------------------------------------------------------------------
diff --git a/src/platforms/firefoxos.js b/src/platforms/firefoxos.js
index 90f6c8f..c2e5971 100644
--- a/src/platforms/firefoxos.js
+++ b/src/platforms/firefoxos.js
@@ -1,6 +1,7 @@
var path = require('path')
, fs = require('fs')
, common = require('./common')
+ , events = require('../events')
, xml_helpers = require(path.join(__dirname, '..', 'util', 'xml-helpers'));
module.exports = {
@@ -16,7 +17,7 @@ module.exports = {
if (!fs.existsSync(old_config_path)) {
// output newer location and fail reading
config_path = preferred_path;
- require('../../plugman').emit('verbose', 'unable to find '+config_path);
+ events.emit('verbose', 'unable to find '+config_path);
} else {
config_path = old_config_path;
}
@@ -38,34 +39,34 @@ module.exports = {
},
"header-file": {
install:function(source_el, plugin_dir, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'header-fileinstall is not supported for firefoxos');
+ events.emit('verbose', 'header-fileinstall is not supported for firefoxos');
},
uninstall:function(source_el, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'header-file.uninstall is not supported for firefoxos');
+ events.emit('verbose', 'header-file.uninstall is not supported for firefoxos');
}
},
"resource-file":{
install:function(el, plugin_dir, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'resource-file.install is not supported for firefoxos');
+ events.emit('verbose', 'resource-file.install is not supported for firefoxos');
},
uninstall:function(el, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'resource-file.uninstall is not supported for firefoxos');
+ events.emit('verbose', 'resource-file.uninstall is not supported for firefoxos');
}
},
"framework": {
install:function(source_el, plugin_dir, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'framework.install is not supported for firefoxos');
+ events.emit('verbose', 'framework.install is not supported for firefoxos');
},
uninstall:function(source_el, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'framework.uninstall is not supported for firefoxos');
+ events.emit('verbose', 'framework.uninstall is not supported for firefoxos');
}
},
"lib-file": {
install:function(source_el, plugin_dir, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'lib-file.install is not supported for firefoxos');
+ events.emit('verbose', 'lib-file.install is not supported for firefoxos');
},
uninstall:function(source_el, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'lib-file.uninstall is not supported for firefoxos');
+ events.emit('verbose', 'lib-file.uninstall is not supported for firefoxos');
}
}
};
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/961ccd7c/src/platforms/ios.js
----------------------------------------------------------------------
diff --git a/src/platforms/ios.js b/src/platforms/ios.js
index c19e3cb..9631e64 100644
--- a/src/platforms/ios.js
+++ b/src/platforms/ios.js
@@ -23,6 +23,7 @@ var path = require('path')
, xcode = require('xcode')
, plist = require('plist-with-patches')
, shell = require('shelljs')
+ , events = require('../events')
, cachedProjectFiles = {};
module.exports = {
@@ -141,10 +142,10 @@ module.exports = {
},
"lib-file": {
install:function(source_el, plugin_dir, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'lib-file.install is not supported for ios');
+ events.emit('verbose', 'lib-file.install is not supported for ios');
},
uninstall:function(source_el, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'lib-file.uninstall is not supported for ios');
+ events.emit('verbose', 'lib-file.uninstall is not supported for ios');
}
},
parseProjectFile:function(project_dir) {
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/961ccd7c/src/platforms/tizen.js
----------------------------------------------------------------------
diff --git a/src/platforms/tizen.js b/src/platforms/tizen.js
index 6d42024..efbeba9 100644
--- a/src/platforms/tizen.js
+++ b/src/platforms/tizen.js
@@ -1,6 +1,7 @@
var path = require('path')
, fs = require('fs')
, common = require('./common')
+ , events = require('../events')
, xml_helpers = require(path.join(__dirname, '..', 'util', 'xml-helpers'));
module.exports = {
@@ -16,7 +17,7 @@ module.exports = {
if (!fs.existsSync(old_config_path)) {
// output newer location and fail reading
config_path = preferred_path;
- require('../../plugman').emit('verbose', 'unable to find '+config_path);
+ events.emit('verbose', 'unable to find '+config_path);
} else {
config_path = old_config_path;
}
@@ -38,34 +39,34 @@ module.exports = {
},
"header-file": {
install:function(source_el, plugin_dir, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'header-fileinstall is not supported for firefoxos');
+ events.emit('verbose', 'header-fileinstall is not supported for firefoxos');
},
uninstall:function(source_el, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'header-file.uninstall is not supported for firefoxos');
+ events.emit('verbose', 'header-file.uninstall is not supported for firefoxos');
}
},
"resource-file":{
install:function(el, plugin_dir, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'resource-file.install is not supported for firefoxos');
+ events.emit('verbose', 'resource-file.install is not supported for firefoxos');
},
uninstall:function(el, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'resource-file.uninstall is not supported for firefoxos');
+ events.emit('verbose', 'resource-file.uninstall is not supported for firefoxos');
}
},
"framework": {
install:function(source_el, plugin_dir, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'framework.install is not supported for firefoxos');
+ events.emit('verbose', 'framework.install is not supported for firefoxos');
},
uninstall:function(source_el, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'framework.uninstall is not supported for firefoxos');
+ events.emit('verbose', 'framework.uninstall is not supported for firefoxos');
}
},
"lib-file": {
install:function(source_el, plugin_dir, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'lib-file.install is not supported for firefoxos');
+ events.emit('verbose', 'lib-file.install is not supported for firefoxos');
},
uninstall:function(source_el, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'lib-file.uninstall is not supported for firefoxos');
+ events.emit('verbose', 'lib-file.uninstall is not supported for firefoxos');
}
}
};
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/961ccd7c/src/platforms/ubuntu.js
----------------------------------------------------------------------
diff --git a/src/platforms/ubuntu.js b/src/platforms/ubuntu.js
index d878e51..d04b774 100644
--- a/src/platforms/ubuntu.js
+++ b/src/platforms/ubuntu.js
@@ -29,6 +29,7 @@ function toCamelCase(str) {
var fs = require('fs')
, path = require('path')
+ , events = require('../events')
, xml_helpers = require(path.join(__dirname, '..', 'util', 'xml-helpers'));
module.exports = {
@@ -106,18 +107,18 @@ module.exports = {
},
"framework": {
install:function(source_el, plugin_dir, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'framework.install is not supported for ubuntu');
+ events.emit('verbose', 'framework.install is not supported for ubuntu');
},
uninstall:function(source_el, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'framework.uninstall is not supported for ubuntu');
+ events.emit('verbose', 'framework.uninstall is not supported for ubuntu');
}
},
"lib-file": {
install:function(source_el, plugin_dir, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'lib-file.install is not supported for ubuntu');
+ events.emit('verbose', 'lib-file.install is not supported for ubuntu');
},
uninstall:function(source_el, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'lib-file.uninstall is not supported for ubuntu');
+ events.emit('verbose', 'lib-file.uninstall is not supported for ubuntu');
}
}
};
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/961ccd7c/src/platforms/windows8.js
----------------------------------------------------------------------
diff --git a/src/platforms/windows8.js b/src/platforms/windows8.js
index 2232192..1f7583f 100644
--- a/src/platforms/windows8.js
+++ b/src/platforms/windows8.js
@@ -23,6 +23,7 @@ var common = require('./common'),
shell = require('shelljs'),
fs = require('fs'),
w8jsproj = require('../util/w8jsproj'),
+ events = require('../events'),
xml_helpers = require('../util/xml-helpers');
@@ -63,15 +64,15 @@ module.exports = {
},
"header-file": {
install:function(source_el, plugin_dir, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'header-fileinstall is not supported for Windows 8');
+ events.emit('verbose', 'header-fileinstall is not supported for Windows 8');
},
uninstall:function(source_el, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'header-file.uninstall is not supported for Windows 8');
+ events.emit('verbose', 'header-file.uninstall is not supported for Windows 8');
}
},
"resource-file":{
install:function(el, plugin_dir, project_dir, plugin_id, project_file) {
- require('../../plugman').emit('verbose', 'resource-file is not supported for Windows 8');
+ events.emit('verbose', 'resource-file is not supported for Windows 8');
},
uninstall:function(el, project_dir, plugin_id, project_file) {
}
@@ -82,14 +83,14 @@ module.exports = {
project_file.addSDKRef(inc);
},
uninstall:function(el, project_dir, plugin_id, project_file) {
- require('../../plugman').emit('verbose', 'windows8 lib-file uninstall :: ' + plugin_id);
+ events.emit('verbose', 'windows8 lib-file uninstall :: ' + plugin_id);
var inc = el.attrib['Include'];
project_file.removeSDKRef(inc);
}
},
"framework": {
install:function(el, plugin_dir, project_dir, plugin_id, project_file) {
- require('../../plugman').emit('verbose', 'windows8 framework install :: ' + plugin_id);
+ events.emit('verbose', 'windows8 framework install :: ' + plugin_id);
var src = el.attrib['src'];
var dest = src; // if !isCustom, we will just add a reference to the file in place
@@ -109,7 +110,7 @@ module.exports = {
},
uninstall:function(el, project_dir, plugin_id, project_file) {
- require('../../plugman').emit('verbose', 'windows8 framework uninstall :: ' + plugin_id );
+ events.emit('verbose', 'windows8 framework uninstall :: ' + plugin_id );
var src = el.attrib['src'];
// technically it is not possible to get here without isCustom == true -jm
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/961ccd7c/src/platforms/wp7.js
----------------------------------------------------------------------
diff --git a/src/platforms/wp7.js b/src/platforms/wp7.js
index ebbd862..e6a76d0 100644
--- a/src/platforms/wp7.js
+++ b/src/platforms/wp7.js
@@ -22,6 +22,7 @@ var common = require('./common'),
glob = require('glob'),
fs = require('fs'),
csproj = require('../util/csproj'),
+ events = require('../events'),
xml_helpers = require('../util/xml-helpers');
module.exports = {
@@ -57,34 +58,34 @@ module.exports = {
},
"header-file": {
install:function(source_el, plugin_dir, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'header-fileinstall is not supported for wp7');
+ events.emit('verbose', 'header-fileinstall is not supported for wp7');
},
uninstall:function(source_el, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'header-file.uninstall is not supported for wp7');
+ events.emit('verbose', 'header-file.uninstall is not supported for wp7');
}
},
"resource-file":{
install:function(el, plugin_dir, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'resource-file.install is not supported for wp7');
+ events.emit('verbose', 'resource-file.install is not supported for wp7');
},
uninstall:function(el, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'resource-file.uninstall is not supported for wp7');
+ events.emit('verbose', 'resource-file.uninstall is not supported for wp7');
}
},
"framework": {
install:function(source_el, plugin_dir, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'framework.install is not supported for wp7');
+ events.emit('verbose', 'framework.install is not supported for wp7');
},
uninstall:function(source_el, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'framework.uninstall is not supported for wp7');
+ events.emit('verbose', 'framework.uninstall is not supported for wp7');
}
},
"lib-file": {
install:function(source_el, plugin_dir, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'lib-file.install is not supported for wp7');
+ events.emit('verbose', 'lib-file.install is not supported for wp7');
},
uninstall:function(source_el, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'lib-file.uninstall is not supported for wp7');
+ events.emit('verbose', 'lib-file.uninstall is not supported for wp7');
}
}
};
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/961ccd7c/src/platforms/wp8.js
----------------------------------------------------------------------
diff --git a/src/platforms/wp8.js b/src/platforms/wp8.js
index 8eb62c2..31bbdea 100644
--- a/src/platforms/wp8.js
+++ b/src/platforms/wp8.js
@@ -22,6 +22,7 @@ var common = require('./common'),
glob = require('glob'),
fs = require('fs'),
csproj = require('../util/csproj'),
+ events = require('../events'),
xml_helpers = require('../util/xml-helpers');
module.exports = {
@@ -57,23 +58,23 @@ module.exports = {
},
"header-file": {
install:function(source_el, plugin_dir, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'header-file.install is not supported for wp8');
+ events.emit('verbose', 'header-file.install is not supported for wp8');
},
uninstall:function(source_el, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'header-file.uninstall is not supported for wp8');
+ events.emit('verbose', 'header-file.uninstall is not supported for wp8');
}
},
"resource-file":{
install:function(el, plugin_dir, project_dir, plugin_id, project_file) {
- require('../../plugman').emit('verbose', 'resource-file.install is not supported for wp8');
+ events.emit('verbose', 'resource-file.install is not supported for wp8');
},
uninstall:function(el, project_dir, plugin_id, project_file) {
- require('../../plugman').emit('verbose', 'resource-file.uninstall is not supported for wp8');
+ events.emit('verbose', 'resource-file.uninstall is not supported for wp8');
}
},
"framework":{
install:function(el, plugin_dir, project_dir, plugin_id, project_file) {
- require('../../plugman').emit('verbose', 'wp8 framework install :: ' + plugin_id );
+ events.emit('verbose', 'wp8 framework install :: ' + plugin_id );
var src = el.attrib['src'];
var dest = src; // if !isCustom, we will just add a reference to the file in place
@@ -88,7 +89,7 @@ module.exports = {
},
uninstall:function(el, project_dir, plugin_id, project_file) {
- require('../../plugman').emit('verbose', 'wp8 framework uninstall :: ' + plugin_id );
+ events.emit('verbose', 'wp8 framework uninstall :: ' + plugin_id );
var src = el.attrib['src'];
var isCustom = el.attrib.custom == "true";
@@ -103,10 +104,10 @@ module.exports = {
},
"lib-file": {
install:function(source_el, plugin_dir, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'lib-file.install is not supported for wp8');
+ events.emit('verbose', 'lib-file.install is not supported for wp8');
},
uninstall:function(source_el, project_dir, plugin_id) {
- require('../../plugman').emit('verbose', 'lib-file.uninstall is not supported for wp8');
+ events.emit('verbose', 'lib-file.uninstall is not supported for wp8');
}
}
};
[2/3] git commit: Use events.emit instead of re-importing plugman
each time. Part 2.
Posted by an...@apache.org.
Use events.emit instead of re-importing plugman each time. Part 2.
See details in 961ccd7cd22d43f4b75145d916afec395dd0db56
The first part added the change only under src/platforms/
this one changes it everywhere else.
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/c14f6b88
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/c14f6b88
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/c14f6b88
Branch: refs/heads/browserify
Commit: c14f6b88441924fa186fa76eb1fad37327bcf066
Parents: 961ccd7
Author: Mark Koudritsky <ka...@gmail.com>
Authored: Mon Apr 14 20:18:58 2014 -0400
Committer: Mark Koudritsky <ka...@gmail.com>
Committed: Mon Apr 14 20:18:58 2014 -0400
----------------------------------------------------------------------
src/fetch.js | 11 ++++++-----
src/util/action-stack.js | 13 +++++++------
src/util/plugins.js | 11 ++++++-----
src/util/w8jsproj.js | 11 ++++++-----
4 files changed, 25 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/c14f6b88/src/fetch.js
----------------------------------------------------------------------
diff --git a/src/fetch.js b/src/fetch.js
index 5b245ad..9948b7f 100644
--- a/src/fetch.js
+++ b/src/fetch.js
@@ -3,6 +3,7 @@ var shell = require('shelljs'),
url = require('url'),
plugins = require('./util/plugins'),
xml_helpers = require('./util/xml-helpers'),
+ events = require('./events'),
metadata = require('./util/metadata'),
path = require('path'),
Q = require('q'),
@@ -42,7 +43,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:' && uri.protocol != 'c:' && !plugin_src.match(/^\w+:\\/)) {
- require('../plugman').emit('log', 'Fetching plugin "' + plugin_src + '" via git clone');
+ events.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 {
@@ -79,11 +80,11 @@ module.exports = function fetchPlugin(plugin_src, plugins_dir, options) {
var local_dir = findLocalPlugin(plugin_src, options.searchpath);
if (local_dir) {
p = Q(local_dir);
- require('../plugman').emit('verbose', 'Found ' + plugin_src + ' at ' + local_dir);
+ events.emit('verbose', 'Found ' + 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');
+ events.emit('log', 'Fetching plugin "' + plugin_src + '" via plugin registry');
p = registry.fetch([plugin_src], options.client);
}
}
@@ -155,11 +156,11 @@ function copyPlugin(plugin_dir, plugins_dir, link) {
var dest = path.join(plugins_dir, plugin_id);
shell.rm('-rf', dest);
if (link) {
- require('../plugman').emit('verbose', 'Linking plugin "' + plugin_dir + '" => "' + dest + '"');
+ events.emit('verbose', 'Linking plugin "' + plugin_dir + '" => "' + dest + '"');
fs.symlinkSync(plugin_dir, dest, 'dir');
} else {
shell.mkdir('-p', dest);
- require('../plugman').emit('verbose', 'Copying plugin "' + plugin_dir + '" => "' + dest + '"');
+ events.emit('verbose', 'Copying plugin "' + plugin_dir + '" => "' + dest + '"');
shell.cp('-R', path.join(plugin_dir, '*') , dest);
}
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/c14f6b88/src/util/action-stack.js
----------------------------------------------------------------------
diff --git a/src/util/action-stack.js b/src/util/action-stack.js
index 3a5107a..dd9dafb 100644
--- a/src/util/action-stack.js
+++ b/src/util/action-stack.js
@@ -1,4 +1,5 @@
var platforms = require("../platforms"),
+ events = require('../events'),
Q = require('q'),
fs = require('fs');
@@ -25,12 +26,12 @@ ActionStack.prototype = {
},
// Returns a promise.
process:function(platform, project_dir) {
- require('../../plugman').emit('verbose', 'Beginning processing of action stack for ' + platform + ' project...');
+ events.emit('verbose', 'Beginning processing of action stack for ' + platform + ' project...');
var project_files;
// parse platform-specific project files once
if (platforms[platform].parseProjectFile) {
- require('../../plugman').emit('verbose', 'Parsing ' + platform + ' project files...');
+ events.emit('verbose', 'Parsing ' + platform + ' project files...');
project_files = platforms[platform].parseProjectFile(project_dir);
}
@@ -45,7 +46,7 @@ ActionStack.prototype = {
try {
handler.apply(null, action_params);
} catch(e) {
- require('../../plugman').emit('warn', 'Error during processing of action! Attempting to revert...');
+ events.emit('warn', 'Error during processing of action! Attempting to revert...');
var incomplete = this.stack.unshift(action);
var issue = 'Uh oh!\n';
// revert completed tasks
@@ -61,7 +62,7 @@ ActionStack.prototype = {
try {
revert.apply(null, revert_params);
} catch(err) {
- require('../../plugman').emit('warn', 'Error during reversion of action! We probably really messed up your project now, sorry! D:');
+ events.emit('warn', 'Error during reversion of action! We probably really messed up your project now, sorry! D:');
issue += 'A reversion action failed: ' + err.message + '\n';
}
}
@@ -70,10 +71,10 @@ ActionStack.prototype = {
}
this.completed.push(action);
}
- require('../../plugman').emit('verbose', 'Action stack processing complete.');
+ events.emit('verbose', 'Action stack processing complete.');
if (project_files) {
- require('../../plugman').emit('verbose', 'Writing out ' + platform + ' project files...');
+ events.emit('verbose', 'Writing out ' + platform + ' project files...');
project_files.write();
}
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/c14f6b88/src/util/plugins.js
----------------------------------------------------------------------
diff --git a/src/util/plugins.js b/src/util/plugins.js
index 3801be7..7613169 100644
--- a/src/util/plugins.js
+++ b/src/util/plugins.js
@@ -26,6 +26,7 @@ var http = require('http'),
child_process = require('child_process'),
Q = require('q'),
xml_helpers = require('./xml-helpers'),
+ events = require('../events'),
tmp_dir;
module.exports = {
@@ -53,7 +54,7 @@ module.exports = {
shell.rm('-rf', tmp_dir);
var cmd = util.format('git clone "%s" "%s"', plugin_git_url, tmp_dir);
- require('../../plugman').emit('verbose', 'Fetching plugin via git-clone command: ' + cmd);
+ events.emit('verbose', 'Fetching plugin via git-clone command: ' + cmd);
var d = Q.defer();
child_process.exec(cmd, function(err, stdout, stderr) {
@@ -64,7 +65,7 @@ module.exports = {
}
});
return d.promise.then(function() {
- require('../../plugman').emit('verbose', 'Plugin "' + plugin_git_url + '" fetched.');
+ events.emit('verbose', 'Plugin "' + plugin_git_url + '" fetched.');
// Check out the specified revision, if provided.
if (git_ref) {
var cmd = util.format('git checkout "%s"', git_ref);
@@ -74,7 +75,7 @@ module.exports = {
else d2.resolve();
});
return d2.promise.then(function() {
- require('../../plugman').emit('log', 'Plugin "' + plugin_git_url + '" checked out to git ref "' + git_ref + '".');
+ events.emit('log', 'Plugin "' + plugin_git_url + '" checked out to git ref "' + git_ref + '".');
});
}
}).then(function() {
@@ -88,10 +89,10 @@ module.exports = {
// TODO: what if a plugin dependended on different subdirectories of the same plugin? this would fail.
// should probably copy over entire plugin git repo contents into plugins_dir and handle subdir seperately during install.
var plugin_dir = path.join(plugins_dir, plugin_id);
- require('../../plugman').emit('verbose', 'Copying fetched plugin over "' + plugin_dir + '"...');
+ events.emit('verbose', 'Copying fetched plugin over "' + plugin_dir + '"...');
shell.cp('-R', path.join(tmp_dir, '*'), plugin_dir);
- require('../../plugman').emit('verbose', 'Plugin "' + plugin_id + '" fetched.');
+ events.emit('verbose', 'Plugin "' + plugin_id + '" fetched.');
return plugin_dir;
});
}
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/c14f6b88/src/util/w8jsproj.js
----------------------------------------------------------------------
diff --git a/src/util/w8jsproj.js b/src/util/w8jsproj.js
index a890429..692719e 100644
--- a/src/util/w8jsproj.js
+++ b/src/util/w8jsproj.js
@@ -7,6 +7,7 @@ var xml_helpers = require('./xml-helpers'),
et = require('elementtree'),
fs = require('fs'),
shell = require('shelljs'),
+ events = require('../events'),
path = require('path');
var WindowsStoreProjectTypeGUID = "{BC8A1FFA-BEE3-4634-8014-F334798102B3}"; // any of the below, subtype
@@ -16,7 +17,7 @@ var WinCplusplusProjectTypeGUID = "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}"; // .
function jsproj(location) {
- require('../../plugman').emit('verbose','creating jsproj from project at : ' + location);
+ events.emit('verbose','creating jsproj from project at : ' + location);
this.location = location;
this.xml = xml_helpers.parseElementtreeSync(location);
return this;
@@ -50,7 +51,7 @@ jsproj.prototype = {
addReference:function(relPath,src) {
- require('../../plugman').emit('verbose','addReference::' + relPath);
+ events.emit('verbose','addReference::' + relPath);
var item = new et.Element('ItemGroup');
var extName = path.extname(relPath);
@@ -76,7 +77,7 @@ jsproj.prototype = {
},
removeReference:function(relPath) {
- require('../../plugman').emit('verbose','removeReference::' + relPath);
+ events.emit('verbose','removeReference::' + relPath);
var extName = path.extname(relPath);
var includeText = path.basename(relPath,extName);
@@ -130,7 +131,7 @@ jsproj.prototype = {
},
// relative path must include the project file, so we can determine .csproj, .jsproj, .vcxproj...
addProjectReference:function(relative_path) {
- require('../../plugman').emit('verbose','adding project reference to ' + relative_path);
+ events.emit('verbose','adding project reference to ' + relative_path);
relative_path = relative_path.split('/').join('\\');
// read the solution path from the base directory
@@ -186,7 +187,7 @@ jsproj.prototype = {
},
removeProjectReference:function(relative_path) {
- require('../../plugman').emit('verbose','removing project reference to ' + relative_path);
+ events.emit('verbose','removing project reference to ' + relative_path);
// find the guid + name of the referenced project
var pluginProjectXML = xml_helpers.parseElementtreeSync(relative_path);
[3/3] git commit: Merge branch 'master' into browserify
Posted by an...@apache.org.
Merge branch 'master' into browserify
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/7e05089d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/7e05089d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/7e05089d
Branch: refs/heads/browserify
Commit: 7e05089d036b89d292b0b7de69d281979883b0c2
Parents: 2551a57 c14f6b8
Author: Anis Kadri <an...@apache.org>
Authored: Wed Apr 16 13:57:02 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Wed Apr 16 13:57:02 2014 -0700
----------------------------------------------------------------------
src/fetch.js | 11 ++++++-----
src/platforms/amazon-fireos.js | 11 ++++++-----
src/platforms/android.js | 11 ++++++-----
src/platforms/blackberry10.js | 13 +++++++------
src/platforms/firefoxos.js | 19 ++++++++++---------
src/platforms/ios.js | 5 +++--
src/platforms/tizen.js | 19 ++++++++++---------
src/platforms/ubuntu.js | 9 +++++----
src/platforms/windows8.js | 13 +++++++------
src/platforms/wp7.js | 17 +++++++++--------
src/platforms/wp8.js | 17 +++++++++--------
src/util/action-stack.js | 13 +++++++------
src/util/plugins.js | 11 ++++++-----
src/util/w8jsproj.js | 11 ++++++-----
14 files changed, 97 insertions(+), 83 deletions(-)
----------------------------------------------------------------------