android commit: CB-10963: Handle overlapping permission requests from plugins

2016-03-29 Thread rknoll 
Repository: cordova-android
Updated Branches:
  refs/heads/master d9814c554 -> ef268e232


CB-10963: Handle overlapping permission requests from plugins

This closes #285


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

Branch: refs/heads/master
Commit: ef268e23206f3378d5c8c5dd279d2821830766b2
Parents: d9814c5
Author: Richard Knoll 
Authored: Fri Mar 25 11:07:27 2016 -0700
Committer: Richard Knoll 
Committed: Tue Mar 29 15:14:41 2016 -0700

--
 .../src/org/apache/cordova/CallbackMap.java | 65 
 .../apache/cordova/CordovaInterfaceImpl.java| 21 +++
 2 files changed, 75 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/ef268e23/framework/src/org/apache/cordova/CallbackMap.java
--
diff --git a/framework/src/org/apache/cordova/CallbackMap.java 
b/framework/src/org/apache/cordova/CallbackMap.java
new file mode 100644
index 000..050daa0
--- /dev/null
+++ b/framework/src/org/apache/cordova/CallbackMap.java
@@ -0,0 +1,65 @@
+/*
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+*/
+package org.apache.cordova;
+
+import android.util.Pair;
+import android.util.SparseArray;
+
+/**
+ * Provides a collection that maps unique request codes to CordovaPlugins and 
Integers.
+ * Used to ensure that when plugins make requests for runtime permissions, 
those requests do not
+ * collide with requests from other plugins that use the same request code 
value.
+ */
+public class CallbackMap {
+private int currentCallbackId = 0;
+private SparseArray> callbacks;
+
+public CallbackMap() {
+this.callbacks = new SparseArray>();
+}
+
+/**
+ * Stores a CordovaPlugin and request code and returns a new unique 
request code to use
+ * in a permission request.
+ *
+ * @param receiver  The plugin that is making the request
+ * @param requestCode   The original request code used by the plugin
+ * @return  A unique request code that can be used to retrieve 
this callback
+ *  with getAndRemoveCallback()
+ */
+public synchronized int registerCallback(CordovaPlugin receiver, int 
requestCode) {
+int mappedId = this.currentCallbackId++;
+callbacks.put(mappedId, new Pair(receiver, 
requestCode));
+return mappedId;
+}
+
+/**
+ * Retrieves and removes a callback stored in the map using the mapped 
request code
+ * obtained from registerCallback()
+ *
+ * @param mappedId  The request code obtained from registerCallback()
+ * @return  The CordovaPlugin and orignal request code that 
correspond to the
+ *  given mappedCode
+ */
+public synchronized Pair getAndRemoveCallback(int 
mappedId) {
+Pair callback = callbacks.get(mappedId);
+callbacks.remove(mappedId);
+return callback;
+}
+}

