You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2015/12/05 02:26:56 UTC
[2/8] cordova-lib git commit: more robust class name detection
more robust class name detection
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/afde15c7
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/afde15c7
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/afde15c7
Branch: refs/heads/master
Commit: afde15c7e6748dfedbdd9816df199c14f2f7596e
Parents: 187711d
Author: David Barth <da...@canonical.com>
Authored: Fri Sep 4 13:41:13 2015 +0200
Committer: David Barth <da...@canonical.com>
Committed: Fri Sep 4 13:41:13 2015 +0200
----------------------------------------------------------------------
cordova-lib/src/plugman/platforms/ubuntu.js | 29 ++++++++++++------------
1 file changed, 15 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/afde15c7/cordova-lib/src/plugman/platforms/ubuntu.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/platforms/ubuntu.js b/cordova-lib/src/plugman/platforms/ubuntu.js
index c15d506..78a2f04 100644
--- a/cordova-lib/src/plugman/platforms/ubuntu.js
+++ b/cordova-lib/src/plugman/platforms/ubuntu.js
@@ -29,6 +29,19 @@ function toCamelCase(str) {
}).join('');
}
+function findClassName(str) {
+ var class_name;
+
+ if (str.match(/\.[^.]+$/)) {
+ // old-style plugin name
+ class_name = str.match(/\.[^.]+$/)[0].substr(1);
+ } else {
+ class_name = str.match(/cordova\-plugin\-([\w\-]+)$/)[0].substr(15);
+ }
+
+ return class_name;
+}
+
var shell = require('shelljs')
, fs = require('fs')
, path = require('path')
@@ -71,13 +84,7 @@ module.exports = {
var src = String(fs.readFileSync(plugins));
src = src.replace('INSERT_HEADER_HERE', '#include "plugins/' + plugin_id + '/' + path.basename(obj.src) +'"\nINSERT_HEADER_HERE');
- var class_name;
- if (plugin_id.match(/\.[^.]+$/)) {
- // old-style plugin name
- class_name = plugin_id.match(/\.[^.]+$/)[0].substr(1);
- } else {
- class_name = plugin_id.match(/\-[^\-]+$/)[0].substr(1);
- }
+ var class_name = findClassName(plugin_id);
class_name = toCamelCase(class_name);
src = src.replace('INSERT_PLUGIN_HERE', 'INIT_PLUGIN(' + class_name + ');INSERT_PLUGIN_HERE');
@@ -91,13 +98,7 @@ module.exports = {
var src = String(fs.readFileSync(plugins));
src = src.replace('#include "plugins/' + plugin_id + '/' + path.basename(obj.src) +'"', '');
- var class_name;
- if (plugin_id.match(/\.[^.]+$/)) {
- // old-style plugin name
- class_name = plugin_id.match(/\.[^.]+$/)[0].substr(1);
- } else {
- class_name = plugin_id.match(/\-[^\-]+$/)[0].substr(1);
- }
+ var class_name = findClassName(plugin_id);
class_name = toCamelCase(class_name);
src = src.replace('INIT_PLUGIN(' + class_name + ');', '');
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org