http://git-wip-us.apache.org/repos/asf/cordova-android/blob/ef268e23/framework/src/org/apache/cordova/CordovaInterfaceImpl.java
--
diff --git a/framework/src/org/apache/cordova/CordovaInterfaceImpl.java 
b/framework/src/org/apache/cordova/CordovaInterfaceImpl.java
index d1420b6..db94e66 100644
--- a/framework/src/org/apache/cordova/CordovaInterfaceImpl.java
+++ b/framework/src/org/apache/cordova/CordovaInterfaceImpl.java
@@ -25,6 +25,7 @@ import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
+import android.util.Pair;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -42,8 +43,8 @@ public class CordovaInterfaceImpl implements CordovaInterface 
{
 protected PluginMan

cordova-plugin-contacts git commit: CB-10881 Add extra logging to gather more information about tests behavior

2016-03-29 Thread omefire 
Repository: cordova-plugin-contacts
Updated Branches:
  refs/heads/master 1c6668ef1 -> 8a08f75ca


CB-10881 Add extra logging to gather more information about tests behavior


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/commit/8a08f75c
Tree: 
http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/tree/8a08f75c
Diff: 
http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/diff/8a08f75c

Branch: refs/heads/master
Commit: 8a08f75cad9e6b127884e9e5e2fae3e44225c702
Parents: 1c6668e
Author: Omar Mefire 
Authored: Tue Mar 29 12:51:46 2016 -0700
Committer: Omar Mefire 
Committed: Tue Mar 29 14:39:38 2016 -0700

--
 tests/tests.js | 100 +++-
 1 file changed, 92 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cordova-plugin-contacts/blob/8a08f75c/tests/tests.js
--
diff --git a/tests/tests.js b/tests/tests.js
index 951a284..18def3a 100644
--- a/tests/tests.js
+++ b/tests/tests.js
@@ -49,7 +49,7 @@ exports.defineAutoTests = function() {
 };
 
 var MEDIUM_TIMEOUT = 3;
-
+
 var removeContact = function(done) {
 if (!gContactObj) {
 done();
@@ -116,6 +116,24 @@ exports.defineAutoTests = function() {
 removeNext(nextToRemove);
 }, done, obj);
 }
+
+// Convert seconds to HH:MM:SS format: 
http://stackoverflow.com/a/6313008/91607
+function toHHMMSS(secs) {
+var sec_num = parseInt(secs, 10); // don't forget the second param
+var hours   = Math.floor(sec_num / 3600);
+var minutes = Math.floor((sec_num - (hours * 3600)) / 60);
+var seconds = sec_num - (hours * 3600) - (minutes * 60);
+
+if (hours   < 10) {hours   = "0" + hours;}
+if (minutes < 10) {minutes = "0" + minutes;}
+if (seconds < 10) {seconds = "0" + seconds;}
+var time = hours + ':' + minutes  + ':' + seconds;
+return time;
+}
+
+function getTimeInHHMMSS(date) {
+return date.getHours() + ":" + date.getMinutes() + ":" + 
date.getSeconds();
+}
 
 describe("Contacts (navigator.contacts)", function() {
 it("contacts.spec.1 should exist", function() {
@@ -198,7 +216,7 @@ exports.defineAutoTests = function() {
 });
 
 describe("with newly-created contact", function() {
-
+
 afterEach(function (done) {
 removeContact(done);
 });
@@ -452,6 +470,10 @@ exports.defineAutoTests = function() {
 });
 
 it("contacts.spec.22 update a contact", function(done) {
+
+var startTime = new Date();
+console.log("Spec22 - Start Time: " + 
getTimeInHHMMSS(startTime));
+
 // Save method is not supported on Windows platform
 if (isWindows || isWindowsPhone8 || isIOSPermissionBlocked) {
 pending();
@@ -477,7 +499,12 @@ exports.defineAutoTests = function() {
 "birthday": aDay
 };
 
-var saveFail = fail.bind(null, done);
+var saveFail = function() {
+var endTime = new Date();
+console.log("Spec22 - EndTime: " + 
getTimeInHHMMSS(endTime));
+console.log("Time Elapsed: " + toHHMMSS( 
(startTime.getTime() / 1000) - (endTime.getTime() / 1000) ));
+fail.bind(null, done);
+};
 
 function updateSuccess(obj) {
 expect(obj).toBeDefined();
@@ -486,6 +513,11 @@ exports.defineAutoTests = function() {
 
expect(obj.birthday.toDateString()).toBe(bDay.toDateString());
 expect(obj.emails.length).toBe(1);
 expect(obj.emails[0].value).toBe('h...@there.com');
+
+var endTime = new Date();
+console.log("Spec22 - EndTime: " + 
getTimeInHHMMSS(endTime));
+console.log("Time Elapsed: " + toHHMMSS( 
(startTime.getTime() / 1000) - (endTime.getTime() / 1000) ));
+
 done();
 }
 
@@ -511,13 +543,28 @@ exports.defineAutoTests = function() {
 });
 
 it("contacts.spec.23 calling remove on a contact that has an id of 
null should return ContactError.UNKNOWN_ERROR", function(done) {
+var startTime = new Date();
+console.log("Spec23 - Start Time: " + 
getTimeInHHMMSS(startTime));
+
+var unexpectedSuccess = function() {
+var endTime = new Date();
+

svn commit: r12921 - /dev/cordova/CB-10980/

2016-03-29 Thread an-selm 
Author: an-selm
Date: Tue Mar 29 14:27:34 2016
New Revision: 12921

Log:
CB-10980 Uploading release candidates for tools release

Added:
dev/cordova/CB-10980/
dev/cordova/CB-10980/cordova-6.1.1.tgz   (with props)
dev/cordova/CB-10980/cordova-6.1.1.tgz.asc
dev/cordova/CB-10980/cordova-6.1.1.tgz.md5
dev/cordova/CB-10980/cordova-6.1.1.tgz.sha
dev/cordova/CB-10980/cordova-lib-6.1.1.tgz   (with props)
dev/cordova/CB-10980/cordova-lib-6.1.1.tgz.asc
dev/cordova/CB-10980/cordova-lib-6.1.1.tgz.md5
dev/cordova/CB-10980/cordova-lib-6.1.1.tgz.sha
dev/cordova/CB-10980/plugman-1.2.1.tgz   (with props)
dev/cordova/CB-10980/plugman-1.2.1.tgz.asc
dev/cordova/CB-10980/plugman-1.2.1.tgz.md5
dev/cordova/CB-10980/plugman-1.2.1.tgz.sha

Added: dev/cordova/CB-10980/cordova-6.1.1.tgz
==
Binary file - no diff available.

Propchange: dev/cordova/CB-10980/cordova-6.1.1.tgz
--
svn:mime-type = application/octet-stream

Added: dev/cordova/CB-10980/cordova-6.1.1.tgz.asc
==
--- dev/cordova/CB-10980/cordova-6.1.1.tgz.asc (added)
+++ dev/cordova/CB-10980/cordova-6.1.1.tgz.asc Tue Mar 29 14:27:34 2016
@@ -0,0 +1,11 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1
+
+iQEcBAABAgAGBQJW+pBWAAoJEACV+K/YTjkMp6UH/0DJXwu4gush2wYIwhFtuHTD
+JoW8i+n7efkMRAosuabrtyvY7wz3qpymMTooSjXNlcFRE7uVrDsckbDksmO7qgRi
+13cdElzjmvCiKQSIKmrMh0dPQhN0+WsU+bznm9nYoeEpZmkGb+0HSwb9qD3K84yk
+2TLmXM8EUmpRKgrdYmkJVWjCo6LEoG7HtJOLzmjpyG8yxfVCiZEvF1VZMM3S6gYD
+YZ7UxXlGLAwNVDlDNM4ZcV4eLTr6KxFb00GVZrFEYXT/0vGZ749kXIr3BvkAZ7yf
+ZiZ6KrBdt/p6dr/IB1GPH5AgnosLAXs1EEjXWefIMPLN+FD9t4OgAyW21f5srKs=
+=6e2W
+-END PGP SIGNATURE-

Added: dev/cordova/CB-10980/cordova-6.1.1.tgz.md5
==
--- dev/cordova/CB-10980/cordova-6.1.1.tgz.md5 (added)
+++ dev/cordova/CB-10980/cordova-6.1.1.tgz.md5 Tue Mar 29 14:27:34 2016
@@ -0,0 +1 @@
+cd19d17f4fa3a3c2be4a45752c081bec

Added: dev/cordova/CB-10980/cordova-6.1.1.tgz.sha
==
--- dev/cordova/CB-10980/cordova-6.1.1.tgz.sha (added)
+++ dev/cordova/CB-10980/cordova-6.1.1.tgz.sha Tue Mar 29 14:27:34 2016
@@ -0,0 +1 @@
+5d1365cb9652c8a98179e245249cd826b2a43fa349a4bca3c80905b1c56e9dc5e3ff6fe44e9fbe3ebb0d266faeacf098d5638d558ee52e2f7cd12889020d7a16

Added: dev/cordova/CB-10980/cordova-lib-6.1.1.tgz
==
Binary file - no diff available.

Propchange: dev/cordova/CB-10980/cordova-lib-6.1.1.tgz
--
svn:mime-type = application/octet-stream

Added: dev/cordova/CB-10980/cordova-lib-6.1.1.tgz.asc
==
--- dev/cordova/CB-10980/cordova-lib-6.1.1.tgz.asc (added)
+++ dev/cordova/CB-10980/cordova-lib-6.1.1.tgz.asc Tue Mar 29 14:27:34 2016
@@ -0,0 +1,11 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1
+
+iQEcBAABAgAGBQJW+pB5AAoJEACV+K/YTjkMJ30H/0diJeC2vOENPZay86Gv3SMo
+TXH3i7ccynSZDxydUQwJBTfh+q7rP6HSc6Ru7XJNKN/uKpnVSoFnNFZaCEc+JgBk
+pUdhNbCDMjyaenCmtmXxwDW1q9mkVdfu3/5UIPsQqvi13XpNGIkiIWI/Qrq9Xkkg
+K0hG7yYuU6lVRMF1BImdquF3fya69nSTBNLQFgYHgVoBI6cfOGZAqedGs0SXhKTZ
+VnEB+2rSGBL8kwyWRO69o0gtLayPjdcyJpYI5XYHkPqBTOsrfHY567AZMDQCT1CP
+fOi4Pl7WI+srHTY2abKdNz+rE1IroPbOMOwNTTSag8KrO+vxeiHsH7+nacWWDJQ=
+=ExZ5
+-END PGP SIGNATURE-

Added: dev/cordova/CB-10980/cordova-lib-6.1.1.tgz.md5
==
--- dev/cordova/CB-10980/cordova-lib-6.1.1.tgz.md5 (added)
+++ dev/cordova/CB-10980/cordova-lib-6.1.1.tgz.md5 Tue Mar 29 14:27:34 2016
@@ -0,0 +1 @@
+d49b6779b3d91594022d1d9f442851ec

Added: dev/cordova/CB-10980/cordova-lib-6.1.1.tgz.sha
==
--- dev/cordova/CB-10980/cordova-lib-6.1.1.tgz.sha (added)
+++ dev/cordova/CB-10980/cordova-lib-6.1.1.tgz.sha Tue Mar 29 14:27:34 2016
@@ -0,0 +1 @@
+a498dd51316d0245ea078e5238936c53a3576b54206ebcd14f597226217d0f52396e7d669771dcb5124693cc0fc2d84e472aba4104af21fe893518626c34cd9b

Added: dev/cordova/CB-10980/plugman-1.2.1.tgz
==
Binary file - no diff available.

Propchange: dev/cordova/CB-10980/plugman-1.2.1.tgz
--
svn:mime-type = application/octet-stream

Added: dev/cordova/CB-10980/plugman-1.2.1.tgz.asc
==
--- dev/cordova/CB-10980/plugman-1.2.1.tgz.asc (added)
+++ dev/cordova/CB-10980/plugman-1.2.1.tgz.asc Tue Mar 29 14:

[cordova-lib] Git Push Summary

2016-03-29 Thread an-selm 
Repository: cordova-lib
Updated Tags:  refs/tags/6.1.1 d18ee2c0a -> 107e27364

-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

cordova-lib git commit: CB-10961 Fix failing tests

2016-03-29 Thread an-selm 
Repository: cordova-lib
Updated Branches:
  refs/heads/6.1.x d18ee2c0a -> 107e27364


CB-10961 Fix failing tests


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

Branch: refs/heads/6.1.x
Commit: 107e2736479e8a0a42c1faf2b49902c0ec2f62a7
Parents: d18ee2c
Author: Vladimir Kotikov 
Authored: Tue Mar 29 17:13:01 2016 +0300
Committer: Vladimir Kotikov 
Committed: Tue Mar 29 17:14:53 2016 +0300

--
 cordova-lib/spec-cordova/save.spec.js | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/107e2736/cordova-lib/spec-cordova/save.spec.js
--
diff --git a/cordova-lib/spec-cordova/save.spec.js 
b/cordova-lib/spec-cordova/save.spec.js
index 8af17ce..a457890 100644
--- a/cordova-lib/spec-cordova/save.spec.js
+++ b/cordova-lib/spec-cordova/save.spec.js
@@ -83,6 +83,7 @@ describe('(save flag)', function () {
 spyOn(util, 'isCordova').andReturn(appPath);
 spyOn(util, 'cdProjectRoot').andReturn(appPath);
 spyOn(cordova.raw, 'prepare').andReturn(Q());
+spyOn(prepare, 'preparePlatforms').andReturn(Q());
 
 spyOn(PlatformApi, 'createPlatform').andReturn(Q());
 spyOn(PlatformApi, 'updatePlatform').andReturn(Q());


-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

cordova-lib git commit: CB-10961 Fix failing tests

2016-03-29 Thread an-selm 
Repository: cordova-lib
Updated Branches:
  refs/heads/master 210e806da -> 9d8124bef


CB-10961 Fix failing tests


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

Branch: refs/heads/master
Commit: 9d8124bef20af07cbf1517270bf1f6860694d658
Parents: 210e806
Author: Vladimir Kotikov 
Authored: Tue Mar 29 17:13:01 2016 +0300
Committer: Vladimir Kotikov 
Committed: Tue Mar 29 17:13:01 2016 +0300

--
 cordova-lib/spec-cordova/save.spec.js | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/9d8124be/cordova-lib/spec-cordova/save.spec.js
--
diff --git a/cordova-lib/spec-cordova/save.spec.js 
b/cordova-lib/spec-cordova/save.spec.js
index 8af17ce..a457890 100644
--- a/cordova-lib/spec-cordova/save.spec.js
+++ b/cordova-lib/spec-cordova/save.spec.js
@@ -83,6 +83,7 @@ describe('(save flag)', function () {
 spyOn(util, 'isCordova').andReturn(appPath);
 spyOn(util, 'cdProjectRoot').andReturn(appPath);
 spyOn(cordova.raw, 'prepare').andReturn(Q());
+spyOn(prepare, 'preparePlatforms').andReturn(Q());
 
 spyOn(PlatformApi, 'createPlatform').andReturn(Q());
 spyOn(PlatformApi, 'updatePlatform').andReturn(Q());


-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

svn commit: r12920 - /dev/cordova/CB-10902/

2016-03-29 Thread an-selm 
Author: an-selm
Date: Tue Mar 29 12:38:47 2016
New Revision: 12920

Log:
CB-10902 Removing release candidates for previous fauty attempt

Removed:
dev/cordova/CB-10902/


-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

cordova-plugman git commit: CB-10980 Set VERSION to 1.3.0-dev (via coho)

2016-03-29 Thread an-selm 
Repository: cordova-plugman
Updated Branches:
  refs/heads/master 1973a2cfb -> 016e496e4


CB-10980 Set VERSION to 1.3.0-dev (via coho)


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

Branch: refs/heads/master
Commit: 016e496e4eb9cfdc172d73edb8475e46fbc2c7d3
Parents: 1973a2c
Author: Vladimir Kotikov 
Authored: Tue Mar 29 15:13:53 2016 +0300
Committer: Vladimir Kotikov 
Committed: Tue Mar 29 15:15:02 2016 +0300

--
 package.json | 124 +++---
 1 file changed, 63 insertions(+), 61 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/016e496e/package.json
--
diff --git a/package.json b/package.json
index 652a576..908cf91 100644
--- a/package.json
+++ b/package.json
@@ -1,69 +1,71 @@
 {
-  "author": "Andrew Lunny ",
-  "name": "plugman",
-  "description": "install/uninstall Cordova plugins",
-  "version": "1.2.1-dev",
-  "repository": {
-"type": "git",
-"url": "git://git-wip-us.apache.org/repos/asf/cordova-plugman.git"
-  },
-  "bugs": {
-"url" : "https://issues.apache.org/jira/browse/CB";,
-"email" : "d...@cordova.apache.org"
-  },
-  "main": "plugman.js",
-  "engines": {
-"node": ">=0.9.9"
-  },
-  "engineStrict":true,
-  "dependencies": {
-"cordova-lib": "6.1.0",
-"nopt": "1.0.9",
-"q": "1.0.1"
-  },
-  "devDependencies": {
-"jshint": "2.5.8",
-"jasmine-node": "1.14.5"
-  },
-  "bin" : { "plugman" : "./main.js" },
-  "scripts": {
-"test": "npm run jasmine && npm run jshint",
-"jshint": "node node_modules/jshint/bin/jshint src",
-"jasmine": "jasmine-node --captureExceptions --color spec"
-  },
-  "contributors":[
-{
-"name":"Anis Kadri"
+"author": "Andrew Lunny ",
+"name": "plugman",
+"description": "install/uninstall Cordova plugins",
+"version": "1.3.0-dev",
+"repository": {
+"type": "git",
+"url": "git://git-wip-us.apache.org/repos/asf/cordova-plugman.git"
 },
-{
-"name":"Tim Kim"
+"bugs": {
+"url": "https://issues.apache.org/jira/browse/CB";,
+"email": "d...@cordova.apache.org"
 },
-{
-"name":"Braden Shepherdson"
+"main": "plugman.js",
+"engines": {
+"node": ">=0.9.9"
 },
-{
-"name":"Ryan Willoughby"
+"engineStrict": true,
+"dependencies": {
+"cordova-lib": "6.1.0",
+"nopt": "1.0.9",
+"q": "1.0.1"
 },
-{
-"name":"Brett Rudd"
+"devDependencies": {
+"jshint": "2.5.8",
+"jasmine-node": "1.14.5"
 },
-{
-"name":"Mike Reinstein"
+"bin": {
+"plugman": "./main.js"
 },
-{
-"name":"Shazron Abdullah"
+"scripts": {
+"test": "npm run jasmine && npm run jshint",
+"jshint": "node node_modules/jshint/bin/jshint src",
+"jasmine": "jasmine-node --captureExceptions --color spec"
 },
-{
-"name":"Steve Gill"
-},
-{
-"name":"Fil Maj"
-},
-{
-"name":"Michael Brooks"
-},
-{
-"name":"Jesse MacFadyen"
-}
-  ]
-}
+"contributors": [
+{
+"name": "Anis Kadri"
+},
+{
+"name": "Tim Kim"
+},
+{
+"name": "Braden Shepherdson"
+},
+{
+"name": "Ryan Willoughby"
+},
+{
+"name": "Brett Rudd"
+},
+{
+"name": "Mike Reinstein"
+},
+{
+"name": "Shazron Abdullah"
+},
+{
+"name": "Steve Gill"
+},
+{
+"name": "Fil Maj"
+},
+{
+"name": "Michael Brooks"
+},
+{
+"name": "Jesse MacFadyen"
+}
+]
+}
\ No newline at end of file


-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

[cordova-plugman] Git Push Summary

2016-03-29 Thread an-selm 
Repository: cordova-plugman
Updated Tags:  refs/tags/1.2.1 482b67051 -> f05a7ef8c

-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

[2/2] cordova-plugman git commit: CB-10980 Set VERSION to 1.2.1 (via coho)

2016-03-29 Thread an-selm 
CB-10980 Set VERSION to 1.2.1 (via coho)


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

Branch: refs/heads/1.2.x
Commit: f05a7ef8cf6c0b755090f4b666b54905fb3c21ac
Parents: 4946b6b
Author: Vladimir Kotikov 
Authored: Tue Mar 29 15:13:52 2016 +0300
Committer: Vladimir Kotikov 
Committed: Tue Mar 29 15:21:32 2016 +0300

--
 package.json | 124 +++---
 1 file changed, 63 insertions(+), 61 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/f05a7ef8/package.json
--
diff --git a/package.json b/package.json
index b614ba6..4cea117 100644
--- a/package.json
+++ b/package.json
@@ -1,69 +1,71 @@
 {
-  "author": "Andrew Lunny ",
-  "name": "plugman",
-  "description": "install/uninstall Cordova plugins",
-  "version": "1.2.1",
-  "repository": {
-"type": "git",
-"url": "git://git-wip-us.apache.org/repos/asf/cordova-plugman.git"
-  },
-  "bugs": {
-"url" : "https://issues.apache.org/jira/browse/CB";,
-"email" : "d...@cordova.apache.org"
-  },
-  "main": "plugman.js",
-  "engines": {
-"node": ">=0.9.9"
-  },
-  "engineStrict":true,
-  "dependencies": {
-"cordova-lib": "6.1.1",
-"nopt": "1.0.9",
-"q": "1.0.1"
-  },
-  "devDependencies": {
-"jshint": "2.5.8",
-"jasmine-node": "1.14.5"
-  },
-  "bin" : { "plugman" : "./main.js" },
-  "scripts": {
-"test": "npm run jasmine && npm run jshint",
-"jshint": "node node_modules/jshint/bin/jshint src",
-"jasmine": "jasmine-node --captureExceptions --color spec"
-  },
-  "contributors":[
-{
-"name":"Anis Kadri"
+"author": "Andrew Lunny ",
+"name": "plugman",
+"description": "install/uninstall Cordova plugins",
+"version": "1.2.1",
+"repository": {
+"type": "git",
+"url": "git://git-wip-us.apache.org/repos/asf/cordova-plugman.git"
 },
-{
-"name":"Tim Kim"
+"bugs": {
+"url": "https://issues.apache.org/jira/browse/CB";,
+"email": "d...@cordova.apache.org"
 },
-{
-"name":"Braden Shepherdson"
+"main": "plugman.js",
+"engines": {
+"node": ">=0.9.9"
 },
-{
-"name":"Ryan Willoughby"
+"engineStrict": true,
+"dependencies": {
+"cordova-lib": "6.1.1",
+"nopt": "1.0.9",
+"q": "1.0.1"
 },
-{
-"name":"Brett Rudd"
+"devDependencies": {
+"jshint": "2.5.8",
+"jasmine-node": "1.14.5"
 },
-{
-"name":"Mike Reinstein"
+"bin": {
+"plugman": "./main.js"
 },
-{
-"name":"Shazron Abdullah"
+"scripts": {
+"test": "npm run jasmine && npm run jshint",
+"jshint": "node node_modules/jshint/bin/jshint src",
+"jasmine": "jasmine-node --captureExceptions --color spec"
 },
-{
-"name":"Steve Gill"
-},
-{
-"name":"Fil Maj"
-},
-{
-"name":"Michael Brooks"
-},
-{
-"name":"Jesse MacFadyen"
-}
-  ]
-}
+"contributors": [
+{
+"name": "Anis Kadri"
+},
+{
+"name": "Tim Kim"
+},
+{
+"name": "Braden Shepherdson"
+},
+{
+"name": "Ryan Willoughby"
+},
+{
+"name": "Brett Rudd"
+},
+{
+"name": "Mike Reinstein"
+},
+{
+"name": "Shazron Abdullah"
+},
+{
+"name": "Steve Gill"
+},
+{
+"name": "Fil Maj"
+},
+{
+"name": "Michael Brooks"
+},
+{
+"name": "Jesse MacFadyen"
+}
+]
+}
\ No newline at end of file


-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

[1/2] cordova-plugman git commit: CB-10980 Updated RELEASENOTES.md for release 1.2.1

2016-03-29 Thread an-selm 
Repository: cordova-plugman
Updated Branches:
  refs/heads/1.2.x 482b67051 -> f05a7ef8c


CB-10980 Updated RELEASENOTES.md for release 1.2.1


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

Branch: refs/heads/1.2.x
Commit: 4946b6b8f834e9f4dcc7db543ffb56a7ed4abce9
Parents: 482b670
Author: Vladimir Kotikov 
Authored: Tue Mar 29 15:13:52 2016 +0300
Committer: Vladimir Kotikov 
Committed: Tue Mar 29 15:21:31 2016 +0300

--
 RELEASENOTES.md | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/4946b6b8/RELEASENOTES.md
--
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 814cf8a..72df076 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -21,9 +21,12 @@
 
 # Cordova-plugman Release Notes
 
+### 1.2.1 (Mar 29, 2016)
+* CB-10980 Updated cordova-lib dependency to 6.1.1
+
 ### 1.2.0 (Mar 17, 2016)
 * CB-10902 Updated cordova-lib dependency to 6.1.0
- 
+
 ### 1.1.0 (Jan 25, 2016)
 * CB-10424 Updated cordova-lib dependency to 6.0.0
 
@@ -47,7 +50,7 @@ publish, unpublish, addUser commands.
 
 ### 0.23.3 (June 4, 2015)
 * Updated cordova-lib dependency to 5.1.1
- 
+
 ### 0.23.1 (Apr 16, 2015)
 * CB-8637 add windows to plugman
 


-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

cordova-cli git commit: CB-10980 Set VERSION to 6.2.0-dev (via coho)

2016-03-29 Thread an-selm 
Repository: cordova-cli
Updated Branches:
  refs/heads/master cbc7514ab -> aa4e3b3f3


CB-10980 Set VERSION to 6.2.0-dev (via coho)


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

Branch: refs/heads/master
Commit: aa4e3b3f3dfa06d33f6201bf09ea8b54f4df4e06
Parents: cbc7514
Author: Vladimir Kotikov 
Authored: Tue Mar 29 15:05:24 2016 +0300
Committer: Vladimir Kotikov 
Committed: Tue Mar 29 15:12:05 2016 +0300

--
 package.json | 290 +++---
 1 file changed, 145 insertions(+), 145 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/aa4e3b3f/package.json
--
diff --git a/package.json b/package.json
index 3a9fd47..db86bd9 100644
--- a/package.json
+++ b/package.json
@@ -1,146 +1,146 @@
 {
-  "name": "cordova",
-  "version": "6.1.1-dev",
-  "preferGlobal": "true",
-  "description": "Cordova command line interface tool",
-  "main": "cordova",
-  "engines": {
-"node": ">=0.9.9"
-  },
-  "engineStrict": true,
-  "bin": {
-"cordova": "./bin/cordova"
-  },
-  "scripts": {
-"test": "node node_modules/jasmine-node/bin/jasmine-node 
--captureExceptions --color spec",
-"cover": "node node_modules/istanbul/lib/cli.js cover --root src --print 
detail node_modules/jasmine-node/bin/jasmine-node -- spec"
-  },
-  "repository": {
-"type": "git",
-"url": "https://git-wip-us.apache.org/repos/asf/cordova-cli.git";
-  },
-  "bugs": {
-"url": "https://issues.apache.org/jira/browse/CB";,
-"email": "d...@cordova.apache.org"
-  },
-  "keywords": [
-"cordova",
-"client",
-"cli"
-  ],
-  "dependencies": {
-"ansi": "^0.3.0",
-"cordova-lib": "6.1.0",
-"cordova-common": "^1.1.0",
-"q": "1.0.1",
-"nopt": "3.0.1",
-"underscore": "1.7.0",
-"update-notifier": "^0.5.0"
-  },
-  "devDependencies": {
-"istanbul": "^0.3.4",
-"grunt": "0.4.5",
-"grunt-retire": "0.3.7",
-"jasmine-node": "1.14.5"
-  },
-  "author": "Anis Kadri",
-  "contributors": [
-{
-  "name": "Brian LeRoux",
-  "email": "b...@brian.io"
-},
-{
-  "name": "Fil Maj",
-  "email": "maj@gmail.com"
-},
-{
-  "name": "Mike Reinstein",
-  "email": "reinstein.m...@gmail.com"
-},
-{
-  "name": "Darry Pogue",
-  "email": "dar...@dpogue.ca"
-},
-{
-  "name": "Michael Brooks",
-  "email": "mich...@michaelbrooks.ca"
-},
-{
-  "name": "Braden Shepherdson",
-  "email": "bra...@chromium.org"
-},
-{
-  "name": "Gord Tanner",
-  "email": "gtan...@gmail.com"
-},
-{
-  "name": "Tim Kim",
-  "email": "t...@adobe.com"
-},
-{
-  "name": "Benn Mapes",
-  "email": "benn.ma...@gmail.com"
-},
-{
-  "name": "Michael Wolf",
-  "email": "michael.w...@cynergy.com"
-},
-{
-  "name": "Andrew Grieve",
-  "email": "agri...@chromium.org"
-},
-{
-  "name": "Bryan Higgins",
-  "email": "bhigg...@blackberry.com"
-},
-{
-  "name": "Don Coleman",
-  "email": "dcole...@chariotsolutions.com"
-},
-{
-  "name": "Germano Gabbianelli",
-  "email": "tyron...@gmail.com"
-},
-{
-  "name": "Ian Clelland",
-  "email": "iclell...@chromium.org"
-},
-{
-  "name": "Lucas Holmqust",
-  "email": "lholm...@redhat.com"
-},
-{
-  "name": "Matt LeGrand",
-  "email": "mlegr...@gmail.com"
-},
-{
-  "name": "Michal Mocny",
-  "email": "mmo...@gmail.com"
-},
-{
-  "name": "Sam Breed",
-  "email": "s...@quickleft.com"
-},
-{
-  "name": "Tommy-Carlos Williams",
-  "email": "to...@devgeeks.org"
-},
-{
-  "name": "Rubén Norte",
-  "email": "rubenno...@gmail.com"
-},
-{
-  "name": "Germano Gabbianelli",
-  "email": "tyrion...@gmail.com"
-},
-{
-  "name": "Steven Gill",
-  "email": "stevengil...@gmail.com"
-},
-{
-  "name":"Jesse",
-  "email":"purplecabb...@gmail.com"
-}
-  ],
-  "license": "Apache-2.0"
-}
+"name": "cordova",
+"version": "6.2.0-dev",
+"preferGlobal": "true",
+"description": "Cordova command line interface tool",
+"main": "cordova",
+"engines": {
+"node": ">=0.9.9"
+},
+"engineStrict": true,
+"bin": {
+"cordova": "./bin/cordova"
+},
+"scripts": {
+"test": "node node_modules/jasmine-node/bin/jasmine-node 
--captureExceptions --color spec",
+"cover": "node node_modules/istanbul/lib/cli.js cover --r

[cordova-cli] Git Push Summary

2016-03-29 Thread an-selm 
Repository: cordova-cli
Updated Tags:  refs/tags/6.1.1 ed5c36613 -> 8e730ac37

-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

[2/2] cordova-cli git commit: CB-10980 Updated RELEASENOTES.md for release 6.1.1

2016-03-29 Thread an-selm 
CB-10980 Updated RELEASENOTES.md for release 6.1.1


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

Branch: refs/heads/6.1.x
Commit: ddc7638f056cc355ebf378b754b57a65a65ca79e
Parents: ed5c366
Author: Vladimir Kotikov 
Authored: Tue Mar 29 15:24:19 2016 +0300
Committer: Vladimir Kotikov 
Committed: Tue Mar 29 15:24:45 2016 +0300

--
 RELEASENOTES.md | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/ddc7638f/RELEASENOTES.md
--
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index d4d5155..eb5a4a8 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -20,6 +20,9 @@
 -->
 # Cordova-cli Release Notes
 
+### 6.1.1 (Mar 29, 2016)
+* CB-10980 Updated cordova-lib dependency to 6.1.1
+
 ### 6.1.0 (Mar 17, 2016)
 * CB-10902 Updated cordova-lib dependency to 6.1.0
 * Simplify cordova CLI readme
@@ -44,7 +47,7 @@
 * Removing the `--usegit` flag from `cordova platform`. Recommended method is 
to use `cordova platform add git_url#branch`
 * CB-9836 Add `.gitattributes` to prevent `CRLF` line endings in repos
 * Message about deprecating **amazon-fireos** for **Fire OS 5.0+** devices. 
2015 onwards **FireOS** devices should use **android** platform only.
-* add **JIRA** issue tracker link. 
+* add **JIRA** issue tracker link.
 
 ### 5.4.1 (Nov 19, 2015)
 * CB-10049 updated cordova-lib dependency to 5.4.1
@@ -61,7 +64,7 @@
 * CB-9597 Updates cli to pass structured args to platform methods
 
 ### 5.3.1 (Aug 28, 2015)
-* Updated cordova-lib dependency to 5.3.1 
+* Updated cordova-lib dependency to 5.3.1
 
 ### 5.2.0 (Aug 06, 2015)
 * docs: unify expression of Amazon Fire OS


-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

[1/2] cordova-cli git commit: CB-10980 Set VERSION to 6.1.1 (via coho)

2016-03-29 Thread an-selm 
Repository: cordova-cli
Updated Branches:
  refs/heads/6.1.x ed5c36613 -> 8e730ac37


CB-10980 Set VERSION to 6.1.1 (via coho)


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

Branch: refs/heads/6.1.x
Commit: 8e730ac376fee9014e822e3f007e357384e77fcd
Parents: ddc7638
Author: Vladimir Kotikov 
Authored: Tue Mar 29 15:05:23 2016 +0300
Committer: Vladimir Kotikov 
Committed: Tue Mar 29 15:24:45 2016 +0300

--
 package.json | 290 +++---
 1 file changed, 145 insertions(+), 145 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/8e730ac3/package.json
--
diff --git a/package.json b/package.json
index 83f791d..bf6007c 100644
--- a/package.json
+++ b/package.json
@@ -1,146 +1,146 @@
 {
-  "name": "cordova",
-  "version": "6.1.1",
-  "preferGlobal": "true",
-  "description": "Cordova command line interface tool",
-  "main": "cordova",
-  "engines": {
-"node": ">=0.9.9"
-  },
-  "engineStrict": true,
-  "bin": {
-"cordova": "./bin/cordova"
-  },
-  "scripts": {
-"test": "node node_modules/jasmine-node/bin/jasmine-node 
--captureExceptions --color spec",
-"cover": "node node_modules/istanbul/lib/cli.js cover --root src --print 
detail node_modules/jasmine-node/bin/jasmine-node -- spec"
-  },
-  "repository": {
-"type": "git",
-"url": "https://git-wip-us.apache.org/repos/asf/cordova-cli.git";
-  },
-  "bugs": {
-"url": "https://issues.apache.org/jira/browse/CB";,
-"email": "d...@cordova.apache.org"
-  },
-  "keywords": [
-"cordova",
-"client",
-"cli"
-  ],
-  "dependencies": {
-"ansi": "^0.3.0",
-"cordova-lib": "6.1.1",
-"cordova-common": "^1.1.0",
-"q": "1.0.1",
-"nopt": "3.0.1",
-"underscore": "1.7.0",
-"update-notifier": "^0.5.0"
-  },
-  "devDependencies": {
-"istanbul": "^0.3.4",
-"grunt": "0.4.5",
-"grunt-retire": "0.3.7",
-"jasmine-node": "1.14.5"
-  },
-  "author": "Anis Kadri",
-  "contributors": [
-{
-  "name": "Brian LeRoux",
-  "email": "b...@brian.io"
-},
-{
-  "name": "Fil Maj",
-  "email": "maj@gmail.com"
-},
-{
-  "name": "Mike Reinstein",
-  "email": "reinstein.m...@gmail.com"
-},
-{
-  "name": "Darry Pogue",
-  "email": "dar...@dpogue.ca"
-},
-{
-  "name": "Michael Brooks",
-  "email": "mich...@michaelbrooks.ca"
-},
-{
-  "name": "Braden Shepherdson",
-  "email": "bra...@chromium.org"
-},
-{
-  "name": "Gord Tanner",
-  "email": "gtan...@gmail.com"
-},
-{
-  "name": "Tim Kim",
-  "email": "t...@adobe.com"
-},
-{
-  "name": "Benn Mapes",
-  "email": "benn.ma...@gmail.com"
-},
-{
-  "name": "Michael Wolf",
-  "email": "michael.w...@cynergy.com"
-},
-{
-  "name": "Andrew Grieve",
-  "email": "agri...@chromium.org"
-},
-{
-  "name": "Bryan Higgins",
-  "email": "bhigg...@blackberry.com"
-},
-{
-  "name": "Don Coleman",
-  "email": "dcole...@chariotsolutions.com"
-},
-{
-  "name": "Germano Gabbianelli",
-  "email": "tyron...@gmail.com"
-},
-{
-  "name": "Ian Clelland",
-  "email": "iclell...@chromium.org"
-},
-{
-  "name": "Lucas Holmqust",
-  "email": "lholm...@redhat.com"
-},
-{
-  "name": "Matt LeGrand",
-  "email": "mlegr...@gmail.com"
-},
-{
-  "name": "Michal Mocny",
-  "email": "mmo...@gmail.com"
-},
-{
-  "name": "Sam Breed",
-  "email": "s...@quickleft.com"
-},
-{
-  "name": "Tommy-Carlos Williams",
-  "email": "to...@devgeeks.org"
-},
-{
-  "name": "Rubén Norte",
-  "email": "rubenno...@gmail.com"
-},
-{
-  "name": "Germano Gabbianelli",
-  "email": "tyrion...@gmail.com"
-},
-{
-  "name": "Steven Gill",
-  "email": "stevengil...@gmail.com"
-},
-{
-  "name": "Jesse",
-  "email": "purplecabb...@gmail.com"
-}
-  ],
-  "license": "Apache-2.0"
-}
+"name": "cordova",
+"version": "6.1.1",
+"preferGlobal": "true",
+"description": "Cordova command line interface tool",
+"main": "cordova",
+"engines": {
+"node": ">=0.9.9"
+},
+"engineStrict": true,
+"bin": {
+"cordova": "./bin/cordova"
+},
+"scripts": {
+"test": "node node_modules/jasmine-node/bin/jasmine-node 
--captureExceptions --color spec",
+"cover": "node node_modules/istanbul/lib/cli.js cover --root src 
--p

[cordova-lib] Git Push Summary

2016-03-29 Thread an-selm 
Repository: cordova-lib
Updated Tags:  refs/tags/6.1.1 96f89aa21 -> d18ee2c0a

-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

cordova-lib git commit: CB-10980 Set VERSION to 6.2.0-dev (via coho)

2016-03-29 Thread an-selm 
Repository: cordova-lib
Updated Branches:
  refs/heads/master 183495d4a -> 210e806da


CB-10980 Set VERSION to 6.2.0-dev (via coho)


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

Branch: refs/heads/master
Commit: 210e806da44638e64649170c6049e27999536794
Parents: 183495d
Author: Vladimir Kotikov 
Authored: Tue Mar 29 14:18:59 2016 +0300
Committer: Vladimir Kotikov 
Committed: Tue Mar 29 15:00:57 2016 +0300

--
 cordova-lib/package.json | 354 +-
 1 file changed, 177 insertions(+), 177 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/210e806d/cordova-lib/package.json
--
diff --git a/cordova-lib/package.json b/cordova-lib/package.json
index 50dc8f5..4019397 100644
--- a/cordova-lib/package.json
+++ b/cordova-lib/package.json
@@ -1,178 +1,178 @@
 {
-  "author": "Apache Software Foundation",
-  "name": "cordova-lib",
-  "description": "Apache Cordova tools core lib and API",
-  "version": "6.1.1-dev",
-  "repository": {
-"type": "git",
-"url": "git://git-wip-us.apache.org/repos/asf/cordova-lib.git"
-  },
-  "bugs": {
-"url": "https://issues.apache.org/jira/browse/CB";,
-"email": "d...@cordova.apache.org"
-  },
-  "main": "cordova-lib.js",
-  "engines": {
-"node": ">=0.9.9"
-  },
-  "engineStrict": true,
-  "dependencies": {
-"aliasify": "^1.7.2",
-"cordova-app-hello-world": "3.10.0",
-"cordova-common": "1.1.x",
-"cordova-js": "4.1.4",
-"cordova-registry-mapper": "1.x",
-"cordova-serve": "^1.0.0",
-"dep-graph": "1.1.0",
-"elementtree": "0.1.6",
-"glob": "^5.0.3",
-"init-package-json": "^1.2.0",
-"nopt": "^3.0.6",
-"npm": "^2.10.x",
-"opener": "1.4.1",
-"plist": "^1.2.0",
-"properties-parser": "0.2.3",
-"q": "1.0.1",
-"request": "2.47.0",
-"semver": "^4.3.x",
-"shelljs": "0.3.0",
-"tar": "1.0.2",
-"underscore": "1.7.0",
-"unorm": "1.3.3",
-"valid-identifier": "0.0.1",
-"xcode": "0.8.0"
-  },
-  "bundledDependencies": [
-"cordova-common"
-  ],
-  "devDependencies": {
-"codecov": "^1.0.1",
-"istanbul": "^0.3.4",
-"jasmine-node": "1.14.5",
-"jshint": "2.5.8",
-"rewire": "2.1.3"
-  },
-  "scripts": {
-"test": "npm run jshint && npm run jasmine",
-"ci": "npm run jshint && npm run cover && codecov",
-"jshint": "jshint src spec-cordova spec-plugman",
-"jasmine": "jasmine-node --captureExceptions --color spec-plugman 
spec-cordova",
-"cover": "istanbul cover --root src --print detail 
node_modules/jasmine-node/bin/jasmine-node -- spec-cordova spec-plugman"
-  },
-  "contributors": [
-{
-  "name": "Brian LeRoux",
-  "email": "b...@brian.io"
-},
-{
-  "name": "Fil Maj",
-  "email": "maj@gmail.com"
-},
-{
-  "name": "Mike Reinstein",
-  "email": "reinstein.m...@gmail.com"
-},
-{
-  "name": "Darry Pogue",
-  "email": "dar...@dpogue.ca"
-},
-{
-  "name": "Michael Brooks",
-  "email": "mich...@michaelbrooks.ca"
-},
-{
-  "name": "Braden Shepherdson",
-  "email": "bra...@chromium.org"
-},
-{
-  "name": "Gord Tanner",
-  "email": "gtan...@gmail.com"
-},
-{
-  "name": "Tim Kim",
-  "email": "t...@adobe.com"
-},
-{
-  "name": "Benn Mapes",
-  "email": "benn.ma...@gmail.com"
-},
-{
-  "name": "Michael Wolf",
-  "email": "michael.w...@cynergy.com"
-},
-{
-  "name": "Andrew Grieve",
-  "email": "agri...@chromium.org"
-},
-{
-  "name": "Bryan Higgins",
-  "email": "bhigg...@blackberry.com"
-},
-{
-  "name": "Don Coleman",
-  "email": "dcole...@chariotsolutions.com"
-},
-{
-  "name": "Germano Gabbianelli",
-  "email": "tyron...@gmail.com"
-},
-{
-  "name": "Ian Clelland",
-  "email": "iclell...@chromium.org"
-},
-{
-  "name": "Lucas Holmqust",
-  "email": "lholm...@redhat.com"
-},
-{
-  "name": "Matt LeGrand",
-  "email": "mlegr...@gmail.com"
-},
-{
-  "name": "Michal Mocny",
-  "email": "mmo...@gmail.com"
-},
-{
-  "name": "Sam Breed",
-  "email": "s...@quickleft.com"
-},
-{
-  "name": "Tommy-Carlos Williams",
-  "email": "to...@devgeeks.org"
-},
-{
-  "name": "Rubén Norte",
-  "email": "rubenno...@gmail.com"
-},
-{
-  "name": "Germano Gabbianelli",
-  "email": "tyrion...@gmail.com"
-},
-{
-  "name": "Steven Gill",
-  "

cordova-lib git commit: CB-10980 Updated RELEASENOTES.md for release 6.1.1 [Forced Update!]

2016-03-29 Thread an-selm 
Repository: cordova-lib
Updated Branches:
  refs/heads/6.1.x 7fb6855e8 -> d18ee2c0a (forced update)


CB-10980 Updated RELEASENOTES.md for release 6.1.1


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

Branch: refs/heads/6.1.x
Commit: d18ee2c0a07cb666f788eadcc8d45b8c15c597d1
Parents: b15a9fd
Author: Vladimir Kotikov 
Authored: Tue Mar 29 14:23:21 2016 +0300
Committer: Vladimir Kotikov 
Committed: Tue Mar 29 15:00:06 2016 +0300

--
 cordova-lib/RELEASENOTES.md | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/d18ee2c0/cordova-lib/RELEASENOTES.md
--
diff --git a/cordova-lib/RELEASENOTES.md b/cordova-lib/RELEASENOTES.md
index c6019db..3fbdcf7 100644
--- a/cordova-lib/RELEASENOTES.md
+++ b/cordova-lib/RELEASENOTES.md
@@ -20,7 +20,11 @@
 -->
 # Cordova-lib Release Notes
 
-### 6.1.1 (Mar 17, 2016)
+### 6.1.1 (Mar 29, 2016)
+* CB-10961 Error no such file or directory adding ios platform when plugins 
present or required
+* CB-10908 Reload the config.xml before writing the saved plugin
+
+### 6.1.0 (Mar 17, 2016)
 * CB-10902 updated pinned platforms
 * CB-10808 revert npm install for templates
 * CB-10808 CLI Support templates with subdirectory


-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

[1/3] cordova-lib git commit: CB-10908 Reload the config.xml before writing the saved plugin

2016-03-29 Thread an-selm 
Repository: cordova-lib
Updated Branches:
  refs/heads/6.1.x 96f89aa21 -> 7fb6855e8


CB-10908 Reload the config.xml before writing the saved plugin

This closes #415


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

Branch: refs/heads/6.1.x
Commit: 9d54bd094a089f80725c22d2bb6d310d9266b645
Parents: 96f89aa
Author: dubeejw 
Authored: Fri Mar 18 15:19:26 2016 -0400
Committer: Vladimir Kotikov 
Committed: Tue Mar 29 13:25:23 2016 +0300

--
 cordova-lib/src/cordova/plugin.js | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/9d54bd09/cordova-lib/src/cordova/plugin.js
--
diff --git a/cordova-lib/src/cordova/plugin.js 
b/cordova-lib/src/cordova/plugin.js
index 46b84be..b4d47dc 100644
--- a/cordova-lib/src/cordova/plugin.js
+++ b/cordova-lib/src/cordova/plugin.js
@@ -194,6 +194,8 @@ module.exports = function plugin(command, targets, opts) {
 spec: src ? src : '~' + pluginInfo.version
 };
 
+xml = cordova_util.projectConfig(projectRoot);
+cfg = new ConfigParser(xml);
 cfg.removePlugin(pluginInfo.id);
 cfg.addPlugin(attributes, opts.cli_variables);
 cfg.write();


-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

[2/3] cordova-lib git commit: CB-10961 Error no such file or directory adding ios platform when plugins present or required

2016-03-29 Thread an-selm 
CB-10961 Error no such file or directory adding ios platform when plugins 
present or required

This closes #416


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

Branch: refs/heads/6.1.x
Commit: b15a9fdcb928b2b3504fd408d30f7b72900f4d74
Parents: 9d54bd0
Author: Carlos Santana 
Authored: Fri Mar 25 16:17:01 2016 -0400
Committer: Vladimir Kotikov 
Committed: Tue Mar 29 13:25:40 2016 +0300

--
 cordova-lib/src/cordova/platform.js | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b15a9fdc/cordova-lib/src/cordova/platform.js
--
diff --git a/cordova-lib/src/cordova/platform.js 
b/cordova-lib/src/cordova/platform.js
index 2ea8c01..db6f53c 100644
--- a/cordova-lib/src/cordova/platform.js
+++ b/cordova-lib/src/cordova/platform.js
@@ -19,6 +19,7 @@
 
 var config= require('./config'),
 cordova   = require('./cordova'),
+prepare   = require('./prepare'),
 cordova_util  = require('./util'),
 ConfigParser  = require('cordova-common').ConfigParser,
 fs= require('fs'),
@@ -181,6 +182,9 @@ function addHelper(cmd, hooksRunner, projectRoot, targets, 
opts) {
 PlatformApi.updatePlatform.bind(null, destination, 
options, events);
 
 return promise()
+.then(function () {
+return prepare.preparePlatforms([platform], projectRoot, { 
searchpath: opts.searchpath });
+})
 .then(function() {
 if (cmd == 'add') {
 return installPluginsForNewPlatform(platform, 
projectRoot, opts);


-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

[3/3] cordova-lib git commit: Updated RELEASENOTES.md for release 6.1.1

2016-03-29 Thread an-selm 
Updated RELEASENOTES.md for release 6.1.1


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

Branch: refs/heads/6.1.x
Commit: 7fb6855e8154f90e568bec7793746fc0ba5a01e8
Parents: b15a9fd
Author: Vladimir Kotikov 
Authored: Tue Mar 29 14:23:21 2016 +0300
Committer: Vladimir Kotikov 
Committed: Tue Mar 29 14:28:54 2016 +0300

--
 cordova-lib/RELEASENOTES.md | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/7fb6855e/cordova-lib/RELEASENOTES.md
--
diff --git a/cordova-lib/RELEASENOTES.md b/cordova-lib/RELEASENOTES.md
index c6019db..3fbdcf7 100644
--- a/cordova-lib/RELEASENOTES.md
+++ b/cordova-lib/RELEASENOTES.md
@@ -20,7 +20,11 @@
 -->
 # Cordova-lib Release Notes
 
-### 6.1.1 (Mar 17, 2016)
+### 6.1.1 (Mar 29, 2016)
+* CB-10961 Error no such file or directory adding ios platform when plugins 
present or required
+* CB-10908 Reload the config.xml before writing the saved plugin
+
+### 6.1.0 (Mar 17, 2016)
 * CB-10902 updated pinned platforms
 * CB-10808 revert npm install for templates
 * CB-10808 CLI Support templates with subdirectory


-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

cordova-lib git commit: CB-10961 Error no such file or directory adding ios platform when plugins present or required

2016-03-29 Thread an-selm 
Repository: cordova-lib
Updated Branches:
  refs/heads/master bdb45fa05 -> 183495d4a


CB-10961 Error no such file or directory adding ios platform when plugins 
present or required

This closes #416


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

Branch: refs/heads/master
Commit: 183495d4a8a195ac55a70419186e3093a5750d4f
Parents: bdb45fa
Author: Carlos Santana 
Authored: Fri Mar 25 16:17:01 2016 -0400
Committer: Vladimir Kotikov 
Committed: Tue Mar 29 12:51:31 2016 +0300

--
 cordova-lib/src/cordova/platform.js | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/183495d4/cordova-lib/src/cordova/platform.js
--
diff --git a/cordova-lib/src/cordova/platform.js 
b/cordova-lib/src/cordova/platform.js
index 2ea8c01..db6f53c 100644
--- a/cordova-lib/src/cordova/platform.js
+++ b/cordova-lib/src/cordova/platform.js
@@ -19,6 +19,7 @@
 
 var config= require('./config'),
 cordova   = require('./cordova'),
+prepare   = require('./prepare'),
 cordova_util  = require('./util'),
 ConfigParser  = require('cordova-common').ConfigParser,
 fs= require('fs'),
@@ -181,6 +182,9 @@ function addHelper(cmd, hooksRunner, projectRoot, targets, 
opts) {
 PlatformApi.updatePlatform.bind(null, destination, 
options, events);
 
 return promise()
+.then(function () {
+return prepare.preparePlatforms([platform], projectRoot, { 
searchpath: opts.searchpath });
+})
 .then(function() {
 if (cmd == 'add') {
 return installPluginsForNewPlatform(platform, 
projectRoot, opts);


-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

cordova-lib git commit: CB-10908 Reload the config.xml before writing the saved plugin

2016-03-29 Thread an-selm 
Repository: cordova-lib
Updated Branches:
  refs/heads/master e050180c5 -> bdb45fa05


CB-10908 Reload the config.xml before writing the saved plugin

This closes #415


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

Branch: refs/heads/master
Commit: bdb45fa05c6b25a52fbe640e2ea082df3a3abd12
Parents: e050180
Author: dubeejw 
Authored: Fri Mar 18 15:19:26 2016 -0400
Committer: Vladimir Kotikov 
Committed: Tue Mar 29 12:39:16 2016 +0300

--
 cordova-lib/src/cordova/plugin.js | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/bdb45fa0/cordova-lib/src/cordova/plugin.js
--
diff --git a/cordova-lib/src/cordova/plugin.js 
b/cordova-lib/src/cordova/plugin.js
index 46b84be..b4d47dc 100644
--- a/cordova-lib/src/cordova/plugin.js
+++ b/cordova-lib/src/cordova/plugin.js
@@ -194,6 +194,8 @@ module.exports = function plugin(command, targets, opts) {
 spec: src ? src : '~' + pluginInfo.version
 };
 
+xml = cordova_util.projectConfig(projectRoot);
+cfg = new ConfigParser(xml);
 cfg.removePlugin(pluginInfo.id);
 cfg.addPlugin(attributes, opts.cli_variables);
 cfg.write();


-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

cordova-lib git commit: CB-10940 Can't add Android platform from path

2016-03-29 Thread an-selm 
Repository: cordova-lib
Updated Branches:
  refs/heads/master 9014dd69f -> e050180c5


CB-10940 Can't add Android platform from path

Added corresponding tests for events.forwardEventsTo

 This closes #418


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

Branch: refs/heads/master
Commit: e050180c5ab2d3149bb0dfdc5f37fc317b159773
Parents: 9014dd6
Author: daserge 
Authored: Mon Mar 28 17:06:45 2016 +0300
Committer: Vladimir Kotikov 
Committed: Tue Mar 29 12:25:36 2016 +0300

--
 cordova-common/spec/events.spec.js | 48 +
 cordova-common/src/events.js   |  9 ++-
 2 files changed, 56 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/e050180c/cordova-common/spec/events.spec.js
--
diff --git a/cordova-common/spec/events.spec.js 
b/cordova-common/spec/events.spec.js
new file mode 100644
index 000..a9e7f43
--- /dev/null
+++ b/cordova-common/spec/events.spec.js
@@ -0,0 +1,48 @@
+/**
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+var events = require('../src/events');
+
+describe('forwardEventsTo method', function () {
+afterEach(function() {
+events.forwardEventsTo(null);
+});
+it('should not go to infinite loop when trying to forward to self', 
function () {
+expect(function() {
+events.forwardEventsTo(events);
+events.emit('log', 'test message');
+}).not.toThrow();
+});
+it('should reset forwarding after trying to forward to self', function () {
+var EventEmitter = require('events').EventEmitter;
+var anotherEventEmitter = new EventEmitter();
+var logSpy = jasmine.createSpy('logSpy');
+anotherEventEmitter.on('log', logSpy);
+
+events.forwardEventsTo(anotherEventEmitter);
+events.emit('log', 'test message #1');
+expect(logSpy).toHaveBeenCalled();
+
+logSpy.reset();
+
+events.forwardEventsTo(events);
+events.emit('log', 'test message #2');
+expect(logSpy).not.toHaveBeenCalled();
+});
+});

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/e050180c/cordova-common/src/events.js
--
diff --git a/cordova-common/src/events.js b/cordova-common/src/events.js
index 868d363..8751976 100644
--- a/cordova-common/src/events.js
+++ b/cordova-common/src/events.js
@@ -42,7 +42,14 @@ module.exports.forwardEventsTo = function (eventEmitter) {
 if (!(eventEmitter instanceof EventEmitter))
 throw new Error('Cordova events could be redirected to another 
EventEmitter instance only');
 
-EVENTS_RECEIVER = eventEmitter;
+// CB-10940 Skipping forwarding to self to avoid infinite recursion.
+// This is the case when the modules are npm-linked.
+if (this !== eventEmitter) {
+EVENTS_RECEIVER = eventEmitter;
+} else {
+// Reset forwarding if we are subscribing to self
+EVENTS_RECEIVER = undefined;
+}
 };
 
 var emit = INSTANCE.emit;


-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

cordova-lib git commit: CB-10965 xml helper allows multiple instances to be merge in config.xml

2016-03-29 Thread an-selm 
Repository: cordova-lib
Updated Branches:
  refs/heads/master 9f630271d -> 9014dd69f


CB-10965 xml helper allows multiple instances to be merge in config.xml

This closes #417


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

Branch: refs/heads/master
Commit: 9014dd69f4aedda65de704292f02db92cf02639f
Parents: 9f63027
Author: Carlos Santana 
Authored: Sat Mar 26 18:53:52 2016 -0400
Committer: Vladimir Kotikov 
Committed: Tue Mar 29 12:20:35 2016 +0300

--
 cordova-common/spec/util/xml-helpers.spec.js | 28 +++
 cordova-common/src/util/xml-helpers.js   |  2 +-
 2 files changed, 25 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/9014dd69/cordova-common/spec/util/xml-helpers.spec.js
--
diff --git a/cordova-common/spec/util/xml-helpers.spec.js 
b/cordova-common/spec/util/xml-helpers.spec.js
index b0083fd..91128a6 100644
--- a/cordova-common/spec/util/xml-helpers.spec.js
+++ b/cordova-common/spec/util/xml-helpers.spec.js
@@ -195,7 +195,7 @@ describe('xml-helpers', function(){
 expect(testElement.text).toEqual('testTEXT');
 });
 
-it('should merge singelton children without clobber', function () {
+it('should merge singleton children without clobber', function () {
 var testXml = et.XML('http://www.nowhere.com";>SUPER_AUTHOR');
 
 xml_helpers.mergeXml(testXml, dstXml);
@@ -208,7 +208,17 @@ describe('xml-helpers', function(){
 expect(testElements[0].text).toContain('Apache Cordova Team');
 });
 
-it('should clobber singelton children with clobber', function () {
+it('should merge singleton name without clobber', function () {
+var testXml = et.XML('SUPER_NAME');
+
+xml_helpers.mergeXml(testXml, dstXml);
+var testElements = dstXml.findall('name');
+expect(testElements).toBeDefined();
+expect(testElements.length).toEqual(1);
+expect(testElements[0].text).toContain('Hello Cordova');
+});
+
+it('should clobber singleton children with clobber', function () {
 var testXml = et.XML('http://www.nowhere.com";>SUPER_AUTHOR');
 
 xml_helpers.mergeXml(testXml, dstXml, '', true);
@@ -221,6 +231,16 @@ describe('xml-helpers', function(){
 expect(testElements[0].text).toEqual('SUPER_AUTHOR');
 });
 
+it('should merge singleton name with clobber', function () {
+var testXml = et.XML('SUPER_NAME');
+
+xml_helpers.mergeXml(testXml, dstXml, '', true);
+var testElements = dstXml.findall('name');
+expect(testElements).toBeDefined();
+expect(testElements.length).toEqual(1);
+expect(testElements[0].text).toContain('SUPER_NAME');
+});
+
 it('should append non singelton children', function () {
 var testXml = et.XML(' ');
 
@@ -267,7 +287,7 @@ describe('xml-helpers', function(){
 expect(testElements.length).toEqual(2);
 
 });
-
+
 it('should remove duplicate preferences (by name attribute value)', 
function () {
 var testXml = et.XML(
 '\n' +
@@ -288,7 +308,7 @@ describe('xml-helpers', function(){
 var testElements = 
dstXml.findall('preference[@name="Orientation"]');
 expect(testElements.length).toEqual(1);
 });
-
+
 it('should merge preferences, with platform preferences written last', 
function () {
 var testXml = et.XML(
 '\n' +

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/9014dd69/cordova-common/src/util/xml-helpers.js
--
diff --git a/cordova-common/src/util/xml-helpers.js 
b/cordova-common/src/util/xml-helpers.js
index fc84128..6366af9 100644
--- a/cordova-common/src/util/xml-helpers.js
+++ b/cordova-common/src/util/xml-helpers.js
@@ -194,7 +194,7 @@ function findInsertIdx(children, after) {
 }
 
 var BLACKLIST = ['platform', 'feature','plugin','engine'];
-var SINGLETONS = ['content', 'author'];
+var SINGLETONS = ['content', 'author', 'name'];
 function mergeXml(src, dest, platform, clobber) {
 // Do nothing for blacklisted tags.
 if (BLACKLIST.indexOf(src.tag) != -1) return;


-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org